put BDB_CFLAGS before CFLAGS to make sure another Berkeley DB version doesn't get...

diff --git a/etc/cnid_dbd/Makefile.am b/etc/cnid_dbd/Makefile.am
index c5d2890a2c7f957a959eca63440472d6a4315190..32b80b26953c13a571d1227c0e90051d77e40c29 100644 (file)
--- a/etc/cnid_dbd/Makefile.am
+++ b/etc/cnid_dbd/Makefile.am
@@ -23,5 +23,5 @@ EXTRA_DIST = README
 LIBS = @LIBS@ @BDB_LIBS@
 
 
-CFLAGS = -I$(top_srcdir)/include @CFLAGS@ @BDB_CFLAGS@ \
+CFLAGS = @BDB_CFLAGS@ @CFLAGS@ \
          -D_PATH_CNID_DBD=\"$(sbindir)/cnid_dbd\"

diff --git a/libatalk/cnid/cdb/Makefile.am b/libatalk/cnid/cdb/Makefile.am
index 8a30dcd82a699b5d8bf9895290a220faeb3b8b98..147ee250f31db629458fe64218a0dcfef3e6f7ab 100644 (file)
--- a/libatalk/cnid/cdb/Makefile.am
+++ b/libatalk/cnid/cdb/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for libatalk/cnid/
 
-CFLAGS = @CFLAGS@ @BDB_CFLAGS@
+CFLAGS = @BDB_CFLAGS@ @CFLAGS@
 LIBS = @LIBS@ @BDB_LIBS@
 
 noinst_LTLIBRARIES = libcnid_cdb.la

diff --git a/libatalk/cnid/db3/Makefile.am b/libatalk/cnid/db3/Makefile.am
index 665722b100183322776ae8de0f19885d0afbb4a7..d2a595c5908ec24d02800025741e489a409fca8b 100644 (file)
--- a/libatalk/cnid/db3/Makefile.am
+++ b/libatalk/cnid/db3/Makefile.am
@@ -1,6 +1,6 @@
 # Makefile.am for libatalk/cnid/
 
-CFLAGS = @CFLAGS@ @BDB_CFLAGS@
+CFLAGS = @BDB_CFLAGS@ @CFLAGS@
 LIBS = @LIBS@ @BDB_LIBS@
 
 noinst_LTLIBRARIES = libcnid_db3.la