As we need to change configure.in anyway, try to get the libs a bit better

diff --git a/configure.in b/configure.in
index 5a1b5176e783fbca66a1d58602b01ce651df3607..fe2fcc345d4bd6f690ea9816336988206ed98a4f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.179.2.3.2.37.2.5 2005-09-27 10:40:40 didg Exp $
+dnl $Id: configure.in,v 1.179.2.3.2.37.2.6 2006-09-07 03:45:54 didg Exp $
 dnl configure.in for netatalk
 
 AC_INIT(etc/afpd/main.c)
@@ -46,7 +46,7 @@ dnl AC_CHECK_LIB(crypt, main)
 dnl Replace `main' with a function in -ld:
 dnl AC_CHECK_LIB(d, main)
 dnl Replace `main' with a function in -ldl:
-AC_CHECK_LIB(dl, dlopen)
+dnl AC_CHECK_LIB(dl, dlopen)
 dnl Replace `main' with a function in -lkauth:
 dnl AC_CHECK_LIB(kauth, main)
 dnl Replace `main' with a function in -lkrb:
@@ -55,16 +55,17 @@ dnl Replace `main' with a function in -llwp:
 dnl AC_CHECK_LIB(lwp, main)
 dnl Replace `main' with a function in -ln:
 dnl AC_CHECK_LIB(n, main)
-dnl Replace `main' with a function in -lnsl:
-AC_CHECK_LIB(nsl, main)
+
+dnl not the right stuff but should be enough for now
+AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)])
+AC_CHECK_FUNC(connect,,[AC_CHECK_LIB(socket,connect)])
+
 dnl Replace `main' with a function in -lprot:
 dnl AC_CHECK_LIB(prot, main)
 dnl Replace `main' with a function in -lrx:
 dnl AC_CHECK_LIB(rx, main)
 dnl Replace `main' with a function in -lrxkad:
 dnl AC_CHECK_LIB(rxkad, main)
-dnl Replace `main' with a function in -lsocket:
-AC_CHECK_LIB(socket, socket)
 dnl Replace `main' with a function in -lsys:
 dnl AC_CHECK_LIB(sys, main)
 dnl Replace `main' with a function in -lubik:

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 9741f26b259d526aad1df6ad6a7f403506911f77..04af5c256f1803d3cd94a384ce6752046ebea8d7 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -17,7 +17,7 @@ noinst_HEADERS = auth.h afp_config.h desktop.h directory.h file.h \
         filedir.h fork.h globals.h icon.h mangle.h misc.h status.h switch.h \
         uam_auth.h uid.h unix.h volume.h
 
-LIBS = @LIBS@ @PAM_LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@
+LIBS = @LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ @WRAP_LIBS@ @LIBADD_DL@
 
 CFLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/sys \
         @CFLAGS@ @SLP_CFLAGS@ \

diff --git a/etc/cnid_dbd/Makefile.am b/etc/cnid_dbd/Makefile.am
index bded38b16bad41dba02187ee0552e9a5a19c605a..d42aef258c455757e945743b8d7c1e537fd65db5 100644 (file)
--- a/etc/cnid_dbd/Makefile.am
+++ b/etc/cnid_dbd/Makefile.am
@@ -11,18 +11,15 @@ cnid_dbd_SOURCES = dbif.c pack.c comm.c db_param.c main.c \
                    dbd_update.c dbd_delete.c dbd_getstamp.c \
                    dbd_dbcheck.c
 
-cnid_dbd_LDADD = $(top_builddir)/libatalk/libatalk.la
+cnid_dbd_LDADD = $(top_builddir)/libatalk/libatalk.la @BDB_LIBS@
 
 cnid_metad_SOURCES = cnid_metad.c usockfd.c db_param.c
 
-cnid_metad_LDADD = $(top_builddir)/libatalk/libatalk.la
+cnid_metad_LDADD = $(top_builddir)/libatalk/libatalk.la 
 
 noinst_HEADERS = dbif.h pack.h db_param.h dbd.h usockfd.h comm.h
 
 EXTRA_DIST = README
 
-LIBS = @LIBS@ @BDB_LIBS@
-
-
 CFLAGS = @CFLAGS@ @BDB_CFLAGS@ \
          -D_PATH_CNID_DBD=\"$(sbindir)/cnid_dbd\"

diff --git a/etc/papd/Makefile.am b/etc/papd/Makefile.am
index 8f64cad9398fc26e870a607499a6de1585ab920f..8f5c5697e33c472c3d274af630210852905cea63 100644 (file)
--- a/etc/papd/Makefile.am
+++ b/etc/papd/Makefile.am
@@ -9,7 +9,7 @@ bin_PROGRAMS = showppd
 papd_SOURCES = main.c printcap.c session.c file.c comment.c lp.c ppd.c \
               magics.c headers.c queries.c auth.c uam.c print_cups.c
 
-papd_LDADD = $(top_builddir)/libatalk/libatalk.la @PAM_LIBS@ @CUPS_LIBS@
+papd_LDADD = $(top_builddir)/libatalk/libatalk.la @CUPS_LIBS@ @LIBADD_DL@
 papd_LDFLAGS = -export-dynamic @CUPS_LDFLAGS@
 
 showppd_SOURCES = showppd.c ppd.c