INN commit: branches/2.5 (m4/berkeleydb.m4 storage/Makefile)

[INN Commit]

    Date: Saturday, August 6, 2011 @ 13:25:00
  Author: iulius
Revision: 9318

fix Makefile inclusion variable for Berkeley DB

Use the right DB_CPPFLAGS variable instead of BERKELEY_DB_CFLAGS.

Modified:
  branches/2.5/m4/berkeleydb.m4
  branches/2.5/storage/Makefile

------------------+
 m4/berkeleydb.m4 |    2 +-
 storage/Makefile |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

Modified: m4/berkeleydb.m4
===================================================================
--- m4/berkeleydb.m4	2011-08-06 20:24:27 UTC (rev 9317)
+++ m4/berkeleydb.m4	2011-08-06 20:25:00 UTC (rev 9318)
@@ -4,7 +4,7 @@
 dnl This file provides INN_LIB_BERKELEYDB, which defines the --with-berkeleydb
 dnl command-line option and probes for the location of Berkeley DB if that
 dnl option is used without an optional path.  It looks for Berkeley DB in $prefix,
-dnl /usr/local and /usr.  It then exports DB_LDFLAGS, DB_CFLAGS, and DB_LIBS.
+dnl /usr/local and /usr.  It then exports DB_LDFLAGS, DB_CPPFLAGS, and DB_LIBS.
 
 AC_DEFUN([INN_LIB_BERKELEYDB],
 [DB_CPPFLAGS=

Modified: storage/Makefile
===================================================================
--- storage/Makefile	2011-08-06 20:24:27 UTC (rev 9317)
+++ storage/Makefile	2011-08-06 20:25:00 UTC (rev 9318)
@@ -3,7 +3,7 @@
 include ../Makefile.global
 
 top	      = ..
-CFLAGS	      = $(GCFLAGS) -I. $(BERKELEY_DB_CFLAGS)
+CFLAGS	      = $(GCFLAGS) -I. $(DB_CPPFLAGS)
 
 SOURCES	      = expire.c interface.c methods.c ov.c overdata.c overview.c \
 		ovmethods.c $(METHOD_SOURCES)
@@ -71,7 +71,7 @@
 	$(FIXSCRIPT) -i buildconfig.in
 
 .c.o .c.lo:
-	$(LIBCC) $(CFLAGS) $(DB_CPPFLAGS) $(CCOUTPUT)
+	$(LIBCC) $(CFLAGS) $(CCOUTPUT)
 
 ovtest:	ov.c libstorage.$(EXTLIB) $(LIBINN)
 	$(CC) $(CFLAGS) -D_TEST_ -o ovtest ov.c \