apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r757740 - in /apr/apr/trunk: Makefile.in build.conf build/ build/apu-conf.m4 build/apu-hints.m4 build/apu-iconv.m4 build/crypto.m4 build/dbd.m4 build/dbm.m4 build/dso.m4 configure.in
Date Tue, 24 Mar 2009 11:29:23 GMT
Author: jorton
Date: Tue Mar 24 11:29:22 2009
New Revision: 757740

URL: http://svn.apache.org/viewvc?rev=757740&view=rev
Log:
Start merging buildsystem from apr-util:

* Makefile.in: Add include/private to include path.

* build/: Merge autoconf macro set, adjust to inherit APR_HAVE_DSO correctly.

* build.conf: Build APR-util code.

* configure.in: Call APR-util macro set.


Added:
    apr/apr/trunk/build/apu-conf.m4   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/build/apu-conf.m4
    apr/apr/trunk/build/apu-hints.m4   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/build/apu-hints.m4
    apr/apr/trunk/build/apu-iconv.m4   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/build/apu-iconv.m4
    apr/apr/trunk/build/crypto.m4   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/build/crypto.m4
    apr/apr/trunk/build/dbd.m4   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/build/dbd.m4
    apr/apr/trunk/build/dbm.m4   (props changed)
      - copied unchanged from r757706, apr/apr-util/trunk/build/dbm.m4
    apr/apr/trunk/build/dso.m4   (contents, props changed)
      - copied, changed from r757706, apr/apr-util/trunk/build/dso.m4
Modified:
    apr/apr/trunk/Makefile.in
    apr/apr/trunk/build/   (props changed)
    apr/apr/trunk/build.conf
    apr/apr/trunk/configure.in

Modified: apr/apr/trunk/Makefile.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/Makefile.in?rev=757740&r1=757739&r2=757740&view=diff
==============================================================================
--- apr/apr/trunk/Makefile.in (original)
+++ apr/apr/trunk/Makefile.in Tue Mar 24 11:29:22 2009
@@ -18,7 +18,7 @@
 INCDIR=./include
 OSDIR=$(top_srcdir)/include/arch/@OSDIR@
 DEFOSDIR=$(INCDIR)/arch/@DEFAULT_OSDIR@
-INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@
-I$(top_srcdir)/include
+INCLUDES=-I$(INCDIR) -I$(OSDIR) -I$(DEFOSDIR) -I$(top_srcdir)/include/arch/@DEFAULT_OSDIR@
-I$(top_srcdir)/include -I$(top_srcdir)/include/private -I$(top_blddir)/include/private
 
 #
 # Macros for target determination

Propchange: apr/apr/trunk/build/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Mar 24 11:29:22 2009
@@ -16,3 +16,4 @@
 *.mak
 lt*.m4
 argz.m4
+libtool.m4.*

Modified: apr/apr/trunk/build.conf
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build.conf?rev=757740&r1=757739&r2=757740&view=diff
==============================================================================
--- apr/apr/trunk/build.conf (original)
+++ apr/apr/trunk/build.conf Tue Mar 24 11:29:22 2009
@@ -9,6 +9,28 @@
   passwd/*.c
   strings/*.c
   tables/*.c
+  buckets/*.c
+  crypto/apr_crypto.c
+  crypto/apr_md4.c
+  crypto/apr_md5.c
+  crypto/apr_sha1.c
+  crypto/getuuid.c
+  crypto/uuid.c
+  dbm/apr_dbm_sdbm.c
+  dbm/apr_dbm.c
+  dbm/sdbm/*.c
+  encoding/*.c
+  hooks/*.c
+  ldap/apr_ldap_stub.c
+  ldap/apr_ldap_url.c
+  misc/*.c
+  memcache/*.c
+  uri/apr_uri.c
+  xml/*.c
+  strmatch/*.c
+  xlate/*.c
+  dbd/apr_dbd.c
+  
 
 # directories that have platform-specific code in them. the resulting
 # pattern will be: SUBDIR/PLATFORM/*.c
@@ -26,3 +48,68 @@
 # test/*.c
 
 dsp = libapr.dsp
+
+modules =
+  ldap crypto_openssl crypto_nss dbd_pgsql
+  dbd_sqlite2 dbd_sqlite3 dbd_oracle dbd_mysql dbd_freetds dbd_odbc
+  dbm_db dbm_gdbm dbm_ndbm
+
+# gen_uri_delim.c
+
+# we have a recursive makefile for the test files (for now)
+# test/*.c
+
+[crypto_openssl]
+paths = crypto/apr_crypto_openssl.c
+target = crypto/apr_crypto_openssl.la
+
+[crypto_nss]
+paths = crypto/apr_crypto_nss.c
+target = crypto/apr_crypto_nss.la
+
+[dbd_pgsql]
+paths = dbd/apr_dbd_pgsql.c
+target = dbd/apr_dbd_pgsql.la
+
+[dbd_sqlite2]
+paths = dbd/apr_dbd_sqlite2.c
+target = dbd/apr_dbd_sqlite2.la
+
+[dbd_sqlite3]
+paths = dbd/apr_dbd_sqlite3.c
+target = dbd/apr_dbd_sqlite3.la
+
+[dbd_oracle]
+paths = dbd/apr_dbd_oracle.c
+target = dbd/apr_dbd_oracle.la
+
+[dbd_mysql]
+paths = dbd/apr_dbd_mysql.c
+target = dbd/apr_dbd_mysql.la
+
+[dbd_freetds]
+paths = dbd/apr_dbd_freetds.c
+target = dbd/apr_dbd_freetds.la
+
+[dbd_odbc]
+paths = dbd/apr_dbd_odbc.c
+target = dbd/apr_dbd_odbc.la
+
+[dbm_db]
+paths = dbm/apr_dbm_berkeleydb.c
+target = dbm/apr_dbm_db.la
+
+[dbm_gdbm]
+paths = dbm/apr_dbm_gdbm.c
+target = dbm/apr_dbm_gdbm.la
+
+[dbm_ndbm]
+paths = dbm/apr_dbm_ndbm.c
+target = dbm/apr_dbm_ndbm.la
+
+[ldap]
+paths = ldap/apr_ldap_init.c \
+        ldap/apr_ldap_option.c \
+        ldap/apr_ldap_rebind.c
+target = ldap/apr_ldap.la
+

Propchange: apr/apr/trunk/build/apu-conf.m4
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/build/apu-conf.m4
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/build/apu-hints.m4
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/build/apu-hints.m4
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/build/apu-iconv.m4
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/build/apu-iconv.m4
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/build/crypto.m4
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/build/crypto.m4
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/build/dbd.m4
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/build/dbd.m4
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: apr/apr/trunk/build/dbm.m4
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/build/dbm.m4
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: apr/apr/trunk/build/dso.m4 (from r757706, apr/apr-util/trunk/build/dso.m4)
URL: http://svn.apache.org/viewvc/apr/apr/trunk/build/dso.m4?p2=apr/apr/trunk/build/dso.m4&p1=apr/apr-util/trunk/build/dso.m4&r1=757706&r2=757740&rev=757740&view=diff
==============================================================================
--- apr/apr-util/trunk/build/dso.m4 (original)
+++ apr/apr/trunk/build/dso.m4 Tue Mar 24 11:29:22 2009
@@ -27,8 +27,7 @@
   if test "$enable_util_dso" = "no"; then
      apu_dso_build="0"
   else
-     apr_h="`$apr_config --includedir`/apr.h"
-     apu_dso_build="`awk '/^#define APR_HAS_DSO/ { print @S|@3; }' $apr_h`"
+     apu_dso_build=$aprdso
   fi
 
   if test "$apu_dso_build" = "0"; then

Propchange: apr/apr/trunk/build/dso.m4
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: apr/apr/trunk/build/dso.m4
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: apr/apr/trunk/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/trunk/configure.in?rev=757740&r1=757739&r2=757740&view=diff
==============================================================================
--- apr/apr/trunk/configure.in (original)
+++ apr/apr/trunk/configure.in Tue Mar 24 11:29:22 2009
@@ -26,6 +26,14 @@
 sinclude(build/ltversion.m4)
 sinclude(build/lt~obsolete.m4)
 
+sinclude(build/apu-conf.m4)
+sinclude(build/apu-iconv.m4)
+sinclude(build/apu-hints.m4)
+sinclude(build/crypto.m4)
+sinclude(build/dbm.m4)
+sinclude(build/dbd.m4)
+sinclude(build/dso.m4)
+
 dnl Hard-coded inclusion at the tail end of apr_private.h:
 AH_BOTTOM([
 /* switch this on if we have a BeOS version below BONE */
@@ -2371,6 +2379,129 @@
 
 AC_SUBST(have_unicode_fs)
 
+dnl ------------------------------ APR-util stuff 
+
+APU_PRELOAD
+
+dnl
+dnl  Find the APR-ICONV directory.
+dnl
+AC_ARG_WITH(apr-iconv,
+            [  --with-apr-iconv=DIR    relative path to apr-iconv source],
+  [ apu_apriconv_dir="$withval"
+    if test "$apu_apriconv_dir" != "no"; then
+      if test -d "$apu_apriconv_dir"; then
+        APR_SUBDIR_CONFIG("$apu_apriconv_dir",
+                          [$apache_apr_flags \
+                             --prefix=$prefix \
+                             --exec-prefix=$exec_prefix \
+                             --libdir=$libdir \
+                             --includedir=$includedir \
+                             --bindir=$bindir \
+                             --datadir=$datadir \
+                             --with-installbuilddir=$installbuilddir],
+                          [--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_ICONV_DIR="$apu_apriconv_dir"
+      else
+       APR_ICONV_DIR=""
+      fi
+    else
+      APR_ICONV_DIR=""
+    fi
+  ])
+AC_SUBST(APR_ICONV_DIR)
+
+dnl Find LDAP library
+dnl Determine what DBM backend type to use.
+dnl Find Expat
+dnl Find an iconv library
+APU_CHECK_CRYPTO
+APU_CHECK_CRYPTO_OPENSSL
+APU_CHECK_CRYPTO_NSS
+APU_FIND_LDAP
+APU_CHECK_DBM
+APU_CHECK_DBD
+APU_CHECK_DBD_MYSQL
+APU_CHECK_DBD_SQLITE3
+APU_CHECK_DBD_SQLITE2
+APU_CHECK_DBD_ORACLE
+APU_CHECK_DBD_FREETDS
+APU_CHECK_DBD_ODBC
+APU_FIND_EXPAT
+APU_FIND_ICONV
+
+AC_CHECK_HEADERS( \
+sys/sdt.h
+)
+
+AC_ARG_ENABLE(dtrace,APR_HELP_STRING(--enable-dtrace, Enable DTrace probes),
+[
+  enable_dtrace=$enableval
+],
+[
+  enable_dtrace=no
+])
+
+if test $enable_dtrace = "yes" -a "$ac_cv_header_sys_sdt_h" = "yes"; then
+    APR_ADDTO(CPPFLAGS, -DAPR_DTRACE_PROVIDER)
+fi
+
+dnl Enable DSO build; must be last:
+APU_CHECK_UTIL_DSO
+
+AC_SEARCH_LIBS(crypt, crypt ufc)
+AC_MSG_CHECKING(if system crypt() function is threadsafe)
+if test "x$apu_crypt_threadsafe" = "x1"; then
+  AC_DEFINE(APU_CRYPT_THREADSAFE, 1, [Define if the system crypt() function is threadsafe])
+  msg="yes"
+else
+  msg="no"
+fi
+AC_MSG_RESULT([$msg])
+
+AC_CHECK_FUNCS(crypt_r, [ crypt_r="1" ], [ crypt_r="0" ])
+if test "$crypt_r" = "1"; then
+  APU_CHECK_CRYPT_R_STYLE
+fi
+
+APRUTIL_LIBNAME="aprutil${libsuffix}"
+AC_SUBST(APRUTIL_LIBNAME)
+
+# Set up destination directory for DSOs.
+APU_DSO_LIBDIR="\${libdir}/apr-util-${APRUTIL_MAJOR_VERSION}"
+# Set APU_HAVE_MODULES appropriately for the Makefile
+if test -n "$APU_MODULES"; then 
+   APU_HAVE_MODULES=yes
+else
+   APU_HAVE_MODULES=no
+fi
+# Define expanded libdir for apu_config.h
+APR_EXPAND_VAR(abs_dso_libdir, $APU_DSO_LIBDIR)
+AC_DEFINE_UNQUOTED([APU_DSO_LIBDIR], ["$abs_dso_libdir"],
+                   [Define to be absolute path to DSO directory])
+AC_SUBST(APU_HAVE_MODULES)
+AC_SUBST(APU_DSO_LIBDIR)
+AC_SUBST(APU_MODULES)
+AC_SUBST(EXTRA_OBJECTS)
+
+dnl
+dnl Prep all the flags and stuff for compilation and export to other builds
+dnl
+APR_ADDTO(APRUTIL_LIBS, [$APR_LIBS])
+
+AC_SUBST(APRUTIL_EXPORT_LIBS)
+AC_SUBST(APRUTIL_PRIV_INCLUDES)
+AC_SUBST(APRUTIL_INCLUDES)
+AC_SUBST(APRUTIL_LDFLAGS)
+AC_SUBST(APRUTIL_LIBS)
+AC_SUBST(LDFLAGS)
+
+
+
 dnl ----------------------------- Finalize the variables
 
 echo "${nl}Restore user-defined environment settings..."
@@ -2441,6 +2572,10 @@
    AC_CONFIG_FILES([test/Makefile test/internal/Makefile])
 fi
 
+AC_CONFIG_FILES([include/private/apu_select_dbm.h
+                 include/apr_ldap.h
+                 include/apu.h include/apu_want.h])
+
 dir=include/arch/unix
 test -d $dir || $MKDIR $dir
 



Mime
View raw message