diff -rNu --exclude=.svn apr-util/build.orig/apu-conf.m4 apr-util/build/apu-conf.m4 --- apr-util/build.orig/apu-conf.m4 2005-08-23 19:12:14.000000000 +0200 +++ apr-util/build/apu-conf.m4 2005-08-23 16:10:23.000000000 +0200 @@ -20,6 +20,17 @@ dnl dnl +dnl enable preference of lib64 instead of lib +dnl +AC_ARG_ENABLE(lib64, +AC_HELP_STRING([--enable-lib64],[prefer lib64 over lib [[default=no]]]), +[case $enableval in +yes|no) ;; +*) AC_MSG_ERROR([bad value $enableval for --enable-lib64, need yes or no]) ;; +esac], +[enable_lib64=no]) + +dnl dnl APU_FIND_APR: figure out where APR is located dnl AC_DEFUN([APU_FIND_APR], [ diff -rNu --exclude=.svn apr-util/build.orig/apu-iconv.m4 apr-util/build/apu-iconv.m4 --- apr-util/build.orig/apu-iconv.m4 2005-08-23 19:12:14.000000000 +0200 +++ apr-util/build/apu-iconv.m4 2005-08-23 19:06:27.000000000 +0200 @@ -39,7 +39,11 @@ [ apu_iconv_dir="$withval" if test "$apu_iconv_dir" != "yes"; then APR_ADDTO(CPPFLAGS,[-I$apu_iconv_dir/include]) - APR_ADDTO(LDFLAGS,[-L$apu_iconv_dir/lib]) + if test "$enable_lib64" = "yes" ; then + APR_ADDTO(LDFLAGS,[-L$apu_iconv_dir/lib64]) + else + APR_ADDTO(LDFLAGS,[-L$apu_iconv_dir/lib]) + fi fi if test -f "$apu_iconv_dir/include/api_version.h"; then have_apr_iconv="1" @@ -74,9 +78,14 @@ fi fi APR_REMOVEFROM(CPPFLAGS,[-I$apu_iconv_dir/include]) - APR_REMOVEFROM(LDFLAGS,[-L$apu_iconv_dir/lib]) APR_ADDTO(APRUTIL_INCLUDES,[-I$apu_iconv_dir/include]) - APR_ADDTO(APRUTIL_LDFLAGS,[-L$apu_iconv_dir/lib]) + if test "$enable_lib64" = "yes" ; then + APR_REMOVEFROM(LDFLAGS,[-L$apu_iconv_dir/lib64]) + APR_ADDTO(APRUTIL_LDFLAGS,[-L$apu_iconv_dir/lib64]) + else + APR_REMOVEFROM(LDFLAGS,[-L$apu_iconv_dir/lib]) + APR_ADDTO(APRUTIL_LDFLAGS,[-L$apu_iconv_dir/lib]) + fi fi if test "$have_iconv" = "1"; then diff -rNu --exclude=.svn apr-util/build.orig/dbd.m4 apr-util/build/dbd.m4 --- apr-util/build.orig/dbd.m4 2005-08-23 19:12:14.000000000 +0200 +++ apr-util/build/dbd.m4 2005-08-23 19:03:12.000000000 +0200 @@ -40,7 +40,11 @@ old_ldflags="$LDFLAGS" pgsql_CPPFLAGS="-I$withval/include" - pgsql_LDFLAGS="-L$withval/lib " + if test "$enable_lib64" = "yes" ; then + pgsql_LDFLAGS="-L$withval/lib64 " + else + pgsql_LDFLAGS="-L$withval/lib " + fi APR_ADDTO(CPPFLAGS, [$pgsql_CPPFLAGS]) APR_ADDTO(LDFLAGS, [$pgsql_LDFLAGS]) @@ -48,14 +52,22 @@ AC_MSG_NOTICE(checking for pgsql in $withval) AC_CHECK_HEADERS(libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])) if test "$apu_have_pgsql" != "0"; then - APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + if test "$enable_lib64" = "yes" ; then + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib64]) + else + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + fi APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include]) fi if test "$apu_have_pgsql" != "1"; then AC_CHECK_HEADERS(postgresql/libpq-fe.h, AC_CHECK_LIB(pq, PQsendQueryPrepared, [apu_have_pgsql=1])) if test "$apu_have_pgsql" != "0"; then APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/postgresql]) - APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + if test "$enable_lib64" = "yes" ; then + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib64]) + else + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + fi fi fi @@ -120,7 +132,19 @@ mysql_LDFLAGS="`$MYSQL_CONFIG --libs_r`" else mysql_CPPFLAGS="-I$withval/include" - mysql_LDFLAGS="-L$withval/lib " + if test "$enable_lib64" = "yes" ; then + if test -d $withval/lib64/mysql ; then + mysql_LDFLAGS="-L$withval/lib64/mysql " + else + mysql_LDFLAGS="-L$withval/lib64 " + fi + else + if test -d $withval/lib/mysql ; then + mysql_LDFLAGS="-L$withval/lib/mysql " + else + mysql_LDFLAGS="-L$withval/lib " + fi + fi fi APR_ADDTO(CPPFLAGS, [$mysql_CPPFLAGS]) @@ -137,7 +161,20 @@ AC_CHECK_HEADERS(mysql/mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) if test "$apu_have_mysql" != "0"; then APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include/mysql]) - APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + + if test "$enable_lib64" = "yes" ; then + if test -d $withval/lib64/mysql ; then + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib64/mysql]) + else + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib64]) + fi + else + if test -d $withval/lib64/mysql ; then + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib/mysql]) + else + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + fi + fi fi fi @@ -199,7 +236,12 @@ old_ldflags="$LDFLAGS" sqlite3_CPPFLAGS="-I$withval/include" - sqlite3_LDFLAGS="-L$withval/lib " + if test "$enable_lib64" = "yes" ; then + sqlite3_LDFLAGS="-L$withval/lib64 " + else + sqlite3_LDFLAGS="-L$withval/lib " + fi + APR_ADDTO(CPPFLAGS, [$sqlite3_CPPFLAGS]) APR_ADDTO(LDFLAGS, [$sqlite3_LDFLAGS]) @@ -207,7 +249,11 @@ AC_MSG_NOTICE(checking for sqlite3 in $withval) AC_CHECK_HEADERS(sqlite3.h, AC_CHECK_LIB(sqlite3, sqlite3_open, [apu_have_sqlite3=1])) if test "$apu_have_sqlite3" != "0"; then - APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + if test "$enable_lib64" = "yes" ; then + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib64]) + else + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + fi APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include]) fi @@ -245,7 +291,11 @@ old_ldflags="$LDFLAGS" sqlite2_CPPFLAGS="-I$withval/include" - sqlite2_LDFLAGS="-L$withval/lib " + if test "$enable_lib64" = "yes" ; then + sqlite2_LDFLAGS="-L$withval/lib64 " + else + sqlite2_LDFLAGS="-L$withval/lib " + fi APR_ADDTO(CPPFLAGS, [$sqlite2_CPPFLAGS]) APR_ADDTO(LDFLAGS, [$sqlite2_LDFLAGS]) @@ -253,7 +303,11 @@ AC_MSG_NOTICE(checking for sqlite2 in $withval) AC_CHECK_HEADERS(sqlite.h, AC_CHECK_LIB(sqlite, sqlite_open, [apu_have_sqlite2=1])) if test "$apu_have_sqlite2" != "0"; then - APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + if test "$enable_lib64" = "yes" ; then + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib64]) + else + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + fi APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include]) fi diff -rNu --exclude=.svn apr-util/build.orig/dbm.m4 apr-util/build/dbm.m4 --- apr-util/build.orig/dbm.m4 2005-08-23 19:12:14.000000000 +0200 +++ apr-util/build/dbm.m4 2005-08-23 18:58:55.000000000 +0200 @@ -87,7 +87,12 @@ ;; * ) if test -d $bdb_place; then - LDFLAGS="$LDFLAGS -L$bdb_place/lib" + if test "$enable_lib64" = "yes" ; then + LDFLAGS="$LDFLAGS -L$bdb_place/lib64" +echo "$LDFLAGS" + else + LDFLAGS="$LDFLAGS -L$bdb_place/lib" + fi CPPFLAGS="$CPPFLAGS -I$bdb_place/include" else AC_MSG_CHECKING([for Berkeley DB $bdb_version in $bdb_place]) @@ -183,7 +188,11 @@ ;; *) APR_ADDTO(APRUTIL_INCLUDES, [-I$found/include]) - APR_ADDTO(APRUTIL_LDFLAGS, [-L$found/lib]) + if test "$enable_lib64" = "yes" ; then + APR_ADDTO(APRUTIL_LDFLAGS, [-L$found/lib64]) + else + APR_ADDTO(APRUTIL_LDFLAGS, [-L$found/lib]) + fi apu_db_header=$bdb_header apu_db_lib=$bdb_libname apu_have_db=1 @@ -645,12 +654,20 @@ apu_have_gdbm=0 else CPPFLAGS="-I$withval/include" - LIBS="-L$withval/lib " + if test "$enable_lib64" = "yes" ; then + LIBS="-L$withval/lib64 " + else + LIBS="-L$withval/lib " + fi AC_MSG_CHECKING(checking for gdbm in $withval) AC_CHECK_HEADER(gdbm.h, AC_CHECK_LIB(gdbm, gdbm_open, [apu_have_gdbm=1])) if test "$apu_have_gdbm" != "0"; then - APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + if test "$enable_lib64" = "yes" ; then + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib64]) + else + APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib]) + fi APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include]) fi fi @@ -682,7 +699,11 @@ ;; *) NDBM_INC="-I$withval/include" - NDBM_LDFLAGS="-L$withval/lib" + if test "$enable_lib64" = "yes" ; then + NDBM_LDFLAGS="-L$withval/lib64" + else + NDBM_LDFLAGS="-L$withval/lib" + fi AC_MSG_CHECKING(checking for ndbm includes in $withval) ;; esac