[patch] add --enable-lib64 option to apr-util configure

apr-util.patch (text/plain), 9.61 KB, created by ast on 2005-08-23 19:22:42 UTC

(hide)

Description: add --enable-lib64 option to apr-util configure

Filename:

MIME Type:

Creator: ast

Created: 2005-08-23 19:22:42 UTC

Size: 9.61 KB

patch

obsolete

>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], [ >@@ -64,6 +75,14 @@ > expat_libs="-lexpat" > expat_libtool="$1/lib/libexpat.la" > elif test -r "$1/include/expat.h" -a \ >+ -r "$1/lib64/libexpat.la" -a \ >+ "$enable_lib64" = "yes" ; then >+ dnl Expat 1.95.* installation on certain 64-bit platforms (with libtool) >+ expat_include_dir="$1/include" >+ expat_ldflags="-L$1/lib64" >+ expat_libs="-lexpat" >+ expat_libtool="$1/lib64/libexpat.la" >+ elif test -r "$1/include/expat.h" -a \ > -r "$1/lib/libexpat.la"; then > dnl Expat 1.95.* installation (with libtool) > expat_include_dir="$1/include" >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,19 +40,31 @@ > apu_have_pgsql=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_NOTICE(checking for pgsql in $withval) > AC_CHECK_HEADER(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_HEADER(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 > fi >@@ -88,12 +100,36 @@ > apu_have_mysql=0 > else > CPPFLAGS="-I$withval/include" >- LIBS="-L$withval/lib " >+ if test "$enable_lib64" = "yes" ; then >+ if test -d $withval/lib64/mysql ; then >+ LIBS="-L$withval/lib64/mysql " >+ else >+ LIBS="-L$withval/lib64 " >+ fi >+ else >+ if test -d $withval/lib/mysql ; then >+ LIBS="-L$withval/lib/mysql " >+ else >+ LIBS="-L$withval/lib " >+ fi >+ fi > > AC_MSG_NOTICE(checking for mysql in $withval) > AC_CHECK_HEADER(mysql.h, AC_CHECK_LIB(mysqlclient_r, mysql_init, [apu_have_mysql=1])) > if test "$apu_have_mysql" != "0"; then >- 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 > APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include]) > fi > >@@ -101,7 +137,19 @@ > AC_CHECK_HEADER(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 > fi >@@ -133,12 +181,20 @@ > apu_have_sqlite3=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_NOTICE(checking for sqlite3 in $withval) > AC_CHECK_HEADER(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 > fi >@@ -170,12 +226,19 @@ > apu_have_sqlite2=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_NOTICE(checking for sqlite2 in $withval) > AC_CHECK_HEADER(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 > 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 >@@ -589,12 +598,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 >@@ -629,7 +646,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 View Attachment As Diff View Attachment As Raw

This is ASF Bugzilla: the Apache Software Foundation bug system. In case of problems with the functioning of ASF Bugzilla, please contact bugzilla-admin@apache.org. Please Note: this e-mail address is only for reporting problems with ASF Bugzilla. Mail about any other subject will be silently ignored.

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    Remember [x]
  • | Forgot Password
    Login: [x]