From 5629ff7a92c2975872cbdc9b3a1fdd2f619de3e5 Mon Sep 17 00:00:00 2001 From: Ettore Perazzoli Date: Fri, 24 Aug 2001 22:58:52 +0000 Subject: [Patch from Nike Gerdts for #6882, DB3_CFLAGS and DB3_LDFLAGS order messes up CPPFLAGS and LDFLAGS.] * configure.in: Put DB3_CFLAGS before the already-defined CPPFLAGS instead of after them; likewise, put DB3_LDADD before the already defined LDADD. svn path=/trunk/; revision=12464 --- ChangeLog | 10 ++++++++++ configure.in | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd4ceac557..b088a39d04 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-08-24 Ettore Perazzoli + + [Patch from Nike Gerdts for + #6882, DB3_CFLAGS and DB3_LDFLAGS order messes up CPPFLAGS and + LDFLAGS.] + + * configure.in: Put DB3_CFLAGS before the already-defined CPPFLAGS + instead of after them; likewise, put DB3_LDADD before the already + defined LDADD. + 2001-08-24 Dan Winship * configure.in: We don't need to check for both bonobo-conf 0.11 diff --git a/configure.in b/configure.in index 5444e11f5e..2b4ad208ab 100644 --- a/configure.in +++ b/configure.in @@ -303,7 +303,7 @@ DB3_CFLAGS=$ac_cv_db3_cflags AC_SUBST(DB3_CFLAGS) CPPFLAGS_save="$CPPFLAGS" -CPPFLAGS="$CPPFLAGS $DB3_CFLAGS" +CPPFLAGS="$DB3_CFLAGS $CPPFLAGS" AC_CHECK_HEADERS(db.h db3/db.h, break) AC_CACHE_CHECK([db3 header version], ac_cv_db3_header_version, @@ -357,7 +357,7 @@ AC_SUBST(DB3_LDADD) AC_CACHE_CHECK([that db3 library version matches header version], ac_cv_db3_lib_version_match, [ - LIBS="$LIBS $DB3_LDADD" + LIBS="$DB3_LDADD $LIBS" AC_TRY_RUN([ #ifdef HAVE_DB3_DB_H #include -- cgit v1.2.3