You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by jo...@apache.org on 2009/03/25 17:18:44 UTC
svn commit: r758327 - in /apr/apr/trunk: build/apu-iconv.m4 build/crypto.m4
build/dbd.m4 configure.in
Author: jorton
Date: Wed Mar 25 16:18:35 2009
New Revision: 758327
URL: http://svn.apache.org/viewvc?rev=758327&view=rev
Log:
* build/apu-iconv.m4, build/dbd.m4, build/crypto.m4: Use INCLUDES
throughout.
* configure.in: Drop use of APRUTIL_PRIV_INCLUDES, APRUTIL_INCLUDES.
Modified:
apr/apr/trunk/build/apu-iconv.m4
apr/apr/trunk/build/crypto.m4
apr/apr/trunk/build/dbd.m4
apr/apr/trunk/configure.in
Modified: apr/apr/trunk/build/apu-iconv.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/apu-iconv.m4?rev=758327&r1=758326&r2=758327&view=diff
==============================================================================
--- apr/apr/trunk/build/apu-iconv.m4 (original)
+++ apr/apr/trunk/build/apu-iconv.m4 Wed Mar 25 16:18:35 2009
@@ -83,7 +83,6 @@
fi
fi
APR_REMOVEFROM(CPPFLAGS,[-I$apu_iconv_dir/include])
- APR_REMOVEFROM(LDFLAGS,[-L$apu_iconv_dir/lib])
APR_ADDTO(INCLUDES,[-I$apu_iconv_dir/include])
APR_ADDTO(LDFLAGS,[-L$apu_iconv_dir/lib])
fi
Modified: apr/apr/trunk/build/crypto.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/crypto.m4?rev=758327&r1=758326&r2=758327&view=diff
==============================================================================
--- apr/apr/trunk/build/crypto.m4 (original)
+++ apr/apr/trunk/build/crypto.m4 Wed Mar 25 16:18:35 2009
@@ -178,7 +178,7 @@
fi
if test "$apu_have_nss" != "0"; then
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$nss_CPPFLAGS])
+ APR_ADDTO(INCLUDES, [$nss_CPPFLAGS])
fi
], [
apu_have_nss=0
Modified: apr/apr/trunk/build/dbd.m4
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/dbd.m4?rev=758327&r1=758326&r2=758327&view=diff
==============================================================================
--- apr/apr/trunk/build/dbd.m4 (original)
+++ apr/apr/trunk/build/dbd.m4 Wed Mar 25 16:18:35 2009
@@ -63,7 +63,7 @@
])
fi
if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS])
+ APR_ADDTO(INCLUDES, [$pgsql_CPPFLAGS])
fi
elif test "$withval" = "no"; then
:
@@ -104,7 +104,7 @@
])
fi
if test "$apu_have_pgsql" != "0"; then
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS])
+ APR_ADDTO(INCLUDES, [$pgsql_CPPFLAGS])
fi
fi
], [
@@ -140,7 +140,7 @@
])
fi
if test "$apu_have_pgsql" != "0" && test "x$PGSQL_CONFIG" != 'x'; then
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$pgsql_CPPFLAGS])
+ APR_ADDTO(INCLUDES, [$pgsql_CPPFLAGS])
fi
])
AC_SUBST(apu_have_pgsql)
@@ -187,7 +187,7 @@
[#include <mysql/my_global.h>])
fi
if test "$apu_have_mysql" != "0" && test "x$MYSQL_CONFIG" != 'x'; then
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
+ APR_ADDTO(INCLUDES, [$mysql_CPPFLAGS])
fi
elif test "$withval" = "no"; then
:
@@ -219,7 +219,7 @@
[#include <mysql/my_global.h>])
fi
if test "$apu_have_mysql" != "0"; then
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$mysql_CPPFLAGS])
+ APR_ADDTO(INCLUDES, [$mysql_CPPFLAGS])
fi
fi
])
@@ -261,7 +261,7 @@
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_PRIV_INCLUDES, [-I$withval/include])
+ APR_ADDTO(INCLUDES, [-I$withval/include])
fi
fi
], [
@@ -305,7 +305,7 @@
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_PRIV_INCLUDES, [-I$withval/include])
+ APR_ADDTO(INCLUDES, [-I$withval/include])
fi
fi
], [
@@ -341,7 +341,7 @@
if test "$withval" = "yes"; then
if test -n "$with_oracle_include"; then
oracle_CPPFLAGS="$CPPFLAGS -I$with_oracle_include"
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$with_oracle_include])
+ APR_ADDTO(INCLUDES, [-I$with_oracle_include])
fi
APR_ADDTO(CPPFLAGS, [$oracle_CPPFLAGS])
@@ -363,7 +363,7 @@
else
if test -n "$with_oracle_include"; then
oracle_CPPFLAGS="$CPPFLAGS -I$with_oracle_include"
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$with_oracle_include])
+ APR_ADDTO(INCLUDES, [-I$with_oracle_include])
else
oracle_CPPFLAGS="-I$withval/rdbms/demo -I$withval/rdbms/public"
fi
@@ -388,8 +388,7 @@
if test "$apu_have_oracle" != "0"; then
oracle_LDFLAGS="$oracle_LDFLAGS -R$withval/lib"
if test -z "$with_oracle_include"; then
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$withval/rdbms/demo])
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$withval/rdbms/public])
+ APR_ADDTO(INCLUDES, [-I$withval/rdbms/demo -I$withval/rdbms/public])
fi
fi
fi
@@ -440,7 +439,7 @@
AC_CHECK_HEADERS(freetds/sybdb.h, AC_CHECK_LIB(sybdb, tdsdbopen, [apu_have_freetds=1]))
fi
if test "$apu_have_freetds" != "0"; then
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [-I$withval/include])
+ APR_ADDTO(INCLUDES, [-I$withval/include])
fi
fi
], [
@@ -494,7 +493,7 @@
AC_CHECK_HEADERS(odbc/sql.h, AC_CHECK_LIB(odbc, SQLAllocHandle, [apu_have_odbc=1]))
fi
if test "$apu_have_odbc" != "0" && test "x$ODBC_CONFIG" != 'x'; then
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$odbc_CPPFLAGS])
+ APR_ADDTO(INCLUDES, [$odbc_CPPFLAGS])
fi
elif test "$withval" = "no"; then
:
@@ -519,7 +518,7 @@
AC_CHECK_HEADERS(odbc/sql.h, AC_CHECK_LIB(odbc, SQLAllocHandle, [apu_have_odbc=1]))
fi
if test "$apu_have_odbc" != "0" && test "x$ODBC_CONFIG" != 'x'; then
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$odbc_CPPFLAGS])
+ APR_ADDTO(INCLUDES, [$odbc_CPPFLAGS])
fi
fi
], [
@@ -539,7 +538,7 @@
AC_CHECK_HEADERS(odbc/sql.h, AC_CHECK_LIB(odbc, SQLAllocHandle, [apu_have_odbc=1]))
fi
if test "$apu_have_odbc" != "0" && test "x$ODBC_CONFIG" != 'x'; then
- APR_ADDTO(APRUTIL_PRIV_INCLUDES, [$odbc_CPPFLAGS])
+ APR_ADDTO(INCLUDES, [$odbc_CPPFLAGS])
fi
])
AC_SUBST(apu_have_odbc)
Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=758327&r1=758326&r2=758327&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Wed Mar 25 16:18:35 2009
@@ -2403,8 +2403,7 @@
[--enable-layout=*|\'--enable-layout=*])
APRUTIL_EXPORT_LIBS="$abs_srcdir/$apu_apriconv_dir/lib/libapriconv.la \
$APRUTIL_EXPORT_LIBS"
- APRUTIL_INCLUDES="-I$abs_srcdir/$apu_apriconv_dir/include \
- $APRUTIL_INCLUDES"
+ APR_ADDTO(INCLUDES, [-I$abs_srcdir/$apu_apriconv_dir/include])
APR_ICONV_DIR="$apu_apriconv_dir"
else
APR_ICONV_DIR=""
@@ -2492,10 +2491,7 @@
dnl Prep all the flags and stuff for compilation and export to other builds
dnl
APR_ADDTO(LIBS, [$APRUTIL_LIBS])
-APR_ADDTO(INCLUDES, [$APRUTIL_PRIV_INCLUDES])
-AC_SUBST(APRUTIL_PRIV_INCLUDES)
-AC_SUBST(APRUTIL_INCLUDES)
AC_SUBST(LDFLAGS)