Don't link everything against lib{z,bz2,pam,gdbm}.

diff --git a/clients/gtk2/Makefile.am b/clients/gtk2/Makefile.am
index 7cbf39a12188631291d542dc064aeab4b76bd5a0..13561ad804365e61b7e1765278f1776725e06910 100644 (file)
--- a/clients/gtk2/Makefile.am
+++ b/clients/gtk2/Makefile.am
@@ -21,7 +21,7 @@ BUILT_SOURCES=        mainwnd.gtk inpdialog.gtk pref.gtk reslist.gtk
 main.c: mainwnd.gtk inpdialog.gtk pref.gtk reslist.gtk
 
 localedir=$(datadir)/locale
-dolcon_LDFLAGS=        @GTK2_LIBS@ @LIBXML_LIBS@
+dolcon_LDFLAGS=        @GTK2_LIBS@ @LIBXML_LIBS@ -lbz2
 dolcon_LDADD=$(top_srcdir)/lib/libdcui.la $(top_srcdir)/common/libhttp.a
 dolcon_CPPFLAGS=@GTK2_CFLAGS@ @LIBXML_CFLAGS@ \
                -DLOCALEDIR=\"$(localedir)\"

diff --git a/configure.in b/configure.in
index 37eef901d35b13f57726f61e7e68e92a58851f45..bbeca731a4875473a28f9d2c11b9fc98cf555e15 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -23,9 +23,9 @@ AC_PROG_LIBTOOL
 
 DOLDA_AC_GROUP([Checking required libraries])
 
-AC_CHECK_LIB(z, deflate, , AC_MSG_ERROR([*** must have zlib]))
-AC_CHECK_LIB(bz2, BZ2_bzWriteOpen, , AC_MSG_ERROR([*** must have bzlib]))
-AC_CHECK_LIB(gdbm, gdbm_open, , AC_MSG_ERROR([*** must have gdbm]))
+AC_CHECK_LIB(z, deflate, [:], AC_MSG_ERROR([*** must have zlib]))
+AC_CHECK_LIB(bz2, BZ2_bzWriteOpen, [:], AC_MSG_ERROR([*** must have bzlib]))
+AC_CHECK_LIB(gdbm, gdbm_open, [:], AC_MSG_ERROR([*** must have gdbm]))
 
 extlibs=
 experimental=no
@@ -37,7 +37,8 @@ pam_msg=no
 AH_TEMPLATE(HAVE_PAM, [define to compile support for PAM authentication])
 AC_ARG_WITH(pam, [  --with-pam              Enable PAM support])
 DOLDA_PKG([HAS_PAM], [test "$with_pam" = no && HAS_PAM=no],
-                    [AC_CHECK_LIB(pam, pam_start, , [HAS_PAM=no])])
+                    [AC_CHECK_LIB(pam, pam_start, [:], [HAS_PAM=no])],
+                    [PAM_LIBS=-lpam])
 if test "$with_pam" = yes -a "$HAS_PAM" = no; then
        AC_MSG_ERROR([*** cannot find PAM on this system])
 fi
@@ -45,6 +46,7 @@ if test "$HAS_PAM" = yes; then
        AC_DEFINE(HAVE_PAM)
        pam_msg=yes
 fi
+AC_SUBST(PAM_LIBS)
 
 # Gtk 2.0 check
 AC_ARG_WITH(gtk2, [  --with-gtk2             Enable GTK2 support])

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 0f240d7fb28401578c50ffef45b99660bf3c70bd..3ff8bef56df8f6fdf94e2a55e09e51e1ac0cf200 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -26,5 +26,5 @@ doldacond_SOURCES=    main.c \
 
 EXTRA_DIST=emacs-local
 doldacond_LDADD=$(top_srcdir)/common/libcommon.a \
-               @KRB5_LIBS@ -lbz2 -lz
+               @KRB5_LIBS@ -lbz2 -lz -lgdbm @PAM_LIBS@
 doldacond_CPPFLAGS=-I$(top_srcdir)/include -DDAEMON @KRB5_CFLAGS@