Ticket #32325: patch-configure.ac.diff

configure.ac

@@ -145 +145 @@
 dnl Compiler Warning Flags
 dnl ******************************
 AS_COMPILER_FLAGS(WARNING_FLAGS,
-        "-DG_DISABLE_DEPRECATED
-        -DPANGO_DISABLE_DEPRECATED
-        -DGDK_DISABLE_DEPRECATED
+        " -DPANGO_DISABLE_DEPRECATED
         -DGDK_PIXBUF_DISABLE_DEPRECATED
         -DG_DISABLE_SINGLE_INCLUDES
         -DGTK_DISABLE_SINGLE_INCLUDES
@@ -181 +179 @@
 AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
 AC_SUBST(AM_CPPFLAGS)
 
-LDFLAGS="$LDFLAGS -Wl,--no-undefined"
+dnl LDFLAGS="$LDFLAGS -Wl,--no-undefined"
 
 dnl ******************************
 dnl Initialize maintainer mode
@@ -301 +299 @@
 dnl ******************************
 dnl regex check
 dnl ******************************
-AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec,
-                        [REGEX_LIBS=-lregex
+AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(gnuregex,regexec,
+                        [REGEX_LIBS=-lgnuregex
                         AC_DEFINE(HAVE_REGEXEC,1,[Define to 1 if you have the regexec function.])],
                         [AC_MSG_ERROR([No regex library found])])])
 AC_SUBST(REGEX_LIBS)
@@ -315 +313 @@
         [Prefix where libdb is installed]),
         [libdb_prefix="$withval"], [libdb_prefix='${prefix}'])
 
-DB_CFLAGS="-I$libdb_prefix/include"
-DB_LIBS="-L$libdb_prefix/lib -ldb"
+DB_CFLAGS="-I$prefix/include/db46"
+DB_LIBS="-L$prefix/lib/db46  -ldb"
 
 AC_MSG_CHECKING([Berkeley DB])
 save_cflags=$CFLAGS; CFLAGS=$DB_CFLAGS