pam-login-sia-et-al-reorg-20040325

FIXES 3680

rework top makefile to build pam or not depending on acinclude.m4

diff --git a/Makefile.in b/Makefile.in
index 0a31fa0..46b5a5f 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -287,33 +287,48 @@ vfsck:    vol
                ${COMPILE_PART1} vfsck ${COMPILE_PART2} ;; \
        esac
 
-login: cmd comerr kauth rxkad
+pam: cmd comerr kauth rxkad
+       set -x; \
+       if test "@HAVE_PAM@" = "yes"; then \
+               ${COMPILE_PART1} pam ${COMPILE_PART2} ; \
+       else \
+               echo Skipping pam for ${SYS_NAME} ; \
+       fi
+
+tsm41: cmd comerr kauth rxkad
        set -x; \
        case ${SYS_NAME} in \
-       sgi_* ) \
-               ${COMPILE_PART1} sgistuff ${COMPILE_PART2} ;; \
-       rs_aix42 | rs_aix51 ) \
+       rs_aix* ) \
                ${COMPILE_PART1} tsm41 ${COMPILE_PART2} ;; \
+       * ) \
+               echo Skipping tsm41 for ${SYS_NAME} ;; \
+       esac
+
+sia: cmd comerr kauth rxkad
+       set -x; \
+       case ${SYS_NAME} in \
        alpha_dux* ) \
                ${COMPILE_PART1} sia ${COMPILE_PART2} ;; \
-       sun4x_55 ) \
-               ${COMPILE_PART1} login ${COMPILE_PART2} ;; \
-       parisc_linux24) \
-               echo Skipping pam/login for parisc_linux24 ;; \
-       amd64_linux24) \
-               echo Skipping pam/login for amd64_linux24 ;; \
-       sun4x_* | sunx86_* | hp_ux11* | ia64_hpux* | *linux* | *fbsd* ) \
-               if test "@HAVE_PAM@" = "yes"; then \
-                       ${COMPILE_PART1} pam ${COMPILE_PART2} ; \
-               else \
-                       echo Skipping pam for ${SYS_NAME} ; \
-               fi ;; \
-       *_darwin* | *_obsd* | *_nbsd* | hp_ux* | rs_aix5* ) \
-               echo Skipping login for ${SYS_NAME} ;; \
        * ) \
-               ${COMPILE_PART1} login ${COMPILE_PART2} ;; \
+               echo Skipping sia for ${SYS_NAME} ;; \
        esac
 
+sgistuff: cmd comerr kauth rxkad
+       set -x; \
+       case ${SYS_NAME} in \
+       sgi_* ) \
+               ${COMPILE_PART1} sgistuff ${COMPILE_PART2} ;; \
+       * ) \
+               echo Skipping sgistuff for ${SYS_NAME} ;; \
+       esac
+
+login: cmd comerr kauth rxkad pam sia tsm41 sgistuff
+       set -x; \
+       if test "@BUILD_LOGIN@" = "yes"; then \
+               ${COMPILE_PART1} login ${COMPILE_PART2} ; \
+       else \
+               echo Skipping login for ${SYS_NAME} ; \
+       fi
 
 #
 # _depinstall targets - only build and install headers/sources that are needed by libafs/libuafs

diff --git a/acinclude.m4 b/acinclude.m4
index b3473a3..b097ad9 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -19,6 +19,8 @@ AC_ARG_ENABLE( insecure,
 [  --enable-insecure                   enable insecure portions of AFS (ftpd, inetd, rcp, rlogind and rsh)],, enable_insecure="no")
 AC_ARG_ENABLE( afsdb,
 [  --disable-afsdb                     disable AFSDB RR support],, enable_afsdb="yes")
+AC_ARG_ENABLE( pam,
+[  --disable-pam                       disable PAM support],, enable_pam="yes")
 AC_ARG_ENABLE( bos-restricted-mode,
 [  --enable-bos-restricted-mode        enable bosserver restricted mode which disables certain bosserver functionality],, enable_bos_restricted_mode="no")
 AC_ARG_ENABLE( bos-new-config,
@@ -78,6 +80,8 @@ AC_ARG_ENABLE(optimize-lwp,
 [  --disable-optimize-lwp              disable optimization for compilation of the LWP code (defaults to enabled)],, enable_optimize_lwp="yes"
 )
 
+enable_login="no"
+
 dnl weird ass systems
 AC_AIX
 AC_ISC_POSIX
@@ -507,6 +511,7 @@ else
                        ;;
                sparc-sun-solaris2.5*)
                        AFS_SYSNAME="sun4x_55"
+                       enable_login="yes"
                        ;;
                sparc-sun-solaris2.6)
                        AFS_SYSNAME="sun4x_56"
@@ -522,6 +527,7 @@ else
                        ;;
                sparc-sun-sunos4*)
                        AFS_SYSNAME="sun4_413"
+                       enable_login="yes"
                        ;;
                i386-pc-solaris2.7)
                        AFS_SYSNAME="sunx86_57"
@@ -570,6 +576,7 @@ else
                        ;;
                parisc-*-linux-gnu)
                        AFS_SYSNAME="parisc_linuxXX"
+                       enable_pam="no"
                        ;;
                power*-ibm-aix4.2*)
                        AFS_SYSNAME="rs_aix42"
@@ -585,6 +592,7 @@ else
                        ;;
                x86_64-*-linux-gnu)
                        AFS_SYSNAME="amd64_linuxXX"
+                       enable_pam="no"
                        ;;
                *)
                        AC_MSG_ERROR(An AFS sysname is required)
@@ -872,13 +880,20 @@ AC_CHECK_HEADERS(sys/mount.h strings.h termios.h signal.h)
 AC_CHECK_HEADERS(windows.h malloc.h winsock2.h direct.h io.h sys/user.h)
 AC_CHECK_HEADERS(security/pam_modules.h siad.h usersec.h ucontext.h regex.h)
 
-if test "$ac_cv_header_security_pam_modules_h" = "yes"; then
+if test "$ac_cv_header_security_pam_modules_h" = yes -a "$enable_pam" = yes; then
        HAVE_PAM="yes"
 else
        HAVE_PAM="no"
 fi
 AC_SUBST(HAVE_PAM)
 
+if test "$enable_login" = yes; then
+       BUILD_LOGIN="yes"
+else
+       BUILD_LOGIN="no"
+fi
+AC_SUBST(BUILD_LOGIN)
+
 AC_CHECK_FUNCS(utimes random srandom getdtablesize snprintf strlcat strlcpy re_comp re_exec)
 AC_CHECK_FUNCS(setprogname getprogname sigaction mkstemp vsnprintf strerror)