Don't add db3 flags to CFLAGS and LIBS, but use DB3_CFLAGS and DB3_LIBS

directly, where they are needed.

diff --git a/configure.in b/configure.in
index d44a8adfc47a1a8a813890c9bafea064045c9b2d..af642f3ae4c71611044350e96accdc56816cc7fd 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.129 2001-11-23 07:35:12 srittau Exp $
+dnl $Id: configure.in,v 1.130 2001-11-23 22:45:23 srittau Exp $
 dnl configure.in for netatalk
 
 AC_INIT(bin/adv1tov2/adv1tov2.c)
@@ -248,8 +248,6 @@ dnl Check for Berkeley DB3 library
 if test "x$db3_required" = "xyes"; then
        AC_PATH_DB3(, [AC_MSG_ERROR([Berkeley DB3 library not found!])])
 fi
-CFLAGS="$CFLAGS $DB3_CFLAGS"
-LIBS="$LIBS $DB3_LIBS"
 
 AC_ARG_WITH(did,
        [  --with-did=SCHEME       set DID scheme (last,mtab)],

diff --git a/libatalk/cnid/Makefile.am b/libatalk/cnid/Makefile.am
index 570dbc7db95d6d25d8f545825e04dbe0d6aab827..91875f0e67760438605acb1356aaa61a9af63400 100644 (file)
--- a/libatalk/cnid/Makefile.am
+++ b/libatalk/cnid/Makefile.am
@@ -1,5 +1,8 @@
 # Makefile.am for libatalk/cnid/
 
+CFLAGS = @CFLAGS@ @DB3_CFLAGS@
+LIBS = @LIBS@ @DB3_LIBS@
+
 noinst_LTLIBRARIES = libcnid.la
 
 libcnid_la_SOURCES = cnid_add.c cnid_close.c cnid_delete.c cnid_get.c cnid_lookup.c cnid_open.c cnid_resolve.c cnid_update.c