svn commit: r1371811 - in /apr/apr/trunk/build: crypto.m4 dbd.m4 dbm.m4

[rj...@apache.org]

Author: rjung
Date: Fri Aug 10 19:34:52 2012
New Revision: 1371811

URL: http://svn.apache.org/viewvc?rev=1371811&view=rev
Log:
Use APR_ADDTO when setting LDADD variables
instead of simply overwriting them.
.
This allows to preset the variables e.g. with
rpath flags before running configure.

Modified:
    apr/apr/trunk/build/crypto.m4
    apr/apr/trunk/build/dbd.m4
    apr/apr/trunk/build/dbm.m4

Modified: apr/apr/trunk/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/crypto.m4?rev=1371811&r1=1371810&r2=1371811&view=diff
==============================================================================
--- apr/apr/trunk/build/crypto.m4 (original)
+++ apr/apr/trunk/build/crypto.m4 Fri Aug 10 19:34:52 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/trunk/build/dbd.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/dbd.m4?rev=1371811&r1=1371810&r2=1371811&view=diff
==============================================================================
--- apr/apr/trunk/build/dbd.m4 (original)
+++ apr/apr/trunk/build/dbd.m4 Fri Aug 10 19:34:52 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)
 
@@ -399,7 +399,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)
 
@@ -454,10 +454,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)
 
@@ -551,7 +551,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/trunk/build/dbm.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/dbm.m4?rev=1371811&r1=1371810&r2=1371811&view=diff
==============================================================================
--- apr/apr/trunk/build/dbm.m4 (original)
+++ apr/apr/trunk/build/dbm.m4 Fri Aug 10 19:34:52 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)