Changeset 386 in openpam

Timestamp:

04/12/06 10:26:27 (7 years ago)

Author:

des

Message:

Clean up the build a little, and make the doc build optional.

Location:

trunk

Files:

• INSTALL (modified) (2 diffs)
• Makefile.am (modified) (1 diff)
• bin/Makefile.am (modified) (1 diff)
• bin/su/Makefile.am (modified) (1 diff)
• configure.ac (modified) (3 diffs)

trunk/INSTALL

@@ -25 +25 @@
         modules in the system library directory.
 
-    --with-pam-su
-        Builds the sample PAM application.
-
     --with-pam-unix
         Builds the sample PAM module.
+
+    --with-su
+        Builds the sample su(1) implementation.
 
   For more information about configuration options, use the --help
@@ -36 +36 @@
   A typical invocation might look like this:
 
-  # ./configure --with-pam-su --with-pam-unix
+  # ./configure --with-pam-unix --with-su
 
 3. COMPILATION

trunk/Makefile.am

@@ -1 +1 @@
 # $Id$
 
-SUBDIRS = lib bin modules doc include
+SUBDIRS = lib bin modules include
+
+if WITH_DOC
+SUBDIRS += doc
+endif
 
 EXTRA_DIST = CREDITS HISTORY INSTALL LICENSE MANIFEST README RELNOTES

trunk/bin/Makefile.am

@@ -1 +1 @@
 # $Id$
 
-SUBDIRS = su
+SUBDIRS =
+
+if WITH_SU
+SUBDIRS += su
+endif

trunk/bin/su/Makefile.am

@@ -3 +3 @@
 INCLUDES = -I$(top_srcdir)/include
 
-if WITH_PAM_SU
 bin_PROGRAMS = su
 su_SOURCES = su.c
 su_LDADD = $(top_builddir)/lib/libpam.la
-endif

trunk/configure.ac

@@ -51 +51 @@
 AC_SUBST(OPENPAM_MODULES_DIR)
 
-AC_MSG_CHECKING([whether to build example version of /bin/su])
-AC_ARG_WITH(pam-su,
-        AC_HELP_STRING([--with-pam-su],
-                [compile example version of /bin/su]),
+AC_MSG_CHECKING([whether to build the documentation])
+AC_ARG_WITH(doc,
+        AC_HELP_STRING([--with-doc],
+                [build documentation]),
         ,
-        [with_pam_su=no])
-AC_MSG_RESULT($with_pam_su)
+        [with_doc=yes])
+AC_MSG_RESULT($with_pam_unix)
 
 AC_MSG_CHECKING([whether to build example version of pam_unix.so])
@@ -67 +67 @@
 AC_MSG_RESULT($with_pam_unix)
 
-AM_CONDITIONAL(WITH_PAM_SU, test "x$with_pam_su" = "xyes")
+AC_MSG_CHECKING([whether to build example version of su(1)])
+AC_ARG_WITH(su,
+        AC_HELP_STRING([--with-su],
+                [compile example version of su(1)]),
+        ,
+        [with_su=no])
+AC_MSG_RESULT($with_su)
+
+AM_CONDITIONAL(WITH_DOC, test "x$with_doc" = "xyes")
 AM_CONDITIONAL(WITH_PAM_UNIX, test "x$with_pam_unix" = "xyes")
+AM_CONDITIONAL(WITH_SU, test "x$with_su" = "xyes")
 
 AC_PROG_INSTALL
@@ -90 +99 @@
 AC_SUBST(CFLAGS)
 
-AC_CONFIG_FILES([bin/Makefile
-                bin/su/Makefile
-                include/Makefile
-                include/security/Makefile
-                lib/Makefile
-                modules/Makefile
-                modules/pam_unix/Makefile
-                modules/pam_deny/Makefile
-                modules/pam_permit/Makefile
-                doc/Makefile
-                doc/man/Makefile
-                Makefile])
+AC_CONFIG_FILES([
+        bin/Makefile
+        bin/su/Makefile
+        include/Makefile
+        include/security/Makefile
+        lib/Makefile
+        modules/Makefile
+        modules/pam_unix/Makefile
+        modules/pam_deny/Makefile
+        modules/pam_permit/Makefile
+        doc/Makefile
+        doc/man/Makefile
+        Makefile
+])
 AC_OUTPUT