Build fixes

.gitignore

@@ -2,6 +2,7 @@
 ############################
 autom4te.cache
 configure
+aclocal.m4
 
 # Configure Generated Files #
 #############################

Makefile.in

@@ -39,11 +39,12 @@ INCPATH=        @CPPFLAGS@ -I${srcdir}/libsnet -I.
 OPTOPTS=	@OPTOPTS@
 CC=		@CC@
 DEFS=		
-LIBS=		-lsnet @LIBS@
+LIBS=		-lsnet @LIBS@ @pam_LIBS@ @ssl_LIBS@ @zlib_LIBS@
 LDFLAGS=	-Llibsnet/.libs @LDFLAGS@ ${LIBS}
 INSTALL=	@INSTALL@
 
-CFLAGS=		${DEFS} ${OPTOPTS} @CFLAGS@ ${INCPATH}
+CFLAGS=		${DEFS} ${OPTOPTS} ${INCPATH} \
+			@pam_CFLAGS@ @ssl_CFLAGS@ @zlib_CFLAGS@ @CFLAGS@
 
 BINTARGETS=     fsdiff ktcheck lapply lcksum lcreate lmerge lfdiff repo \
 		twhich lsort
@@ -256,10 +257,10 @@ VERSION=$(shell date +%Y%m%d)
 DISTDIR=radmind-${VERSION}
 
 dist   : distclean
-	mkdir ../${DISTDIR}
+	mkdir -p ../${DISTDIR}
 	tar -h -c -f - -X EXCLUDE . | tar xpf - -C ../${DISTDIR}
 	echo ${VERSION} > ../${DISTDIR}/VERSION
-	-mkdir ../${DISTDIR}/tmp
+	-mkdir -p ../${DISTDIR}/tmp
 	for i in ${MANTARGETS}; do \
 	    sed -e 's@_RADMIND_BUILD_DATE@${RADMIND_BUILD_DATE}@g' \
 		../${DISTDIR}/man/$$i > ../${DISTDIR}/tmp/$$i; \
@@ -269,7 +270,7 @@ dist   : distclean
 	(cd .. && tar cvfz ${DISTDIR}.tar.gz ${DISTDIR})
 
 rash : FRC
-	-mkdir tmp
+	-mkdir -p tmp
 	sed -e 's@_RADMIND_HOST@${RADMIND_HOST}@g' \
 	    -e 's@_RADMIND_AUTHLEVEL@${RADMIND_AUTHLEVEL}@g' \
 	    -e 's@_RADMIND_PREAPPLY@${PREAPPLYDIR}@g' \
@@ -283,8 +284,8 @@ rash : FRC
 	    ${srcdir}/ra.sh > tmp/ra.sh; 
 
 man : FRC
-	-mkdir tmp
-	-mkdir tmp/man
+	-mkdir -p tmp
+	-mkdir -p tmp/man
 	pwd
 	for i in ${MANTARGETS}; do \
 	    sed -e 's@_RADMIND_PATH@${RADMINDDIR}@g'  \
@@ -308,15 +309,15 @@ install	: all man rash
 	${INSTALL} -m 0755 -c tmp/ra.sh ${DESTDIR}/${BINDIR}/
 	-mkdir -p ${DESTDIR}/${prefix}
 	-mkdir -p ${DESTDIR}/${MANDIR}
-	-mkdir ${DESTDIR}/${MANDIR}/man1
+	-mkdir -p ${DESTDIR}/${MANDIR}/man1
 	for i in ${MAN1TARGETS}; do \
 	    ${INSTALL} -m 0644 -c tmp/man/$$i ${DESTDIR}/${MANDIR}/man1/; \
 	done
-	-mkdir ${DESTDIR}/${MANDIR}/man5
+	-mkdir -p ${DESTDIR}/${MANDIR}/man5
 	for i in ${MAN5TARGETS}; do \
 	    ${INSTALL} -m 0644 -c tmp/man/$$i ${DESTDIR}/${MANDIR}/man5/; \
 	done
-	-mkdir ${DESTDIR}/${MANDIR}/man8
+	-mkdir -p ${DESTDIR}/${MANDIR}/man8
 	 for i in ${MAN8TARGETS}; do \
 	    ${INSTALL} -m 0644 -c tmp/man/$$i ${DESTDIR}/${MANDIR}/man8/; \
 	done
@@ -333,8 +334,8 @@ PKGSRCDIR=`pwd`
 INFOLIST=	$(wildcard OS_X/*.plist)	
 
 info :
-	-mkdir tmp
-	-mkdir tmp/OS_X
+	-mkdir -p tmp
+	-mkdir -p tmp/OS_X
 	for i in ${INFOLIST}; do \
 	    sed -e 's@_RADMIND_VERSION@${VERSION}@g'  \
 		$$i > tmp/$$i; \

configure.ac

@@ -46,12 +46,6 @@ AC_SYS_LARGEFILE
 AC_CHECK_SIZEOF(off_t)
 AC_CHECK_SIZEOF(time_t)
 
-# check early to make any required changes to environment for following tests.
-CHECK_UNIVERSAL_BINARIES
-
-# mute Mac OS X's helpful notices that using dylib OpenSSL
-MACOSX_MUTE_DEPRECATION_WARNINGS
-
 # Checks for header files
 
 # glibc 2.25 still includes sys/sysmacros.h in sys/types.h but emits
@@ -62,41 +56,97 @@ CFLAGS="$HOST_CFLAGS -Werror"
 AC_HEADER_MAJOR
 CFLAGS="$SAVED_CFLAGS"
 
+# Enable features.
+
+AC_ARG_ENABLE([pam],
+    AS_HELP_STRING([--enable-pam], [Build with pam @<:@default=yes@:>@]),
+    [AS_CASE(${enableval}, [yes], [], [no], [],
+        [AC_MSG_ERROR([bad value '${enableval}' for --enable-pam])])],
+    [enable_pam=check])
+
+AC_ARG_ENABLE([ssl],
+    AS_HELP_STRING([--enable-ssl], [Build with openssl @<:@default=yes@:>@]),
+    [AS_CASE(${enableval}, [yes], [], [no], [],
+        [AC_MSG_ERROR([bad value '${enableval}' for --enable-ssl])])],
+    [enable_ssl=check])
+
+AC_ARG_ENABLE([zlib],
+    AS_HELP_STRING([--enable-zlib], [Build with zlib @<:@default=yes@:>@]),
+    [AS_CASE(${enableval}, [yes], [], [no], [],
+        [AC_MSG_ERROR([bad value '${enableval}' for --enable-zlib])])],
+    [enable_zlib=check])
 
 # Checks for libraries.
 AC_CHECK_LIB(c, inet_aton, libc_inet_aton=yes) 
 if test x$libc_inet_aton != xyes; then 
     AC_CHECK_LIB(resolv, inet_aton) 
 fi 
 if test x$host_vendor = xapply; then
-    AC_CHECK_LIB(c, lchown, [AC_DEFINE(HAVE_LCHOWN)], [])
-    AC_CHECK_LIB(c, lchmod, [AC_DEFINE(HAVE_LCHMOD)], [])
+    AC_CHECK_LIB(c, lchown, [AC_DEFINE([HAVE_LCHOWN], [], [lchown])])
+    AC_CHECK_LIB(c, lchmod, [AC_DEFINE([HAVE_LCHMOD], [], [lchmod])])
 fi
 AC_CHECK_LIB(nsl, gethostbyaddr)
 AC_CHECK_LIB([socket], [socket])
-AC_CHECK_LIB([ssl], [SSL_accept], , [CHECK_SSL])
+
+# Checks for pam.
+AS_IF([test x$enable_pam != xno],
+    [PKG_CHECK_MODULES([pam], [pam],
+	[AC_CHECK_HEADERS([pam/pam_appl.h],
+	    [], [AC_CHECK_HEADERS([security/pam_appl.h])])]
+        [AC_DEFINE([HAVE_LIBPAM], [1], [libpam])],
+        [AS_IF([test x$enable_pam != xyes],
+            [AC_MSG_WARN([cannot find pam.pc, disabling pam support])],
+            [enable_pam=error])
+        ])
+    ])
+
+AS_IF([test x$enable_pam = xerror],
+    [AC_MSG_ERROR([cannot find pam.pc and pam support requested])])
+
+AM_CONDITIONAL([ENABLE_PAM], [test x$enable_pam = xyes])
+AC_SUBST([pam_CFLAGS])
+AC_SUBST([pam_LIBS])
+
+# Checks for openssl.
+AS_IF([test x$enable_ssl != xno],
+    [PKG_CHECK_MODULES([ssl], [openssl],
+        [AC_DEFINE([HAVE_LIBSSL], [1], [libssl])],
+        [AS_IF([test x$enable_ssl != xyes],
+            [AC_MSG_WARN([cannot find openssl.pc, disabling libssl support])],
+            [enable_ssl=error])
+        ])
+    ])
+
 AC_CHECK_HEADER([openssl/ssl.h], [], [AC_MSG_ERROR([header file <openssl/ssl.h>
 is required for this software.  You may be running RedHat 9.  If so, see the FAQ or the README for further instructions.])])
-AC_CHECK_LIB([crypto], [SSLeay_version], , [CHECK_SSL])
-AC_CHECK_LIB([crypto], [X509_VERIFY_PARAM_set_flags], [AC_DEFINE(HAVE_X509_VERIFY_PARAM)], [])
-
-# PAM
-AC_ARG_WITH([pam], AC_HELP_STRING([--with-pam=PATH], [Pluggable Authentication Module support (default: /usr)]), [], with_pam=/usr)
-if test x_"$with_pam" != x_no; then
-    CPPFLAGS="${CPPFLAGS} -I$with_pam/include"
-    LDFLAGS="${LDFLAGS} -L$with_pam/lib"
-    AC_CHECK_LIB([pam], [pam_start],
-	[
-	AC_CHECK_HEADERS(pam/pam_appl.h, , [AC_CHECK_HEADERS(security/pam_appl.h)])
-	AC_DEFINE(HAVE_LIBPAM)
-	LIBS="$LIBS -lpam";
-	] 
-    )
-fi
-AC_CHECK_HEADER([dns_sd.h], [AC_DEFINE(HAVE_DNSSD)], [], [])
+AC_CHECK_LIB([crypto], [X509_VERIFY_PARAM_set_flags], [AC_DEFINE([HAVE_X509_VERIFY_PARAM], [], [X509_verify_param])])
+
+AS_IF([test x$enable_ssl = xerror],
+    [AC_MSG_ERROR([cannot find openssl.pc and libssl support requested])])
+
+AM_CONDITIONAL([ENABLE_LIBSSL], [test x$enable_ssl = xyes])
+AC_SUBST([ssl_CFLAGS])
+AC_SUBST([ssl_LIBS])
+
+AC_CHECK_HEADER([dns_sd.h], [AC_DEFINE([HAVE_DNSSD], [], [dnssd])])
 AC_CHECK_LIB(dns_sd, DNSServiceRegister)
 
-CHECK_ZLIB
+# Checks for zlib.
+AS_IF([test x$enable_zlib != xno],
+    [PKG_CHECK_MODULES([zlib], [zlib],
+        [AC_DEFINE([HAVE_ZLIB], [1], [zlib])],
+        [AS_IF([test x$enable_zlib != xyes],
+            [AC_MSG_WARN([cannot find zlib.pc, disabling zlib support])],
+            [enable_zlib=error])
+        ])
+    ])
+
+AS_IF([test x$enable_zlib = xerror],
+    [AC_MSG_ERROR([cannot find zlib.pc and zlib support requested])])
+
+AM_CONDITIONAL([ENABLE_ZLIB], [test x$enable_zlib = xyes])
+AC_SUBST([zlib_CFLAGS])
+AC_SUBST([zlib_LIBS])
 
 # HPUX lacks wait4 and strtoll
 AC_CHECK_FUNCS(wait4 strtoll)
@@ -112,7 +162,9 @@ if test x_"$OPTOPTS" = x_; then
 fi
 AC_SUBST(OPTOPTS)
 
-SET_NO_SASL
+ac_configure_args="$ac_configure_args --enable-sasl=no";
+AC_MSG_RESULT([Disabling SASL for libsnet])
+
 AC_CONFIG_SUBDIRS(libsnet)
 AC_CONFIG_FILES(Makefile)
 AC_OUTPUT