X Strike Force X.Org X11 SVN commit: r1267 - in branches/modular/app/xdm-X11R7.0-1.0.1: . config greeter
Author: dnusinow
Date: 2006-02-20 22:22:43 -0500 (Mon, 20 Feb 2006)
New Revision: 1267
Modified:
branches/modular/app/xdm-X11R7.0-1.0.1/Makefile.in
branches/modular/app/xdm-X11R7.0-1.0.1/aclocal.m4
branches/modular/app/xdm-X11R7.0-1.0.1/config/Makefile.in
branches/modular/app/xdm-X11R7.0-1.0.1/configure
branches/modular/app/xdm-X11R7.0-1.0.1/greeter/Makefile.in
Log:
autoreconf again. This time with feeling
Modified: branches/modular/app/xdm-X11R7.0-1.0.1/Makefile.in
===================================================================
--- branches/modular/app/xdm-X11R7.0-1.0.1/Makefile.in 2006-02-21 03:16:36 UTC (rev 1266)
+++ branches/modular/app/xdm-X11R7.0-1.0.1/Makefile.in 2006-02-21 03:22:43 UTC (rev 1267)
@@ -76,12 +76,14 @@
@DYNAMIC_GREETER_FALSE@am__append_8 = $(XDMGREET_CFLAGS)
ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APPDEFS_CFLAGS = @APPDEFS_CFLAGS@
APPDEFS_LIBS = @APPDEFS_LIBS@
+APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
AS = @AS@
@@ -119,6 +121,7 @@
DLLTOOL = @DLLTOOL@
DMCP_CFLAGS = @DMCP_CFLAGS@
DMCP_LIBS = @DMCP_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DYNAMIC_GREETER_FALSE = @DYNAMIC_GREETER_FALSE@
DYNAMIC_GREETER_TRUE = @DYNAMIC_GREETER_TRUE@
@@ -130,6 +133,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
HAS_ARC4_RANDOM_FALSE = @HAS_ARC4_RANDOM_FALSE@
HAS_ARC4_RANDOM_TRUE = @HAS_ARC4_RANDOM_TRUE@
@@ -147,6 +151,7 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -154,6 +159,7 @@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
Modified: branches/modular/app/xdm-X11R7.0-1.0.1/aclocal.m4
===================================================================
--- branches/modular/app/xdm-X11R7.0-1.0.1/aclocal.m4 2006-02-21 03:16:36 UTC (rev 1266)
+++ branches/modular/app/xdm-X11R7.0-1.0.1/aclocal.m4 2006-02-21 03:22:43 UTC (rev 1267)
@@ -7318,7 +7318,7 @@
AC_MSG_RESULT([$SED])
])
-dnl $XdotOrg: $
+dnl $Id: xorg-macros.m4,v 1.8 2005/12/09 15:28:41 kem Exp $
dnl
dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved.
dnl
@@ -7392,41 +7392,106 @@
# Determine which sections man pages go in for the different man page types
# on this OS - replaces *ManSuffix settings in old Imake *.cf per-os files.
# Not sure if there's any better way than just hardcoding by OS name.
-# TODO: Add way to override settings for distros that don't use defaults.
+# Override default settings by setting environment variables
+
AC_DEFUN([XORG_MANPAGE_SECTIONS],[
AC_REQUIRE([AC_CANONICAL_HOST])
-case $host_os in
- linux*)
- APP_MAN_SUFFIX=1x
- LIB_MAN_SUFFIX=3x
- FILE_MAN_SUFFIX=5x
- MISC_MAN_SUFFIX=7x
- DRIVER_MAN_SUFFIX=4x
- ;;
- solaris*)
- APP_MAN_SUFFIX=1
- FILE_MAN_SUFFIX=4
- MISC_MAN_SUFFIX=5
- DRIVER_MAN_SUFFIX=7
- ADMIN_MAN_SUFFIX=1m
- ;;
-esac
+if test x$APP_MAN_SUFFIX = x ; then
+ case $host_os in
+ linux*) APP_MAN_SUFFIX=1x ;;
+ *) APP_MAN_SUFFIX=1 ;;
+ esac
+fi
+if test x$APP_MAN_DIR = x ; then
+ case $host_os in
+ linux*) APP_MAN_DIR='$(mandir)/man1' ;;
+ *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
+ esac
+fi
-# Default settings - classic BSD style
-if test x$APP_MAN_SUFFIX = x ; then APP_MAN_SUFFIX=1 ; fi
-if test x$LIB_MAN_SUFFIX = x ; then LIB_MAN_SUFFIX=3 ; fi
-if test x$FILE_MAN_SUFFIX = x ; then FILE_MAN_SUFFIX=5 ; fi
-if test x$MISC_MAN_SUFFIX = x ; then MISC_MAN_SUFFIX=7 ; fi
-if test x$DRIVER_MAN_SUFFIX = x ; then DRIVER_MAN_SUFFIX=4 ; fi
-if test x$ADMIN_MAN_SUFFIX = x ; then ADMIN_MAN_SUFFIX=8 ; fi
+if test x$LIB_MAN_SUFFIX = x ; then
+ case $host_os in
+ linux*) LIB_MAN_SUFFIX=3x ;;
+ *) LIB_MAN_SUFFIX=3 ;;
+ esac
+fi
+if test x$LIB_MAN_DIR = x ; then
+ case $host_os in
+ linux*) LIB_MAN_DIR='$(mandir)/man3' ;;
+ *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
+ esac
+fi
+if test x$FILE_MAN_SUFFIX = x ; then
+ case $host_os in
+ linux*) FILE_MAN_SUFFIX=5x ;;
+ solaris*) FILE_MAN_SUFFIX=4 ;;
+ *) FILE_MAN_SUFFIX=5 ;;
+ esac
+fi
+if test x$FILE_MAN_DIR = x ; then
+ case $host_os in
+ linux*) FILE_MAN_DIR='$(mandir)/man5' ;;
+ *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
+ esac
+fi
+
+# In Imake's linux.cf, the misc man suffix & dir was only changed for
+# LinuxDebian, not other Linuxes, so we leave it unchanged here
+if test x$MISC_MAN_SUFFIX = x ; then
+ case $host_os in
+# linux*) MISC_MAN_SUFFIX=7x ;;
+ solaris*) MISC_MAN_SUFFIX=5 ;;
+ *) MISC_MAN_SUFFIX=7 ;;
+ esac
+fi
+if test x$MISC_MAN_DIR = x ; then
+ case $host_os in
+# linux*) MISC_MAN_DIR='$(mandir)/man7' ;;
+ *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
+ esac
+fi
+
+# In Imake's linux.cf, the driver man suffix & dir was only changed for
+# LinuxDebian, not other Linuxes, so we leave it unchanged here
+if test x$DRIVER_MAN_SUFFIX = x ; then
+ case $host_os in
+# linux*) DRIVER_MAN_SUFFIX=4x ;;
+ solaris*) DRIVER_MAN_SUFFIX=7 ;;
+ *) DRIVER_MAN_SUFFIX=4 ;;
+ esac
+fi
+if test x$DRIVER_MAN_DIR = x ; then
+ case $host_os in
+# linux*) DRIVER_MAN_DIR='$(mandir)/man4' ;;
+ *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
+ esac
+fi
+
+if test x$ADMIN_MAN_SUFFIX = x ; then
+ case $host_os in
+ solaris*) ADMIN_MAN_SUFFIX=1m ;;
+ *) ADMIN_MAN_SUFFIX=8 ;;
+ esac
+fi
+if test x$ADMIN_MAN_DIR = x ; then
+ ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
+fi
+
+
AC_SUBST([APP_MAN_SUFFIX])
AC_SUBST([LIB_MAN_SUFFIX])
AC_SUBST([FILE_MAN_SUFFIX])
AC_SUBST([MISC_MAN_SUFFIX])
AC_SUBST([DRIVER_MAN_SUFFIX])
AC_SUBST([ADMIN_MAN_SUFFIX])
+AC_SUBST([APP_MAN_DIR])
+AC_SUBST([LIB_MAN_DIR])
+AC_SUBST([FILE_MAN_DIR])
+AC_SUBST([MISC_MAN_DIR])
+AC_SUBST([DRIVER_MAN_DIR])
+AC_SUBST([ADMIN_MAN_DIR])
]) # XORG_MANPAGE_SECTIONS
# XORG_CHECK_LINUXDOC
@@ -7443,10 +7508,11 @@
)
AC_PATH_PROG(LINUXDOC, linuxdoc)
+AC_PATH_PROG(PS2PDF, ps2pdf)
AC_MSG_CHECKING([Whether to build documentation])
-if [[ ! -z $DEFS_ENT_PATH ] && [ ! -z $LINUXDOC ]] ; then
+if test x$DEFS_ENT_PATH != x && test x$LINUXDOC != x ; then
BUILDDOC=yes
else
BUILDDOC=no
@@ -7456,11 +7522,75 @@
AC_MSG_RESULT([$BUILDDOC])
-MAKE_TEXT="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B txt"
+AC_MSG_CHECKING([Whether to build pdf documentation])
+if test x$PS2PDF != x ; then
+ BUILDPDFDOC=yes
+else
+ BUILDPDFDOC=no
+fi
+
+AM_CONDITIONAL(BUILD_PDFDOC, [test x$BUILDPDFDOC = xyes])
+
+AC_MSG_RESULT([$BUILDPDFDOC])
+
+MAKE_TEXT="SGML_SEARCH_PATH=$DEFS_ENT_PATH GROFF_NO_SGR=y $LINUXDOC -B txt"
+MAKE_PS="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B latex --papersize=letter --output=ps"
+MAKE_PDF="$PS2PDF"
+MAKE_HTML="SGML_SEARCH_PATH=$DEFS_ENT_PATH $LINUXDOC -B html --split=0"
+
AC_SUBST(MAKE_TEXT)
+AC_SUBST(MAKE_PS)
+AC_SUBST(MAKE_PDF)
+AC_SUBST(MAKE_HTML)
]) # XORG_CHECK_LINUXDOC
+# XORG_CHECK_MALLOC_ZERO
+# ----------------------
+# Defines {MALLOC,XMALLOC,XTMALLOC}_ZERO_CFLAGS appropriately if
+# malloc(0) returns NULL. Packages should add one of these cflags to
+# their AM_CFLAGS (or other appropriate *_CFLAGS) to use them.
+AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[
+AC_ARG_ENABLE(malloc0returnsnull,
+ AC_HELP_STRING([--enable-malloc0returnsnull],
+ [malloc(0) returns NULL (default: auto)]),
+ [MALLOC_ZERO_RETURNS_NULL=$enableval],
+ [MALLOC_ZERO_RETURNS_NULL=auto])
+
+AC_MSG_CHECKING([whether malloc(0) returns NULL])
+if test "x$MALLOC_ZERO_RETURNS_NULL" = xauto; then
+ AC_RUN_IFELSE([
+char *malloc();
+char *realloc();
+char *calloc();
+main() {
+ char *m0, *r0, *c0, *p;
+ m0 = malloc(0);
+ p = malloc(10);
+ r0 = realloc(p,0);
+ c0 = calloc(0);
+ exit(m0 == 0 || r0 == 0 || c0 == 0 ? 0 : 1);
+}],
+ [MALLOC_ZERO_RETURNS_NULL=yes],
+ [MALLOC_ZERO_RETURNS_NULL=no])
+fi
+AC_MSG_RESULT([$MALLOC_ZERO_RETURNS_NULL])
+
+if test "x$MALLOC_ZERO_RETURNS_NULL" = xyes; then
+ MALLOC_ZERO_CFLAGS="-DMALLOC_0_RETURNS_NULL"
+ XMALLOC_ZERO_CFLAGS=$MALLOC_ZERO_CFLAGS
+ XTMALLOC_ZERO_CFLAGS="$MALLOC_ZERO_CFLAGS -DXTMALLOC_BC"
+else
+ MALLOC_ZERO_CFLAGS=""
+ XMALLOC_ZERO_CFLAGS=""
+ XTMALLOC_ZERO_CFLAGS=""
+fi
+
+AC_SUBST([MALLOC_ZERO_CFLAGS])
+AC_SUBST([XMALLOC_ZERO_CFLAGS])
+AC_SUBST([XTMALLOC_ZERO_CFLAGS])
+]) # XORG_CHECK_MALLOC_ZERO
+
dnl $XdotOrg: lib/xtrans/xtrans.m4,v 1.6 2005/07/26 18:59:11 alanc Exp $
dnl
dnl Copyright 2005 Sun Microsystems, Inc. All rights reserved.
Modified: branches/modular/app/xdm-X11R7.0-1.0.1/config/Makefile.in
===================================================================
--- branches/modular/app/xdm-X11R7.0-1.0.1/config/Makefile.in 2006-02-21 03:16:36 UTC (rev 1266)
+++ branches/modular/app/xdm-X11R7.0-1.0.1/config/Makefile.in 2006-02-21 03:22:43 UTC (rev 1267)
@@ -44,12 +44,14 @@
POST_UNINSTALL = :
host_triplet = @host@
ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APPDEFS_CFLAGS = @APPDEFS_CFLAGS@
APPDEFS_LIBS = @APPDEFS_LIBS@
+APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
AS = @AS@
@@ -87,6 +89,7 @@
DLLTOOL = @DLLTOOL@
DMCP_CFLAGS = @DMCP_CFLAGS@
DMCP_LIBS = @DMCP_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DYNAMIC_GREETER_FALSE = @DYNAMIC_GREETER_FALSE@
DYNAMIC_GREETER_TRUE = @DYNAMIC_GREETER_TRUE@
@@ -98,6 +101,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
HAS_ARC4_RANDOM_FALSE = @HAS_ARC4_RANDOM_FALSE@
HAS_ARC4_RANDOM_TRUE = @HAS_ARC4_RANDOM_TRUE@
@@ -115,6 +119,7 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -122,6 +127,7 @@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
Modified: branches/modular/app/xdm-X11R7.0-1.0.1/configure
===================================================================
--- branches/modular/app/xdm-X11R7.0-1.0.1/configure 2006-02-21 03:16:36 UTC (rev 1266)
+++ branches/modular/app/xdm-X11R7.0-1.0.1/configure 2006-02-21 03:22:43 UTC (rev 1267)
@@ -464,7 +464,7 @@
# include <unistd.h>
#endif"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RAWCPP RAWCPPFLAGS HAS_SECURE_RPC_TRUE HAS_SECURE_RPC_FALSE SU HAS_ARC4_RANDOM_TRUE HAS_ARC4_RANDOM_FALSE RANDOMMANDEFS HAS_KERBEROS_FIVE_TRUE HAS_KERBEROS_FIVE_FALSE XDMLIBDIR XDMCONFIGDIR XDMSCRIPTDIR XDMLOGDIR XDMPIDDIR DEFAULTVT SERVERSTYPE SHELL_CMD PKG_CONFIG ac_pt_PKG_CONFIG XDM_CFLAGS XDM_LIBS XINERAMA_CFLAGS XINERAMA_LIBS XPM_CFLAGS XPM_LIBS USE_XPM_TRUE USE_XPM_FALSE XDM_PIXMAP XDM_BWPIXMAP XDM_PIXMAPDIR TMP_XAW_CFLAGS TMP_XAW_LIBS XAW_USE_XPRINT_TRUE XAW_USE_XPRINT_FALSE DMCP_CFLAGS DMCP_LIBS XLIB_CFLAGS XLIB_LIBS AUTH_CFLAGS AUTH_LIBS XDMGREET_CFLAGS XDMGREET_LIBS DEF_GREETER_LIB DYNAMIC_GREETER_TRUE DYNAMIC_GREETER_FALSE HAS_XDM_AUTH_TRUE HAS_XDM_AUTH_FALSE XDM_LDFLAGS XT_CFLAGS XT_LIBS XDMSHELL_CFLAGS XDMSHELL_LIBS CHOOSER_CFLAGS CHOOSER_LIBS DEF_SERVER_LINE XRDB_PROGRAM DEF_SESSION DEF_USER_PATH DEF_SYSTEM_PATH DEF_SYSTEM_SHELL DEF_FAILSAFE_CLIENT DEF_XDM_CONFIG DEF_CHOOSER DEF_AUTH_DIR APPDEFS_CFLAGS APPDEFS_LIBS appdefaultdir APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL RAWCPP RAWCPPFLAGS HAS_SECURE_RPC_TRUE HAS_SECURE_RPC_FALSE SU HAS_ARC4_RANDOM_TRUE HAS_ARC4_RANDOM_FALSE RANDOMMANDEFS HAS_KERBEROS_FIVE_TRUE HAS_KERBEROS_FIVE_FALSE XDMLIBDIR XDMCONFIGDIR XDMSCRIPTDIR XDMLOGDIR XDMPIDDIR DEFAULTVT SERVERSTYPE SHELL_CMD PKG_CONFIG ac_pt_PKG_CONFIG XDM_CFLAGS XDM_LIBS XINERAMA_CFLAGS XINERAMA_LIBS XPM_CFLAGS XPM_LIBS USE_XPM_TRUE USE_XPM_FALSE XDM_PIXMAP XDM_BWPIXMAP XDM_PIXMAPDIR TMP_XAW_CFLAGS TMP_XAW_LIBS XAW_USE_XPRINT_TRUE XAW_USE_XPRINT_FALSE DMCP_CFLAGS DMCP_LIBS XLIB_CFLAGS XLIB_LIBS AUTH_CFLAGS AUTH_LIBS XDMGREET_CFLAGS XDMGREET_LIBS DEF_GREETER_LIB DYNAMIC_GREETER_TRUE DYNAMIC_GREETER_FALSE HAS_XDM_AUTH_TRUE HAS_XDM_AUTH_FALSE XDM_LDFLAGS XT_CFLAGS XT_LIBS XDMSHELL_CFLAGS XDMSHELL_LIBS CHOOSER_CFLAGS CHOOSER_LIBS DEF_SERVER_LINE XRDB_PROGRAM DEF_SESSION DEF_USER_PATH DEF_SYSTEM_PATH DEF_SYSTEM_SHELL DEF_FAILSAFE_CLIENT DEF_XDM_CONFIG DEF_CHOOSER DEF_AUTH_DIR APPDEFS_CFLAGS APPDEFS_LIBS appdefaultdir APP_MAN_SUFFIX LIB_MAN_SUFFIX FILE_MAN_SUFFIX MISC_MAN_SUFFIX DRIVER_MAN_SUFFIX ADMIN_MAN_SUFFIX APP_MAN_DIR LIB_MAN_DIR FILE_MAN_DIR MISC_MAN_DIR DRIVER_MAN_DIR ADMIN_MAN_DIR LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -23691,40 +23691,104 @@
-case $host_os in
- linux*)
- APP_MAN_SUFFIX=1x
- LIB_MAN_SUFFIX=3x
- FILE_MAN_SUFFIX=5x
- MISC_MAN_SUFFIX=7x
- DRIVER_MAN_SUFFIX=4x
- ;;
- solaris*)
- APP_MAN_SUFFIX=1
- FILE_MAN_SUFFIX=4
- MISC_MAN_SUFFIX=5
- DRIVER_MAN_SUFFIX=7
- ADMIN_MAN_SUFFIX=1m
- ;;
-esac
+if test x$APP_MAN_SUFFIX = x ; then
+ case $host_os in
+ linux*) APP_MAN_SUFFIX=1x ;;
+ *) APP_MAN_SUFFIX=1 ;;
+ esac
+fi
+if test x$APP_MAN_DIR = x ; then
+ case $host_os in
+ linux*) APP_MAN_DIR='$(mandir)/man1' ;;
+ *) APP_MAN_DIR='$(mandir)/man$(APP_MAN_SUFFIX)' ;;
+ esac
+fi
-# Default settings - classic BSD style
-if test x$APP_MAN_SUFFIX = x ; then APP_MAN_SUFFIX=1 ; fi
-if test x$LIB_MAN_SUFFIX = x ; then LIB_MAN_SUFFIX=3 ; fi
-if test x$FILE_MAN_SUFFIX = x ; then FILE_MAN_SUFFIX=5 ; fi
-if test x$MISC_MAN_SUFFIX = x ; then MISC_MAN_SUFFIX=7 ; fi
-if test x$DRIVER_MAN_SUFFIX = x ; then DRIVER_MAN_SUFFIX=4 ; fi
-if test x$ADMIN_MAN_SUFFIX = x ; then ADMIN_MAN_SUFFIX=8 ; fi
+if test x$LIB_MAN_SUFFIX = x ; then
+ case $host_os in
+ linux*) LIB_MAN_SUFFIX=3x ;;
+ *) LIB_MAN_SUFFIX=3 ;;
+ esac
+fi
+if test x$LIB_MAN_DIR = x ; then
+ case $host_os in
+ linux*) LIB_MAN_DIR='$(mandir)/man3' ;;
+ *) LIB_MAN_DIR='$(mandir)/man$(LIB_MAN_SUFFIX)' ;;
+ esac
+fi
+if test x$FILE_MAN_SUFFIX = x ; then
+ case $host_os in
+ linux*) FILE_MAN_SUFFIX=5x ;;
+ solaris*) FILE_MAN_SUFFIX=4 ;;
+ *) FILE_MAN_SUFFIX=5 ;;
+ esac
+fi
+if test x$FILE_MAN_DIR = x ; then
+ case $host_os in
+ linux*) FILE_MAN_DIR='$(mandir)/man5' ;;
+ *) FILE_MAN_DIR='$(mandir)/man$(FILE_MAN_SUFFIX)' ;;
+ esac
+fi
+# In Imake's linux.cf, the misc man suffix & dir was only changed for
+# LinuxDebian, not other Linuxes, so we leave it unchanged here
+if test x$MISC_MAN_SUFFIX = x ; then
+ case $host_os in
+# linux*) MISC_MAN_SUFFIX=7x ;;
+ solaris*) MISC_MAN_SUFFIX=5 ;;
+ *) MISC_MAN_SUFFIX=7 ;;
+ esac
+fi
+if test x$MISC_MAN_DIR = x ; then
+ case $host_os in
+# linux*) MISC_MAN_DIR='$(mandir)/man7' ;;
+ *) MISC_MAN_DIR='$(mandir)/man$(MISC_MAN_SUFFIX)' ;;
+ esac
+fi
+# In Imake's linux.cf, the driver man suffix & dir was only changed for
+# LinuxDebian, not other Linuxes, so we leave it unchanged here
+if test x$DRIVER_MAN_SUFFIX = x ; then
+ case $host_os in
+# linux*) DRIVER_MAN_SUFFIX=4x ;;
+ solaris*) DRIVER_MAN_SUFFIX=7 ;;
+ *) DRIVER_MAN_SUFFIX=4 ;;
+ esac
+fi
+if test x$DRIVER_MAN_DIR = x ; then
+ case $host_os in
+# linux*) DRIVER_MAN_DIR='$(mandir)/man4' ;;
+ *) DRIVER_MAN_DIR='$(mandir)/man$(DRIVER_MAN_SUFFIX)' ;;
+ esac
+fi
+if test x$ADMIN_MAN_SUFFIX = x ; then
+ case $host_os in
+ solaris*) ADMIN_MAN_SUFFIX=1m ;;
+ *) ADMIN_MAN_SUFFIX=8 ;;
+ esac
+fi
+if test x$ADMIN_MAN_DIR = x ; then
+ ADMIN_MAN_DIR='$(mandir)/man$(ADMIN_MAN_SUFFIX)'
+fi
+
+
+
+
+
+
+
+
+
+
+
# Check whether --with-release-version or --without-release-version was given.
if test "${with_release_version+set}" = set; then
withval="$with_release_version"
@@ -24588,6 +24652,12 @@
s,@MISC_MAN_SUFFIX@,$MISC_MAN_SUFFIX,;t t
s,@DRIVER_MAN_SUFFIX@,$DRIVER_MAN_SUFFIX,;t t
s,@ADMIN_MAN_SUFFIX@,$ADMIN_MAN_SUFFIX,;t t
+s,@APP_MAN_DIR@,$APP_MAN_DIR,;t t
+s,@LIB_MAN_DIR@,$LIB_MAN_DIR,;t t
+s,@FILE_MAN_DIR@,$FILE_MAN_DIR,;t t
+s,@MISC_MAN_DIR@,$MISC_MAN_DIR,;t t
+s,@DRIVER_MAN_DIR@,$DRIVER_MAN_DIR,;t t
+s,@ADMIN_MAN_DIR@,$ADMIN_MAN_DIR,;t t
s,@LIBOBJS@,$LIBOBJS,;t t
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
CEOF
Modified: branches/modular/app/xdm-X11R7.0-1.0.1/greeter/Makefile.in
===================================================================
--- branches/modular/app/xdm-X11R7.0-1.0.1/greeter/Makefile.in 2006-02-21 03:16:36 UTC (rev 1266)
+++ branches/modular/app/xdm-X11R7.0-1.0.1/greeter/Makefile.in 2006-02-21 03:22:43 UTC (rev 1267)
@@ -39,12 +39,14 @@
POST_UNINSTALL = :
host_triplet = @host@
ACLOCAL = @ACLOCAL@
+ADMIN_MAN_DIR = @ADMIN_MAN_DIR@
ADMIN_MAN_SUFFIX = @ADMIN_MAN_SUFFIX@
AMDEP_FALSE = @AMDEP_FALSE@
AMDEP_TRUE = @AMDEP_TRUE@
AMTAR = @AMTAR@
APPDEFS_CFLAGS = @APPDEFS_CFLAGS@
APPDEFS_LIBS = @APPDEFS_LIBS@
+APP_MAN_DIR = @APP_MAN_DIR@
APP_MAN_SUFFIX = @APP_MAN_SUFFIX@
AR = @AR@
AS = @AS@
@@ -82,6 +84,7 @@
DLLTOOL = @DLLTOOL@
DMCP_CFLAGS = @DMCP_CFLAGS@
DMCP_LIBS = @DMCP_LIBS@
+DRIVER_MAN_DIR = @DRIVER_MAN_DIR@
DRIVER_MAN_SUFFIX = @DRIVER_MAN_SUFFIX@
DYNAMIC_GREETER_FALSE = @DYNAMIC_GREETER_FALSE@
DYNAMIC_GREETER_TRUE = @DYNAMIC_GREETER_TRUE@
@@ -93,6 +96,7 @@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
+FILE_MAN_DIR = @FILE_MAN_DIR@
FILE_MAN_SUFFIX = @FILE_MAN_SUFFIX@
HAS_ARC4_RANDOM_FALSE = @HAS_ARC4_RANDOM_FALSE@
HAS_ARC4_RANDOM_TRUE = @HAS_ARC4_RANDOM_TRUE@
@@ -110,6 +114,7 @@
LIBOBJS = @LIBOBJS@
LIBS = @LIBS@
LIBTOOL = @LIBTOOL@
+LIB_MAN_DIR = @LIB_MAN_DIR@
LIB_MAN_SUFFIX = @LIB_MAN_SUFFIX@
LN_S = @LN_S@
LTLIBOBJS = @LTLIBOBJS@
@@ -117,6 +122,7 @@
MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MISC_MAN_DIR = @MISC_MAN_DIR@
MISC_MAN_SUFFIX = @MISC_MAN_SUFFIX@
OBJDUMP = @OBJDUMP@
OBJEXT = @OBJEXT@
Reply to: