apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r757901 - in /apr/apr/trunk/build: apu-conf.m4 apu-iconv.m4 crypto.m4 dbm.m4
Date Tue, 24 Mar 2009 16:52:31 GMT
Author: jorton
Date: Tue Mar 24 16:52:30 2009
New Revision: 757901

URL: http://svn.apache.org/viewvc?rev=757901&view=rev
Log:
* build/: Use LDFLAGS, INCLUDES rather than APRUTIL_ counterparts.

Modified:
    apr/apr/trunk/build/apu-conf.m4
    apr/apr/trunk/build/apu-iconv.m4
    apr/apr/trunk/build/crypto.m4
    apr/apr/trunk/build/dbm.m4

Modified: apr/apr/trunk/build/apu-conf.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apu-conf.m4?rev=757901&r1=757900&r2=757901&view=diff
==============================================================================
--- apr/apr/trunk/build/apu-conf.m4 (original)
+++ apr/apr/trunk/build/apu-conf.m4 Tue Mar 24 16:52:30 2009
@@ -111,8 +111,8 @@
  
     APU_TRY_EXPAT_LINK([Expat 1.95.x in /usr/local], 
        apu_cv_expat_usrlocal, [expat.h], [-lexpat],
-       [APR_ADDTO(APRUTIL_INCLUDES, [-I/usr/local/include])
-        APR_ADDTO(APRUTIL_LDFLAGS, [-L/usr/local/lib])],[
+       [APR_ADDTO(INCLUDES, [-I/usr/local/include])
+        APR_ADDTO(LDFLAGS, [-L/usr/local/lib])],[
        APR_REMOVEFROM(LDFLAGS, [-L/usr/local/lib])
        APR_REMOVEFROM(CPPFLAGS, [-I/usr/local/include])
       ])
@@ -147,8 +147,7 @@
     if test "$withval" != "/usr"; then
       APR_ADDTO(LDFLAGS, [-L$withval/lib])
       APR_ADDTO(CPPFLAGS, [-I$withval/include])
-      APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
-      APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
+      APR_ADDTO(INCLUDES, [-I$withval/include])
     fi
     # ...and refuse to fall back on the builtin expat.
     apu_try_builtin_expat=0
@@ -164,13 +163,13 @@
   dnl we are working with the bundled version of the software.
   bundled_subdir="xml/expat"
   APR_SUBDIR_CONFIG($bundled_subdir, [--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir
--includedir=$includedir --bindir=$bindir])
-  APR_ADDTO(APRUTIL_INCLUDES, [-I$top_builddir/$bundled_subdir/lib])
+  APR_ADDTO(INCLUDES, [-I$top_builddir/$bundled_subdir/lib])
   APR_ADDTO(LDFLAGS, [-L$top_builddir/$bundled_subdir/lib])
   apu_expat_libs="$top_builddir/$bundled_subdir/lib/libexpat.la"
 fi
 
 APR_ADDTO(APRUTIL_EXPORT_LIBS, [$apu_expat_libs])
-APR_ADDTO(APRUTIL_LIBS, [$apu_expat_libs])
+APR_ADDTO(LIBS, [$apu_expat_libs])
 
 APR_XML_DIR=$bundled_subdir
 AC_SUBST(APR_XML_DIR)
@@ -256,11 +255,10 @@
     save_libs="$LIBS"
     if test -n "$with_ldap_include"; then
       CPPFLAGS="$CPPFLAGS -I$with_ldap_include"
-      APR_ADDTO(APRUTIL_INCLUDES, [-I$with_ldap_include])
+      APR_ADDTO(INCLUDES, [-I$with_ldap_include])
     fi
     if test -n "$with_ldap_lib"; then
-      LDFLAGS="$LDFLAGS -L$with_ldap_lib"
-      APR_ADDTO(APRUTIL_LDFLAGS, [-L$with_ldap_lib])
+      APR_ADDTO(LDFLAGS, [-L$with_ldap_lib])
     fi
 
     LIBLDAP="$withval"
@@ -378,8 +376,7 @@
     save_ldflags="$LDFLAGS"
     save_libs="$LIBS"
 
-    CPPFLAGS="$CPPFLAGS $APRUTIL_INCLUDES"
-    LDFLAGS="$LDFLAGS $APRUTIL_LDFLAGS"
+    CPPFLAGS="$CPPFLAGS $INCLUDES"
     AC_CACHE_CHECK([style of ldap_set_rebind_proc routine], ac_cv_ldap_set_rebind_proc_style,
     APR_TRY_COMPILE_NO_WARNING([
     #ifdef HAVE_LBER_H

Modified: apr/apr/trunk/build/apu-iconv.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apu-iconv.m4?rev=757901&r1=757900&r2=757901&view=diff
==============================================================================
--- apr/apr/trunk/build/apu-iconv.m4 (original)
+++ apr/apr/trunk/build/apu-iconv.m4 Tue Mar 24 16:52:30 2009
@@ -46,8 +46,8 @@
       if test -f "$apu_iconv_dir/include/apr-1/api_version.h"; then
         have_apr_iconv="1"
         have_iconv="0"
-        APR_ADDTO(APRUTIL_INCLUDES,[-I$apu_iconv_dir/include/apr-1])
-        APR_ADDTO(APRUTIL_LIBS,[$apu_iconv_dir/lib/libapriconv-1.la])
+        APR_ADDTO(INCLUDES,[-I$apu_iconv_dir/include/apr-1])
+        APR_ADDTO(LIBS,[$apu_iconv_dir/lib/libapriconv-1.la])
         AC_MSG_RESULT(using apr-iconv)
       elif test -f "$apu_iconv_dir/include/iconv.h"; then
         have_apr_iconv="0"
@@ -65,7 +65,7 @@
     APR_ADDTO(LIBS,[-liconv])
 
     APU_TRY_ICONV([
-      APR_ADDTO(APRUTIL_LIBS,[-liconv])
+      APR_ADDTO(LIBS,[-liconv])
       APR_ADDTO(APRUTIL_EXPORT_LIBS,[-liconv])
       have_iconv="1" ],
       [ have_iconv="0" ])
@@ -84,8 +84,8 @@
   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])
+  APR_ADDTO(INCLUDES,[-I$apu_iconv_dir/include])
+  APR_ADDTO(LDFLAGS,[-L$apu_iconv_dir/lib])
 fi
 
 if test "$have_iconv" = "1"; then

Modified: apr/apr/trunk/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/crypto.m4?rev=757901&r1=757900&r2=757901&view=diff
==============================================================================
--- apr/apr/trunk/build/crypto.m4 (original)
+++ apr/apr/trunk/build/crypto.m4 Tue Mar 24 16:52:30 2009
@@ -77,8 +77,8 @@
       AC_CHECK_LIB(crypto, BN_init, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
       if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0";
then
         apu_have_openssl=1
-        APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-        APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
+        APR_ADDTO(LDFLAGS, [-L$withval/lib])
+        APR_ADDTO(INCLUDES, [-I$withval/include])
       fi
 
       if test "$apu_have_openssl" != "1"; then
@@ -86,8 +86,8 @@
         AC_CHECK_LIB(crypto, BN_init, AC_CHECK_LIB(ssl, SSL_accept, [openssl_have_libs=1],,-lcrypto))
         if test "$openssl_have_headers" != "0" && test "$openssl_have_libs" != "0";
then
           apu_have_openssl=1
-          APR_ADDTO(APRUTIL_LDFLAGS, [-L$withval/lib])
-          APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
+          APR_ADDTO(LDFLAGS, [-L$withval/lib])
+          APR_ADDTO(INCLUDES, [-I$withval/include])
         fi
       fi
 

Modified: apr/apr/trunk/build/dbm.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/dbm.m4?rev=757901&r1=757900&r2=757901&view=diff
==============================================================================
--- apr/apr/trunk/build/dbm.m4 (original)
+++ apr/apr/trunk/build/dbm.m4 Tue Mar 24 16:52:30 2009
@@ -175,15 +175,15 @@
     header="`echo $found | sed -e 's/:.*$//'`"
     lib="`echo $found | sed -e 's/^.*://'`"
 
-    APR_ADDTO(APRUTIL_INCLUDES, [-I$header])
-    APR_ADDTO(APRUTIL_LDFLAGS, [-L$lib])
+    APR_ADDTO(INCLUDES, [-I$header])
+    APR_ADDTO(LDFLAGS, [-L$lib])
     apu_db_header=$bdb_header
     apu_db_lib=$bdb_libname
     apu_have_db=1
     ;;
   *)
-    APR_ADDTO(APRUTIL_INCLUDES, [-I$found/include])
-    APR_ADDTO(APRUTIL_LDFLAGS, [-L$found/lib])
+    APR_ADDTO(INCLUDES, [-I$found/include])
+    APR_ADDTO(LDFLAGS, [-L$found/lib])
     apu_db_header=$bdb_header
     apu_db_lib=$bdb_libname
     apu_have_db=1
@@ -707,8 +707,8 @@
       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])
-        APR_ADDTO(APRUTIL_INCLUDES, [-I$withval/include])
+        APR_ADDTO(LDFLAGS, [-L$withval/lib])
+        APR_ADDTO(INCLUDES, [-I$withval/include])
       fi
       CPPFLAGS="$saved_cppflags"
       LDFLAGS="$saved_ldflags"
@@ -763,8 +763,8 @@
       )
       if test "$apu_have_ndbm" != "0";  then
         if test "$withval" != "yes"; then
-          APR_ADDTO(APRUTIL_INCLUDES, [$NDBM_INC])
-          APR_ADDTO(APRUTIL_LDFLAGS, [$NDBM_LDFLAGS])
+          APR_ADDTO(INCLUDES, [$NDBM_INC])
+          APR_ADDTO(LDFLAGS, [$NDBM_LDFLAGS])
         fi
       elif test "$withval" != "yes"; then
         AC_ERROR( NDBM not found in the specified directory)



Mime
View raw message