Ticket #32325: patch-configure.ac.diff

File patch-configure.ac.diff, 1.4 KB (added by dbevans (David B. Evans), 13 years ago)

Modified patch files

  • configure.ac

    old new  
    145145dnl Compiler Warning Flags
    146146dnl ******************************
    147147AS_COMPILER_FLAGS(WARNING_FLAGS,
    148         "-DG_DISABLE_DEPRECATED
    149         -DPANGO_DISABLE_DEPRECATED
    150         -DGDK_DISABLE_DEPRECATED
     148        " -DPANGO_DISABLE_DEPRECATED
    151149        -DGDK_PIXBUF_DISABLE_DEPRECATED
    152150        -DG_DISABLE_SINGLE_INCLUDES
    153151        -DGTK_DISABLE_SINGLE_INCLUDES
     
    181179AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
    182180AC_SUBST(AM_CPPFLAGS)
    183181
    184 LDFLAGS="$LDFLAGS -Wl,--no-undefined"
     182dnl LDFLAGS="$LDFLAGS -Wl,--no-undefined"
    185183
    186184dnl ******************************
    187185dnl Initialize maintainer mode
     
    301299dnl ******************************
    302300dnl regex check
    303301dnl ******************************
    304 AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(regex,regexec,
    305                         [REGEX_LIBS=-lregex
     302AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(gnuregex,regexec,
     303                        [REGEX_LIBS=-lgnuregex
    306304                        AC_DEFINE(HAVE_REGEXEC,1,[Define to 1 if you have the regexec function.])],
    307305                        [AC_MSG_ERROR([No regex library found])])])
    308306AC_SUBST(REGEX_LIBS)
     
    315313        [Prefix where libdb is installed]),
    316314        [libdb_prefix="$withval"], [libdb_prefix='${prefix}'])
    317315
    318 DB_CFLAGS="-I$libdb_prefix/include"
    319 DB_LIBS="-L$libdb_prefix/lib -ldb"
     316DB_CFLAGS="-I$prefix/include/db46"
     317DB_LIBS="-L$prefix/lib/db46 -ldb"
    320318
    321319AC_MSG_CHECKING([Berkeley DB])
    322320save_cflags=$CFLAGS; CFLAGS=$DB_CFLAGS