X Strike Force X.Org X11 SVN commit: r1266 - in branches/modular/app/xdm-X11R7.0-1.0.1: . config greeter
Author: dnusinow
Date: 2006-02-20 22:16:36 -0500 (Mon, 20 Feb 2006)
New Revision: 1266
Modified:
branches/modular/app/xdm-X11R7.0-1.0.1/Makefile.in
branches/modular/app/xdm-X11R7.0-1.0.1/config.h.in
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 with up to date X.Org macros
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:12:00 UTC (rev 1265)
+++ branches/modular/app/xdm-X11R7.0-1.0.1/Makefile.in 2006-02-21 03:16:36 UTC (rev 1266)
@@ -182,7 +182,6 @@
VERSION = @VERSION@
XAW_USE_XPRINT_FALSE = @XAW_USE_XPRINT_FALSE@
XAW_USE_XPRINT_TRUE = @XAW_USE_XPRINT_TRUE@
-XDMAUTHDIR = @XDMAUTHDIR@
XDMCONFIGDIR = @XDMCONFIGDIR@
XDMGREET_CFLAGS = @XDMGREET_CFLAGS@
XDMGREET_LIBS = @XDMGREET_LIBS@
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:12:00 UTC (rev 1265)
+++ branches/modular/app/xdm-X11R7.0-1.0.1/config/Makefile.in 2006-02-21 03:16:36 UTC (rev 1266)
@@ -150,7 +150,6 @@
VERSION = @VERSION@
XAW_USE_XPRINT_FALSE = @XAW_USE_XPRINT_FALSE@
XAW_USE_XPRINT_TRUE = @XAW_USE_XPRINT_TRUE@
-XDMAUTHDIR = @XDMAUTHDIR@
XDMCONFIGDIR = @XDMCONFIGDIR@
XDMGREET_CFLAGS = @XDMGREET_CFLAGS@
XDMGREET_LIBS = @XDMGREET_LIBS@
@@ -292,7 +291,7 @@
-DXDMDIR=$(XDMLIBDIR) -DXDMLOGDIR=$(XDMLOGDIR) -DXDMPIDDIR=$(XDMPIDDIR) \
-DXDMCONFIGDIR=$(XDMCONFIGDIR) -DXDMSCRIPTDIR=$(XDMSCRIPTDIR) \
-DSU=$(SU) -DCHOOSERPATH=$(XDMLIBDIR)/chooser $(XPMDEFINES) \
- -DSHELL_CMD=$(SHELL_CMD) -DXDMAUTHDIR=$(XDMAUTHDIR)
+ -DSHELL_CMD=$(SHELL_CMD)
subdir = config
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
Modified: branches/modular/app/xdm-X11R7.0-1.0.1/config.h.in
===================================================================
--- branches/modular/app/xdm-X11R7.0-1.0.1/config.h.in 2006-02-21 03:12:00 UTC (rev 1265)
+++ branches/modular/app/xdm-X11R7.0-1.0.1/config.h.in 2006-02-21 03:16:36 UTC (rev 1266)
@@ -69,9 +69,6 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
-/* Add support for selinux */
-#undef HAVE_SELINUX
-
/* Define to 1 if you have the <stdint.h> header file. */
#undef HAVE_STDINT_H
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:12:00 UTC (rev 1265)
+++ branches/modular/app/xdm-X11R7.0-1.0.1/configure 2006-02-21 03:16:36 UTC (rev 1266)
@@ -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 XDMAUTHDIR 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 LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@@ -1139,7 +1139,6 @@
--with-tags[=TAGS]
include additional configurations [automatic]
--with-pam Use PAM for authentication
- --with-selinux Add support for selinux
--with-random-device\=<pathname>\
Use <pathname> as a source of randomness
--with-xdmlibdir=<pathname>
@@ -1151,10 +1150,6 @@
--with-xdmscriptdir=<pathname>
specify directory for xdm scripts (default is same
as xdmlibdir)
- --with-xdmauthdir=<pathname>
- specify a directory where authentication cookie
- files should be stored (default is same as
- xdmconfigdir)
--with-logdir=<pathname>
specify directory for xdm log files
(default=/var/log)
@@ -3812,7 +3807,7 @@
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 3815 "configure"' > conftest.$ac_ext
+ echo '#line 3810 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -5638,7 +5633,7 @@
# Provide some information about the compiler.
-echo "$as_me:5641:" \
+echo "$as_me:5636:" \
"checking for Fortran 77 compiler version" >&5
ac_compiler=`set X $ac_compile; echo $2`
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -6699,11 +6694,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6702: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6697: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6706: \$? = $ac_status" >&5
+ echo "$as_me:6701: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -6967,11 +6962,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:6970: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:6965: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:6974: \$? = $ac_status" >&5
+ echo "$as_me:6969: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -7071,11 +7066,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:7074: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:7069: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:7078: \$? = $ac_status" >&5
+ echo "$as_me:7073: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9429,7 +9424,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9432 "configure"
+#line 9427 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -9529,7 +9524,7 @@
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 9532 "configure"
+#line 9527 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11867,11 +11862,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11870: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11865: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:11874: \$? = $ac_status" >&5
+ echo "$as_me:11869: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -11971,11 +11966,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:11974: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:11969: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:11978: \$? = $ac_status" >&5
+ echo "$as_me:11973: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -13559,11 +13554,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13562: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13557: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13566: \$? = $ac_status" >&5
+ echo "$as_me:13561: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -13663,11 +13658,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13666: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13661: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:13670: \$? = $ac_status" >&5
+ echo "$as_me:13665: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -15886,11 +15881,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:15889: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15884: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:15893: \$? = $ac_status" >&5
+ echo "$as_me:15888: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16154,11 +16149,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16157: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16152: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16161: \$? = $ac_status" >&5
+ echo "$as_me:16156: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16258,11 +16253,11 @@
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16261: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:16256: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16265: \$? = $ac_status" >&5
+ echo "$as_me:16260: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -21419,250 +21414,6 @@
fi
-use_selinux_default=no
-# Check for selinux support
-
-# Check whether --with-selinux or --without-selinux was given.
-if test "${with_selinux+set}" = set; then
- withval="$with_selinux"
- USE_SELINUX=$withval
-else
- USE_SELINUX=$use_selinux_default
-fi;
-if test "x$USE_SELINUX" != "xno" ; then
- old_LIBS="$LIBS"
- LIBS=""
- echo "$as_me:$LINENO: checking for library containing is_selinux_enabled" >&5
-echo $ECHO_N "checking for library containing is_selinux_enabled... $ECHO_C" >&6
-if test "${ac_cv_search_is_selinux_enabled+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- ac_func_search_save_LIBS=$LIBS
-ac_cv_search_is_selinux_enabled=no
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char is_selinux_enabled ();
-int
-main ()
-{
-is_selinux_enabled ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_search_is_selinux_enabled="none required"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-if test "$ac_cv_search_is_selinux_enabled" = no; then
- for ac_lib in selinux; do
- LIBS="-l$ac_lib $ac_func_search_save_LIBS"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char is_selinux_enabled ();
-int
-main ()
-{
-is_selinux_enabled ();
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_search_is_selinux_enabled="-l$ac_lib"
-break
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
- done
-fi
-LIBS=$ac_func_search_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_search_is_selinux_enabled" >&5
-echo "${ECHO_T}$ac_cv_search_is_selinux_enabled" >&6
-if test "$ac_cv_search_is_selinux_enabled" != no; then
- test "$ac_cv_search_is_selinux_enabled" = "none required" || LIBS="$ac_cv_search_is_selinux_enabled $LIBS"
-
-fi
-
- echo "$as_me:$LINENO: checking for is_selinux_enabled" >&5
-echo $ECHO_N "checking for is_selinux_enabled... $ECHO_C" >&6
-if test "${ac_cv_func_is_selinux_enabled+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-/* Define is_selinux_enabled to an innocuous variant, in case <limits.h> declares is_selinux_enabled.
- For example, HP-UX 11i <limits.h> declares gettimeofday. */
-#define is_selinux_enabled innocuous_is_selinux_enabled
-
-/* System header to define __stub macros and hopefully few prototypes,
- which can conflict with char is_selinux_enabled (); below.
- Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
- <limits.h> exists even on freestanding compilers. */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef is_selinux_enabled
-
-/* Override any gcc2 internal prototype to avoid an error. */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
- builtin and then its argument prototype would still apply. */
-char is_selinux_enabled ();
-/* The GNU C library defines this for functions which it implements
- to always fail with ENOSYS. Some functions are actually named
- something starting with __ and the normal name is an alias. */
-#if defined (__stub_is_selinux_enabled) || defined (__stub___is_selinux_enabled)
-choke me
-#else
-char (*f) () = is_selinux_enabled;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != is_selinux_enabled;
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
- (eval $ac_link) 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
- (eval $ac_try) 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_func_is_selinux_enabled=yes
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_is_selinux_enabled=no
-fi
-rm -f conftest.err conftest.$ac_objext \
- conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_is_selinux_enabled" >&5
-echo "${ECHO_T}$ac_cv_func_is_selinux_enabled" >&6
-if test $ac_cv_func_is_selinux_enabled = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_SELINUX 1
-_ACEOF
-
-else
- if test "x$USE_SELINUX" != "xtry" ; then
- { { echo "$as_me:$LINENO: error: \"selinux support requested, but is_selinux_enabled not found.\"" >&5
-echo "$as_me: error: \"selinux support requested, but is_selinux_enabled not found.\"" >&2;}
- { (exit 1); exit 1; }; }
- fi
-fi
-
- XDM_LIBS="$XDM_LIBS $LIBS"
- LIBS="$old_LIBS"
-fi
-
# FIXME: Find better test for which OS'es use su -m - for now, just try to
# mirror the Imakefile setting of:
# if defined(OpenBSDArchitecture) || defined(NetBSDArchitecture) || defined(FreeBSDArchitecture) || defined(DarwinArchitecture)
@@ -21930,16 +21681,6 @@
-# Check whether --with-xdmauthdir or --without-xdmauthdir was given.
-if test "${with_xdmauthdir+set}" = set; then
- withval="$with_xdmauthdir"
- XDMAUTHDIR="$withval"
-else
- XDMAUTHDIR="${XDMCONFIGDIR}"
-fi;
-
-
-
# Check whether --with-logdir or --without-logdir was given.
if test "${with_logdir+set}" = set; then
withval="$with_logdir"
@@ -23802,7 +23543,7 @@
exec_prefix_NONE=
test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
- eval ac_define_dir="\"$XDMAUTHDIR\""
+ eval ac_define_dir="\"$XDMCONFIGDIR\""
DEF_AUTH_DIR="$ac_define_dir"
@@ -24786,7 +24527,6 @@
s,@XDMLIBDIR@,$XDMLIBDIR,;t t
s,@XDMCONFIGDIR@,$XDMCONFIGDIR,;t t
s,@XDMSCRIPTDIR@,$XDMSCRIPTDIR,;t t
-s,@XDMAUTHDIR@,$XDMAUTHDIR,;t t
s,@XDMLOGDIR@,$XDMLOGDIR,;t t
s,@XDMPIDDIR@,$XDMPIDDIR,;t t
s,@DEFAULTVT@,$DEFAULTVT,;t t
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:12:00 UTC (rev 1265)
+++ branches/modular/app/xdm-X11R7.0-1.0.1/greeter/Makefile.in 2006-02-21 03:16:36 UTC (rev 1266)
@@ -145,7 +145,6 @@
VERSION = @VERSION@
XAW_USE_XPRINT_FALSE = @XAW_USE_XPRINT_FALSE@
XAW_USE_XPRINT_TRUE = @XAW_USE_XPRINT_TRUE@
-XDMAUTHDIR = @XDMAUTHDIR@
XDMCONFIGDIR = @XDMCONFIGDIR@
XDMGREET_CFLAGS = @XDMGREET_CFLAGS@
XDMGREET_LIBS = @XDMGREET_LIBS@
Reply to: