You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by fi...@apache.org on 2001/03/24 07:00:40 UTC
cvs commit: apr/build .cvsignore
fielding 01/03/23 22:00:40
Modified: . .cvsignore buildconf configure.in
build .cvsignore
Log:
Remove the need for aclocal.m4 by copying libtool.m4 into build and
directly including the macro files into configure.in.
Revision Changes Path
1.4 +0 -1 apr/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 2001/01/09 11:05:32 1.3
+++ .cvsignore 2001/03/24 06:00:39 1.4
@@ -13,6 +13,5 @@
*.opt
*.plg
apr.exports
-aclocal.m4
.libs
*.la
1.11 +5 -19 apr/buildconf
Index: buildconf
===================================================================
RCS file: /home/cvs/apr/buildconf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- buildconf 2001/02/18 15:52:12 1.10
+++ buildconf 2001/03/24 06:00:39 1.11
@@ -1,25 +1,6 @@
#!/bin/sh
#
-# Build aclocal.m4 from libtool's libtool.m4 and our own M4 files.
-#
-libtoolize=`build/PrintPath glibtoolize libtoolize`
-ltpath=`dirname $libtoolize`
-ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
-echo "Incorporating $ltfile into aclocal.m4 ..."
-cat > aclocal.m4 <<EOF
-dnl THIS FILE IS AUTOMATICALLY GENERATED BY buildconf
-dnl Edits here will be lost
-
-sinclude(build/apr_common.m4)
-sinclude(build/apr_network.m4)
-sinclude(build/apr_threads.m4)
-sinclude(build/apr_hints.m4)
-
-EOF
-cat $ltfile >> aclocal.m4
-
-#
# Create the libtool helper files
#
# Note: we copy (rather than link) them to simplify distribution.
@@ -27,6 +8,11 @@
# rely on libtool's versions
#
echo "Copying libtool helper files ..."
+#
+libtoolize=`build/PrintPath glibtoolize libtoolize`
+ltpath=`dirname $libtoolize`
+ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
+cp -f $ltfile build/
$libtoolize --copy --automake
#
1.258 +6 -0 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- configure.in 2001/03/06 19:22:26 1.257
+++ configure.in 2001/03/24 06:00:39 1.258
@@ -7,6 +7,12 @@
AC_CONFIG_HEADER(include/arch/unix/apr_private.h)
AC_CONFIG_AUX_DIR(build)
+sinclude(build/apr_common.m4)
+sinclude(build/apr_network.m4)
+sinclude(build/apr_threads.m4)
+sinclude(build/apr_hints.m4)
+sinclude(build/libtool.m4)
+
AC_CANONICAL_SYSTEM
echo "Configuring APR library"
OS=$host
1.2 +1 -0 apr/build/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/apr/build/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 2001/02/18 13:51:07 1.1
+++ .cvsignore 2001/03/24 06:00:40 1.2
@@ -1,3 +1,4 @@
+libtool.m4
ltconfig
ltmain.sh
rules.mk