Changeset 386 in openpam


Ignore:
Timestamp:
Apr 12, 2006, 10:26:27 AM (9 years ago)
Author:
des
Message:

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

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/INSTALL

    r385 r386  
    2525        modules in the system library directory.
    2626
    27     --with-pam-su
    28         Builds the sample PAM application.
    29 
    3027    --with-pam-unix
    3128        Builds the sample PAM module.
     29
     30    --with-su
     31        Builds the sample su(1) implementation.
    3232
    3333  For more information about configuration options, use the --help
     
    3636  A typical invocation might look like this:
    3737
    38   # ./configure --with-pam-su --with-pam-unix
     38  # ./configure --with-pam-unix --with-su
    3939
    40403. COMPILATION
  • trunk/Makefile.am

    r320 r386  
    11# $Id$
    22
    3 SUBDIRS = lib bin modules doc include
     3SUBDIRS = lib bin modules include
     4
     5if WITH_DOC
     6SUBDIRS += doc
     7endif
    48
    59EXTRA_DIST = CREDITS HISTORY INSTALL LICENSE MANIFEST README RELNOTES
  • trunk/bin/Makefile.am

    r320 r386  
    11# $Id$
    22
    3 SUBDIRS = su
     3SUBDIRS =
     4
     5if WITH_SU
     6SUBDIRS += su
     7endif
  • trunk/bin/su/Makefile.am

    r320 r386  
    33INCLUDES = -I$(top_srcdir)/include
    44
    5 if WITH_PAM_SU
    65bin_PROGRAMS = su
    76su_SOURCES = su.c
    87su_LDADD = $(top_builddir)/lib/libpam.la
    9 endif
  • trunk/configure.ac

    r385 r386  
    5151AC_SUBST(OPENPAM_MODULES_DIR)
    5252
    53 AC_MSG_CHECKING([whether to build example version of /bin/su])
    54 AC_ARG_WITH(pam-su,
    55         AC_HELP_STRING([--with-pam-su],
    56                 [compile example version of /bin/su]),
     53AC_MSG_CHECKING([whether to build the documentation])
     54AC_ARG_WITH(doc,
     55        AC_HELP_STRING([--with-doc],
     56                [build documentation]),
    5757        ,
    58         [with_pam_su=no])
    59 AC_MSG_RESULT($with_pam_su)
     58        [with_doc=yes])
     59AC_MSG_RESULT($with_pam_unix)
    6060
    6161AC_MSG_CHECKING([whether to build example version of pam_unix.so])
     
    6767AC_MSG_RESULT($with_pam_unix)
    6868
    69 AM_CONDITIONAL(WITH_PAM_SU, test "x$with_pam_su" = "xyes")
     69AC_MSG_CHECKING([whether to build example version of su(1)])
     70AC_ARG_WITH(su,
     71        AC_HELP_STRING([--with-su],
     72                [compile example version of su(1)]),
     73        ,
     74        [with_su=no])
     75AC_MSG_RESULT($with_su)
     76
     77AM_CONDITIONAL(WITH_DOC, test "x$with_doc" = "xyes")
    7078AM_CONDITIONAL(WITH_PAM_UNIX, test "x$with_pam_unix" = "xyes")
     79AM_CONDITIONAL(WITH_SU, test "x$with_su" = "xyes")
    7180
    7281AC_PROG_INSTALL
     
    9099AC_SUBST(CFLAGS)
    91100
    92 AC_CONFIG_FILES([bin/Makefile
    93                 bin/su/Makefile
    94                 include/Makefile
    95                 include/security/Makefile
    96                 lib/Makefile
    97                 modules/Makefile
    98                 modules/pam_unix/Makefile
    99                 modules/pam_deny/Makefile
    100                 modules/pam_permit/Makefile
    101                 doc/Makefile
    102                 doc/man/Makefile
    103                 Makefile])
     101AC_CONFIG_FILES([
     102        bin/Makefile
     103        bin/su/Makefile
     104        include/Makefile
     105        include/security/Makefile
     106        lib/Makefile
     107        modules/Makefile
     108        modules/pam_unix/Makefile
     109        modules/pam_deny/Makefile
     110        modules/pam_permit/Makefile
     111        doc/Makefile
     112        doc/man/Makefile
     113        Makefile
     114])
    104115AC_OUTPUT
Note: See TracChangeset for help on using the changeset viewer.