Enlightenment CVS committal

Author  : atmosphere
Project : e17
Module  : apps/entrance

Dir     : e17/apps/entrance


Modified Files:
        acconfig.h configure.in 


Log Message:
This should make everyone happy about different placement of Xsession
files.

===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/acconfig.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- acconfig.h  26 May 2003 05:59:44 -0000      1.3
+++ acconfig.h  17 Sep 2003 04:31:20 -0000      1.4
@@ -11,3 +11,4 @@
 #undef PACKAGE_SOURCE_DIR
 #undef PACKAGE_CFG_DIR
 #undef PREFIX
+#undef ENTRANCE_XSESSION
===================================================================
RCS file: /cvsroot/enlightenment/e17/apps/entrance/configure.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- configure.in        27 Jul 2003 19:29:25 -0000      1.10
+++ configure.in        17 Sep 2003 04:31:20 -0000      1.11
@@ -94,7 +94,7 @@
        have_pam=yes
     AC_DEFINE(HAVE_PAM)])
 
-have_crypt = no
+have_crypt=no
 AC_CHECK_LIB(crypt, crypt, [
        LIBS="$LIBS -lcrypt"
        have_crypt=yes])
@@ -112,6 +112,25 @@
        have_shadow=yes])
 fi
 
+# what Xsession file we're using
+xsession=/etc/X11/xdm/Xsession
+AC_ARG_WITH(xsession,
+       [ --with-xsession=PATH  Specify the location of system Xsession file],
+       [
+           if test "x$withval" != "xno" ; then
+               xsession=$withval
+           fi
+       ]
+)
+if test ! -x $xsession ; then
+    AC_MSG_WARN([** no $xsession file on this system **])
+    AC_MSG_WARN([** Perhaps you need to specify --with-xsession **])
+    xsession="You should reconfigure --with-xsession"
+fi
+
+AC_DEFINE_UNQUOTED(ENTRANCE_XSESSION, "$xsession")
+AC_SUBST(xsession)
+
 #AC_CONFIG_FILES([src/daemon/entrance_wrapper:src/daemon/entrance_wrapper.in],
 #                              [chmod a+x src/daemon/entrance_wrapper])
 
@@ -139,6 +158,7 @@
 echo "Support for crypt authentication... $have_crypt"
 echo "Support for shadow authentication... $have_shadow"
 echo "Support for PAM authentication...... $have_pam"
+echo "XSession file to use ...... $xsession "
 echo
 echo "Now type 'make' (gmake on some systems) to compile $PACKAGE"
 echo




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf
_______________________________________________
enlightenment-cvs mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to