OpenPAM/OpenPAM
OpenPAM/OpenPAM
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@386 185d5e19-27fe-0310-9dcf-9bff6b9f3609
This commit is contained in:
Dag-Erling Smørgrav 2006-04-12 10:26:27 +00:00
parent 4183fc1989
commit f380fbbf22
5 changed files with 44 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
INSTALL
View file

@ -24,18 +24,18 @@
This option should not be used if you intend to install PAM This option should not be used if you intend to install PAM
modules in the system library directory. modules in the system library directory.
--with-pam-su
Builds the sample PAM application.
--with-pam-unix --with-pam-unix
Builds the sample PAM module. Builds the sample PAM module.
--with-su
Builds the sample su(1) implementation.
For more information about configuration options, use the --help For more information about configuration options, use the --help
option. option.
A typical invocation might look like this: A typical invocation might look like this:
# ./configure --with-pam-su --with-pam-unix # ./configure --with-pam-unix --with-su
3. COMPILATION 3. COMPILATION

6
Makefile.am
View file

@ -1,5 +1,9 @@
# $Id$ # $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 EXTRA_DIST = CREDITS HISTORY INSTALL LICENSE MANIFEST README RELNOTES

6
bin/Makefile.am
View file

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

2
bin/su/Makefile.am
View file

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

49
configure.ac
View file

@ -50,13 +50,13 @@ AC_ARG_WITH(modules-dir,
AC_MSG_RESULT(no)]) AC_MSG_RESULT(no)])
AC_SUBST(OPENPAM_MODULES_DIR) AC_SUBST(OPENPAM_MODULES_DIR)
AC_MSG_CHECKING([whether to build example version of /bin/su]) AC_MSG_CHECKING([whether to build the documentation])
AC_ARG_WITH(pam-su, AC_ARG_WITH(doc,
AC_HELP_STRING([--with-pam-su], AC_HELP_STRING([--with-doc],
[compile example version of /bin/su]), [build documentation]),
, ,
[with_pam_su=no]) [with_doc=yes])
AC_MSG_RESULT($with_pam_su) AC_MSG_RESULT($with_pam_unix)
AC_MSG_CHECKING([whether to build example version of pam_unix.so]) AC_MSG_CHECKING([whether to build example version of pam_unix.so])
AC_ARG_WITH(pam-unix, AC_ARG_WITH(pam-unix,
@ -66,8 +66,17 @@ AC_ARG_WITH(pam-unix,
[with_pam_unix=no]) [with_pam_unix=no])
AC_MSG_RESULT($with_pam_unix) 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_PAM_UNIX, test "x$with_pam_unix" = "xyes")
AM_CONDITIONAL(WITH_SU, test "x$with_su" = "xyes")
AC_PROG_INSTALL AC_PROG_INSTALL
@ -89,16 +98,18 @@ AC_SUBST(CPPFLAGS)
CFLAGS="$CFLAGS -Werror" CFLAGS="$CFLAGS -Werror"
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
AC_CONFIG_FILES([bin/Makefile AC_CONFIG_FILES([
bin/su/Makefile bin/Makefile
include/Makefile bin/su/Makefile
include/security/Makefile include/Makefile
lib/Makefile include/security/Makefile
modules/Makefile lib/Makefile
modules/pam_unix/Makefile modules/Makefile
modules/pam_deny/Makefile modules/pam_unix/Makefile
modules/pam_permit/Makefile modules/pam_deny/Makefile
doc/Makefile modules/pam_permit/Makefile
doc/man/Makefile doc/Makefile
Makefile]) doc/man/Makefile
Makefile
])
AC_OUTPUT AC_OUTPUT