apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rj...@apache.org
Subject svn commit: r1371815 - in /apr/apr-util/branches/1.5.x: ./ CHANGES build/apu-conf.m4 build/crypto.m4 build/dbd.m4 build/dbm.m4
Date Fri, 10 Aug 2012 19:51:58 GMT
Author: rjung
Date: Fri Aug 10 19:51:58 2012
New Revision: 1371815

URL: http://svn.apache.org/viewvc?rev=1371815&view=rev
Log:
User APR_ADDTO instead of overwriting when
setting the LDADD variables.

This allows to specify library specific
linker flags in the LDADD_XXX variables
before running configure.

One example would be "-R..." to set an rpath.

Modified:
    apr/apr-util/branches/1.5.x/   (props changed)
    apr/apr-util/branches/1.5.x/CHANGES
    apr/apr-util/branches/1.5.x/build/apu-conf.m4
    apr/apr-util/branches/1.5.x/build/crypto.m4
    apr/apr-util/branches/1.5.x/build/dbd.m4
    apr/apr-util/branches/1.5.x/build/dbm.m4

Propchange: apr/apr-util/branches/1.5.x/
------------------------------------------------------------------------------
  Merged /apr/apr/trunk:r1371811

Modified: apr/apr-util/branches/1.5.x/CHANGES
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/CHANGES?rev=1371815&r1=1371814&r2=1371815&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/CHANGES [utf-8] (original)
+++ apr/apr-util/branches/1.5.x/CHANGES [utf-8] Fri Aug 10 19:51:58 2012
@@ -1,6 +1,9 @@
                                                      -*- coding: utf-8 -*-
 Changes with APR-util 1.5.1
 
+  *) configure: Allow to specify library specific custom linker flags
+     via the LDADD_XXX variables. [Rainer Jung]
+
   *) apr_password_validate(): Fix intermittent errors on systems
      such as FreeBSD where the crypt() function is used.
      (Broken only in 1.5.0)  [Jeff Trawick]

Modified: apr/apr-util/branches/1.5.x/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/build/apu-conf.m4?rev=1371815&r1=1371814&r2=1371815&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/build/apu-conf.m4 (original)
+++ apr/apr-util/branches/1.5.x/build/apu-conf.m4 Fri Aug 10 19:51:58 2012
@@ -195,7 +195,7 @@ AC_DEFUN([APU_FIND_LDAPLIB], [
     unset ac_cv_lib_${ldaplib_cache_id}___ldap_init
     AC_CHECK_LIB(${ldaplib}, ldap_init, 
       [
-        LDADD_ldap="-l${ldaplib} ${extralib}"
+        LDADD_ldap_found="-l${ldaplib} ${extralib}"
         AC_CHECK_LIB(${ldaplib}, ldapssl_client_init, apu_has_ldapssl_client_init="1", ,
${extralib})
         AC_CHECK_LIB(${ldaplib}, ldapssl_client_deinit, apu_has_ldapssl_client_deinit="1",
, ${extralib})
         AC_CHECK_LIB(${ldaplib}, ldapssl_add_trusted_cert, apu_has_ldapssl_add_trusted_cert="1",
, ${extralib})
@@ -233,7 +233,7 @@ apu_has_ldap_mozilla="0"
 apu_has_ldap_tivoli="0"
 apu_has_ldap_zos="0"
 apu_has_ldap_other="0"
-LDADD_ldap=""
+LDADD_ldap_found=""
 
 AC_ARG_WITH(lber,[  --with-lber=library     lber library to use],
   [
@@ -286,8 +286,9 @@ AC_ARG_WITH(ldap,[  --with-ldap=library 
       fi
 
       test ${apu_has_ldap} != "1" && AC_MSG_ERROR(could not find an LDAP library)
+      test ${apu_has_ldap} == "1" && APR_ADDTO(LDADD_ldap, [$LDADD_ldap_found])
       AC_CHECK_LIB($apu_liblber_name, ber_init,
-        [LDADD_ldap="${LDADD_ldap} -l${apu_liblber_name}"])
+        [APR_ADDTO(LDADD_ldap, [-l${apu_liblber_name}])])
 
       AC_CHECK_HEADERS(lber.h, lber_h=["#include <lber.h>"])
 

Modified: apr/apr-util/branches/1.5.x/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/build/crypto.m4?rev=1371815&r1=1371814&r2=1371815&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/build/crypto.m4 (original)
+++ apr/apr-util/branches/1.5.x/build/crypto.m4 Fri Aug 10 19:51:58 2012
@@ -108,7 +108,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_OPENSSL], [
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_openssl" = "1"; then
-    LDADD_crypto_openssl="$openssl_LDFLAGS -lssl -lcrypto"
+    APR_ADDTO(LDADD_crypto_openssl, [$openssl_LDFLAGS -lssl -lcrypto])
     apu_have_crypto=1
 
     AC_MSG_CHECKING([for const input buffers in OpenSSL])
@@ -192,7 +192,7 @@ AC_DEFUN([APU_CHECK_CRYPTO_NSS], [
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_nss" = "1"; then
-    LDADD_crypto_nss="$nss_LDFLAGS -lnspr4 -lnss3"
+    APR_ADDTO(LDADD_crypto_nss, [$nss_LDFLAGS -lnspr4 -lnss3])
     apu_have_crypto=1
   fi
   AC_SUBST(LDADD_crypto_nss)

Modified: apr/apr-util/branches/1.5.x/build/dbd.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/build/dbd.m4?rev=1371815&r1=1371814&r2=1371815&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/build/dbd.m4 (original)
+++ apr/apr-util/branches/1.5.x/build/dbd.m4 Fri Aug 10 19:51:58 2012
@@ -147,7 +147,7 @@ AC_DEFUN([APU_CHECK_DBD], [
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_pgsql" = "1"; then
-    LDADD_dbd_pgsql="$pgsql_LDFLAGS -lpq $pgsql_LIBS"
+    APR_ADDTO(LDADD_dbd_pgsql, [$pgsql_LDFLAGS -lpq $pgsql_LIBS])
   fi
   AC_SUBST(LDADD_dbd_pgsql)
 
@@ -229,7 +229,7 @@ AC_DEFUN([APU_CHECK_DBD_MYSQL], [
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_mysql" = "1"; then
-    LDADD_dbd_mysql="$mysql_LDFLAGS -lmysqlclient_r $mysql_LIBS"
+    APR_ADDTO(LDADD_dbd_mysql, [$mysql_LDFLAGS -lmysqlclient_r $mysql_LIBS])
   fi
   AC_SUBST(LDADD_dbd_mysql)
 
@@ -273,7 +273,7 @@ AC_DEFUN([APU_CHECK_DBD_SQLITE3], [
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_sqlite3" = "1"; then
-    LDADD_dbd_sqlite3="$sqlite3_LDFLAGS -lsqlite3"
+    APR_ADDTO(LDADD_dbd_sqlite3, [$sqlite3_LDFLAGS -lsqlite3])
   fi
   AC_SUBST(LDADD_dbd_sqlite3)
 
@@ -317,7 +317,7 @@ AC_DEFUN([APU_CHECK_DBD_SQLITE2], [
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_sqlite2" = "1"; then
-    LDADD_dbd_sqlite2="$sqlite2_LDFLAGS -lsqlite"
+    APR_ADDTO(LDADD_dbd_sqlite2, [$sqlite2_LDFLAGS -lsqlite])
   fi
   AC_SUBST(LDADD_dbd_sqlite2)
 
@@ -400,7 +400,7 @@ AC_DEFUN([APU_CHECK_DBD_ORACLE], [
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_oracle" = "1"; then
-    LDADD_dbd_oracle="$oracle_LDFLAGS -lclntsh $oracle_LIBS"
+    APR_ADDTO(LDADD_dbd_oracle, [$oracle_LDFLAGS -lclntsh $oracle_LIBS])
   fi
   AC_SUBST(LDADD_dbd_oracle)
 
@@ -455,10 +455,10 @@ AC_DEFUN([APU_CHECK_DBD_FREETDS], [
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_freetds" = "1"; then
-    LDADD_dbd_freetds="$sybdb_LDFLAGS -lsybdb"
+    APR_ADDTO(LDADD_dbd_freetds, [$sybdb_LDFLAGS -lsybdb])
     dnl Erm, I needed pcreposix, but I think that dependency has gone
     dnl from the current code
-    dnl LDADD_dbd_freetds="$LDADD_dbd_freetds -lsybdb -lpcreposix"
+    dnl APR_ADDTO(LDADD_dbd_freetds, [-lpcreposix])
   fi
   AC_SUBST(LDADD_dbd_freetds)
 
@@ -552,7 +552,7 @@ AC_DEFUN([APU_CHECK_DBD_ODBC], [
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_odbc" = "1"; then
-    LDADD_dbd_odbc="$odbc_LDFLAGS -lodbc $odbc_LIBS"
+    APR_ADDTO(LDADD_dbd_odbc, [$odbc_LDFLAGS -lodbc $odbc_LIBS])
   fi
   AC_SUBST(LDADD_dbd_odbc)
 

Modified: apr/apr-util/branches/1.5.x/build/dbm.m4
URL: http://svn.apache.org/viewvc/apr/apr-util/branches/1.5.x/build/dbm.m4?rev=1371815&r1=1371814&r2=1371815&view=diff
==============================================================================
--- apr/apr-util/branches/1.5.x/build/dbm.m4 (original)
+++ apr/apr-util/branches/1.5.x/build/dbm.m4 Fri Aug 10 19:51:58 2012
@@ -1008,20 +1008,20 @@ AC_DEFUN([APU_CHECK_DBM], [
   AC_SUBST(apu_db_version)
 
   if test "$apu_have_db" = "1"; then
-    LDADD_dbm_db="-l$apu_db_lib"
+    APR_ADDTO(LDADD_dbm_db, [-l$apu_db_lib])
     if test -n "apu_db_xtra_libs"; then
-      LDADD_dbm_db="$LDADD_dbm_db $apu_db_xtra_libs"
+      APR_ADDTO(LDADD_dbm_db, [$apu_db_xtra_libs])
     fi
   fi
 
   dnl Since we have already done the AC_CHECK_LIB tests, if we have it, 
   dnl we know the library is there.
   if test "$apu_have_gdbm" = "1"; then
-    LDADD_dbm_gdbm="-lgdbm"
+    APR_ADDTO(LDADD_dbm_gdbm, [-lgdbm])
   fi
 
   if test "$apu_have_ndbm" = "1"; then
-    LDADD_dbm_ndbm="-l$apu_ndbm_lib"
+    APR_ADDTO(LDADD_dbm_ndbm, [-l$apu_ndbm_lib])
   fi
 
   AC_SUBST(LDADD_dbm_db)



Mime
View raw message