You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by je...@apache.org on 2003/01/22 18:45:21 UTC
cvs commit: apr-util CHANGES STATUS buildconf configure.in
jerenkrantz 2003/01/22 09:45:21
Modified: . CHANGES STATUS buildconf configure.in
Log:
Have buildconf copy required files from apr so that apr-util can build
on its own.
Submitted by: Craig Rodrigues <ro...@attbi.com>
Reviewed by: Justin Erenkrantz
Revision Changes Path
1.95 +3 -0 apr-util/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr-util/CHANGES,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -u -r1.94 -r1.95
--- CHANGES 21 Jan 2003 14:26:41 -0000 1.94
+++ CHANGES 22 Jan 2003 17:45:20 -0000 1.95
@@ -1,5 +1,8 @@
Changes with APR-util 0.9.2
+ *) Have buildconf copy required files from apr so that apr-util can build
+ on its own. [Craig Rodrigues <ro...@attbi.com>]
+
*) Detect OpenLDAP when used with Solaris 9. PR 13427.
[Gary Algier <ga...@ulticom.com>]
1.39 +1 -5 apr-util/STATUS
Index: STATUS
===================================================================
RCS file: /home/cvs/apr-util/STATUS,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -u -r1.38 -r1.39
--- STATUS 13 Sep 2002 23:15:22 -0000 1.38
+++ STATUS 22 Jan 2003 17:45:20 -0000 1.39
@@ -12,10 +12,6 @@
RELEASE SHOWSTOPPERS:
- * Separate apr build process so that apr-util can build on its own.
-
- Suggestions: Create an apr-build subproject and start using it.
-
RELEASE NON-SHOWSTOPPERS BUT WOULD BE REAL NICE TO WRAP THESE UP:
* Solaris's Sun Freeware (sfw) package has a busted gcc/ld setup.
1.7 +40 -0 apr-util/buildconf
Index: buildconf
===================================================================
RCS file: /home/cvs/apr-util/buildconf,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- buildconf 15 May 2002 16:51:52 -0000 1.6
+++ buildconf 22 Jan 2003 17:45:20 -0000 1.7
@@ -1,5 +1,45 @@
#!/bin/sh
+# Default place to look for apr source. Can be overridden with
+# --with-apr=[directory]
+apr_src_dir=../apr
+
+while test $# -gt 0
+do
+ # Normalize
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ case "$1" in
+ --with-apr=*)
+ apr_src_dir=$optarg
+ ;;
+ esac
+
+ shift
+done
+
+if test -d "$apr_src_dir"
+then
+ echo ""
+ echo "Looking for apr source in $apr_src_dir"
+else
+ echo ""
+ echo "Problem finding apr source in $apr_src_dir."
+ echo "Use:"
+ echo " --with-apr=[directory]"
+ exit 1
+fi
+
+# Remove some files, then copy them from apr source tree
+rm -f build/apr_common.m4 build/find_apr.m4 build/install.sh \
+ build/config.guess build/config.sub
+cp $apr_src_dir/build/apr_common.m4 $apr_src_dir/build/find_apr.m4 \
+ $apr_src_dir/build/install.sh $apr_src_dir/build/config.guess \
+ $apr_src_dir/build/config.sub build
+
# Remove aclocal.m4 as it'll break some builds...
rm -rf aclocal.m4 autom4te*.cache
1.60 +3 -3 apr-util/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr-util/configure.in,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -u -r1.59 -r1.60
--- configure.in 28 Nov 2002 21:17:47 -0000 1.59
+++ configure.in 22 Jan 2003 17:45:20 -0000 1.60
@@ -6,13 +6,13 @@
AC_INIT(export_vars.sh.in)
AC_CONFIG_HEADER(include/private/apu_config.h)
-AC_CONFIG_AUX_DIR(../apr/build)
+AC_CONFIG_AUX_DIR(build)
sinclude(build/apu-conf.m4)
sinclude(build/apu-iconv.m4)
sinclude(build/apu-hints.m4)
-sinclude(../apr/build/apr_common.m4)
-sinclude(../apr/build/find_apr.m4)
+sinclude(build/apr_common.m4)
+sinclude(build/find_apr.m4)
dnl Generate ./config.nice for reproducing runs of configure
dnl