Linker lib cleanup

No need for all those libs to be linked into *every* program

diff --git a/configure b/configure
index 0bdbb4c1ddcb700ae63d00a70c815601067a1487..6c3c7ec321a71d2cdefbcedec66cdc3b9fe6efb6 100755 (executable)
--- a/configure
+++ b/configure
@@ -71,9 +71,12 @@ IMP=no
 UTMP=auto
 NLS=auto
 OPTIMIZER="-O"
+LIBCRYPT=
+LIBPAM=
 LIBTIFF="-L/usr/local/lib -ltiff"
 TIFFINC=/usr/local/include
 TIFFBIN=
+LIBUTIL=
 LIBZ=
 ZLIBINC=
 LIBINTL=
@@ -170,10 +173,12 @@ INSTALL
 LIBDATA                DIR_LIBDATA
 LIBDIR         DIR_LIB
 LIBEXEC                DIR_LIBEXEC
+LIBCRYPT
 LIBINTL
 LIBPORT
 LIBREGEX
 LIBTIFF
+LIBUTIL
 LIBZ
 LIBDB
 LLDOPTS
@@ -182,7 +187,7 @@ LN_S
 LOCALEDIR       DIR_LOCALE
 LOCALE_DOMAIN
 HAVE_PAM
-PAMLIBS
+LIBPAM
 HAVE_JBIG
 HAVE_JBIGTIFF
 LIBJBIG"
@@ -1624,7 +1629,7 @@ main()
     struct pam_conv conv = { pamconv };
 }
 EOF
-    if runMake t "t:; \${C++F} $PAMLIBS \${C++FILE} t.c++${MAKECXXOVERRIDE}"; then
+    if runMake t "t:; \${C++F} $LIBPAM \${C++FILE} t.c++${MAKECXXOVERRIDE}"; then
        echo '#define STRUCT_PAM_MESSAGE const struct pam_message'
     else
        echo '#define STRUCT_PAM_MESSAGE struct pam_message'
@@ -1635,15 +1640,14 @@ EOF
 }
 
 HAVE_PAM="/*#define HAVE_PAM 1*/"
-PAMLIBS=""
 if [ "$DISABLE_PAM" != "yes" ]; then
        Note "Checking for PAM (Pluggable Authentication Module) support"
        CheckForLibrary pam_authenticate -lpam &&
                CheckForIncludeFile security/pam_appl.h && {
                        HAVE_PAM="#define HAVE_PAM 1"
-                       PAMLIBS="-lpam"
+                       LIBPAM="-lpam"
                }
-       if [ "x$PAMLIBS" = "x" ]; then
+       if [ "x$LIBPAM" = "x" ]; then
                Note "... not found. Disabling PAM support"
                else
                Note "... found. Enabling PAM support"
@@ -1729,7 +1733,7 @@ CheckForLibrary crypt -lc || {
     for i in -lcrypt -lcrypt_d -lcrypt_i; do
        if CheckForLibrary crypt $i; then
            Note "Looks like $i is needed for crypt."
-           MACHDEPLIBS="$MACHDEPLIBS $i"
+           LIBCRYPT="$i"
            break;
        fi
     done
@@ -1795,7 +1799,7 @@ CheckForLibrary inet_aton -lc || {
 
 if CheckForLibrary logwtmp -lutil; then
     Note "Looks like -lutil is needed for wtmp file logging."
-    MACHDEPLIBS="$MACHDEPLIBS -lutil"
+    LIBUTIL="-lutil"
     HAS_LOGWTMP=yes
 else
     HAS_LOGWTMP=no
@@ -3163,7 +3167,7 @@ BuildPortDotH()
        Note "... add declaration for tiff_runlen_t"
        echo "#define tiff_runlen_t ${tiff_runlen_t}"
     fi
-    if [ "x$PAMLIBS" != "x" ]; then
+    if [ "x$LIBPAM" != "x" ]; then
        CheckPAMType
     fi
 

diff --git a/defs.in b/defs.in
index 2aff9cdccce7669ee261e41b749c2ed9dc6dfa43..15fc896c6aa86b366bfb698890eb85214d76f886 100644 (file)
--- a/defs.in
+++ b/defs.in
@@ -140,7 +140,7 @@ C++FILE             = @CXXFILE@
 
 # default definitions for programs--overide them as desired
 LIBS           = ${UTIL}/libhylafax-${ABI_VERSION}.${DSO}
-LLDLIBS                = -L${UTIL} -lhylafax-${ABI_VERSION} @PAMLIBS@ @LIBJBIG@ ${LIBTIFF} ${LIBZ} ${LIBREGEX} ${LIBPORT} ${MACHDEPLIBS}
+LLDLIBS                = -L${UTIL} -lhylafax-${ABI_VERSION} @LIBJBIG@ ${LIBTIFF} ${LIBZ} ${LIBREGEX} ${LIBPORT} ${MACHDEPLIBS}
 #
 # Override this definition to eliminate shared library use.
 #
@@ -198,6 +198,9 @@ LIBREGEX    = @LIBREGEX@
 UTIL           = ${DEPTH}/libhylafax
 FAXD           = ${DEPTH}/faxd
 LIBPORT                = @LIBPORT@
+LIBPAM         = @LIBPAM@
+LIBUTIL                = @LIBUTIL@
+LIBCRYPT       = @LIBCRYPT@
 
 #
 # Definitions used by common rules.

diff --git a/faxd/Makefile.in b/faxd/Makefile.in
index bdc58e6a377a7badc4ed797f8b851f88166fdcbd..b25ef912dfae15ee843d6d029876f69992af9d33 100644 (file)
--- a/faxd/Makefile.in
+++ b/faxd/Makefile.in
@@ -191,7 +191,7 @@ faxq:       ${FAXQOBJS} libfaxserver.a ${LIBS}
 faxsend: ${FAXSENDOBJS} libfaxserver.a ${LIBS}
        ${C++F} -o $@ ${FAXSENDOBJS} ${LIBFAXSERVER} ${LDFLAGS}
 faxgetty: ${FAXGETTYOBJS} libfaxserver.a ${LIBS}
-       ${C++F} -o $@ ${FAXGETTYOBJS} ${LIBFAXSERVER} ${LDFLAGS}
+       ${C++F} -o $@ ${FAXGETTYOBJS} ${LIBUTIL} ${LIBFAXSERVER} ${LDFLAGS}
 faxqclean: ${FAXQCLEANOBJS} libfaxserver.a ${LIBS}
        ${C++F} -o $@ ${FAXQCLEANOBJS} ${LIBFAXSERVER} ${LDFLAGS}
 

diff --git a/hfaxd/Makefile.in b/hfaxd/Makefile.in
index bdb50cfe4d6087299a6f31d4e224feacec4da740..24b97bf4de274c9c72a7d5533d7c9dde43f0bcf2 100644 (file)
--- a/hfaxd/Makefile.in
+++ b/hfaxd/Makefile.in
@@ -75,7 +75,7 @@ targets: $(TARGETS)
 @MAKEINCLUDE@ @MAKELQUOTE@${COMMONRULES}@MAKERQUOTE@
 
 hfaxd: ${OBJECTS} FaxRequest.o FaxItem.o ${LIBS}
-       ${C++F} -o $@ ${OBJECTS} FaxRequest.o FaxItem.o ${LDFLAGS}
+       ${C++F} -o $@ ${OBJECTS} FaxRequest.o FaxItem.o ${LIBCRYPT} ${LIBPAM} ${LDFLAGS}
 
 #
 # Private versions are built so that we do not need

diff --git a/util/Makefile.in b/util/Makefile.in
index f106416b4ea7f4bbb2314f6635c631dec77136f0..640ccd8a9f3c1b0c73b74f07dcc6c747c2e9ffbb 100644 (file)
--- a/util/Makefile.in
+++ b/util/Makefile.in
@@ -76,7 +76,7 @@ faxstate: ${SRCDIR}/faxstate.c ${LIBS}
 faxmodem: ${SRCDIR}/faxmodem.c ${LIBS}
        ${CCF} -o $@ ${SRCDIR}/faxmodem.c ${LDFLAGS}
 faxadduser: ${SRCDIR}/faxadduser.c ${LIBS}
-       ${CCF} -o $@ ${SRCDIR}/faxadduser.c ${LDFLAGS}
+       ${CCF} -o $@ ${SRCDIR}/faxadduser.c ${LIBCRYPT} ${LDFLAGS}
 faxconfig: ${SRCDIR}/faxconfig.c ${LIBS}
        ${CCF} -o $@ ${SRCDIR}/faxconfig.c ${LDFLAGS}
 faxdeluser: ${SRCDIR}/faxdeluser.c ${LIBS}