Enlightenment CVS committal

Author  : vapier
Project : e17
Module  : apps/entrance

Dir     : e17/apps/entrance


Modified Files:
        configure.in 


Log Message:
add a proper --enable-pam option and convert existing help strings to 
AC_HELP_STRING()

===================================================================
RCS file: /cvs/e/e17/apps/entrance/configure.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -3 -r1.59 -r1.60
--- configure.in        22 Jul 2006 09:25:44 -0000      1.59
+++ configure.in        11 Aug 2006 04:45:55 -0000      1.60
@@ -37,7 +37,8 @@
 dnl Set path to X_BINARIES in config.h
 dnl# FIXME:  Use AC_PATH_PROG macro here.
 xbin=""
-AC_ARG_WITH(xbin, [ --with-xbin=DIR            Directory where X binaries are 
installed ],
+AC_ARG_WITH(xbin,
+       AC_HELP_STRING([--with-xbin=DIR],[Directory where X binaries are 
installed]),
             [
                 xbin="$withval"
             ], [
@@ -82,10 +83,21 @@
        AC_DEFINE(HAVE_CLEARENV, 1, [clearenv() function available])])
 
 have_pam=no
-AC_CHECK_HEADERS(security/pam_appl.h, [
-       LIBS="$LIBS -lpam"
-       have_pam=yes
-    AC_DEFINE(HAVE_PAM, 1, [PAM Authentication Support])])
+AC_ARG_ENABLE(pam,
+       AC_HELP_STRING([--enable-pam],[enable PAM support 
@<:@default=detect@:>@]),
+       [want_pam=$enableval],
+       [want_pam=auto]
+)
+if test "x$want_pam" != "xno" ; then
+       have_pam=no
+       AC_CHECK_HEADERS(security/pam_appl.h, [
+               LIBS="$LIBS -lpam"
+               have_pam=yes
+           AC_DEFINE(HAVE_PAM, 1, [PAM Authentication Support])])
+       if test "x$want_pam$have_pam" = "xyesno" ; then
+               AC_MSG_ERROR(PAM not found)
+       fi
+fi
 
 have_crypt=no
 AC_CHECK_LIB(crypt, crypt, [
@@ -113,7 +125,7 @@
 fi
 
 AC_ARG_WITH(auth_mode,
-    [  --with-auth-mode=AUTHMODE  Specify the default authentication mode (pam 
or shadow)],
+    AC_HELP_STRING([--with-auth-mode=AUTHMODE],[Specify the default 
authentication mode (pam or shadow)]),
     [
      if test "x$withval" = "xshadow"; then
          auth_mode=2
@@ -124,7 +136,8 @@
 AC_SUBST(auth_mode)
 
 AC_MSG_CHECKING([for pam configuration source])
-AC_ARG_WITH(pam-config, [  --with-pam-config=SRC   Specify PAM config source 
(entrance, gdm, xdm, etc. or "auto")],
+AC_ARG_WITH(pam-config,
+       AC_HELP_STRING([--with-pam-config=SRC],[Specify PAM config source 
(entrance, gdm, xdm, etc. or "auto")]),
             [
                 if test "x$have_pam" = "yes"; then
                     AC_MSG_RESULT([N/A, pam disabled])
@@ -163,7 +176,7 @@
 fi
 
 AC_ARG_WITH(xsession,
-       [  --with-xsession=PATH    Specify the location of system Xsession 
file],
+       AC_HELP_STRING([--with-xsession=PATH],[Specify the location of system 
Xsession file]),
        [
            if test "x$withval" != "xno" ; then
                xsession=$withval
@@ -185,7 +198,7 @@
 
 edje_cc="`$EDJE_CONFIG --prefix`/bin/edje_cc"
 AC_ARG_WITH(edje-cc,
-[  --with-edje-cc=PATH     Specify a specific path to edje_cc],
+       AC_HELP_STRING([--with-edje-cc=PATH],[Specify a specific path to 
edje_cc]),
 [
   v=$withval;
   edje_cc=$v
@@ -196,7 +209,7 @@
 AC_SUBST(edje_cc)
 
 AC_MSG_CHECKING([for virtual console for X startup])
-AC_ARG_WITH(vt, [  --with-vt=NUM           Specify on which virtual console to 
start X (default 7)],
+AC_ARG_WITH(vt, AC_HELP_STRING([--with-vt=NUM],[Specify on which virtual 
console to start X (default 7)]),
             [
                 if (test $withval -ge 0) >/dev/null 2>&1; then
                     AC_MSG_RESULT([$withval])



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to