Remove unused PAPD_LIBS, replaced AFPD_LIBS by WRAP_LIBS.

diff --git a/configure.in b/configure.in
index d61aa31992c0e9e4682f87fa24d5f238d5c945c9..a40e958aff987e4604f5c7d2c74452c3ba4ab9cc 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.180 2003-06-06 16:16:45 srittau Exp $
+dnl $Id: configure.in,v 1.181 2003-06-06 18:28:10 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -315,8 +315,6 @@ NETATALK_SRVLOC
 
 dnl Check for PAM libs
 AC_PATH_PAM([
-       PAPD_LIBS="$PAPD_LIBS $PAM_LIBS"
-       AFPD_LIBS="$AFPD_LIBS $PAM_LIBS"
        use_pam_so=yes
        compile_pam=yes
        AC_DEFINE(USE_PAM, 1, [Define to enable PAM support])
@@ -345,10 +343,11 @@ AC_ARG_WITH(tcp-wrappers,
        [  --with-tcp-wrappers     enable TCP wrappers support],
        AC_CHECK_LIB(wrap, tcpd_warn,
                AC_DEFINE(TCPWRAP, 1, [Define if TCP wrappers should be used])
-               AFPD_LIBS="$AFPD_LIBS -lwrap"
+               WRAP_LIBS="-lwrap"
                AC_MSG_RESULT([enabling TCP wrappers support])
        )
 )
+AC_SUBST(WRAP_LIBS)
 
 AC_ARG_ENABLE(redhat,
        [  --enable-redhat         use redhat-style sysv configuration ],
@@ -658,8 +657,6 @@ AC_MSG_RESULT([$OVERWRITE_CONFIG])
 dnl --------------------- last minute substitutions
 
 AC_SUBST(LIBS)
-AC_SUBST(AFPD_LIBS)
-AC_SUBST(PAPD_LIBS)
 AC_SUBST(CFLAGS)
 AC_SUBST(OVERWRITE_CONFIG)
 

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index 56308fef88fee0e65c7c275fd6e763990e87c1b5..88be22e6ca15ff1e5ba7ccf0516ef4326286c2f6 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -13,7 +13,7 @@ afpd_SOURCES = unix.c ofork.c main.c switch.c auth.c volume.c directory.c \
         afp_config.c nfsquota.c codepage.c quota.c uam.c afs.c uid.c  \
         afp_util.c catsearch.c precompose.c
 
-afpd_LDADD = @AFPD_LIBS@ @PAM_LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ \
+afpd_LDADD = @WRAP_LIBS@ @PAM_LIBS@ @QUOTA_LIBS@ @SLP_LIBS@ \
        $(top_builddir)/libatalk/libatalk.la
 afpd_LDFLAGS = -export-dynamic