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.



git-svn-id: https://svn.apache.org/repos/asf/apr/apr/trunk@757740 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 87 insertions, 0 deletions

diff --git a/build.conf b/build.conf
index c302b98be..87cf0a0c1 100644
--- a/build.conf
+++ b/build.conf
@@ -9,6 +9,28 @@ paths =
   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 @@ headers = include/*.h
 # 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
+