apr-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Mo DeJong <mdej...@cygnus.com>
Subject Re: Upgrading apr to autoconf 2.50 and libtool 1.4
Date Sun, 08 Jul 2001 22:01:19 GMT
Since my last patch re upgrading autoconf and libtool was not received
with open arms, I decided to take the decidedly less fun route and
get things working with both autoconf 2.13 and 2.50 as well as
libtool 1.3 and 1.4. Here is a patch that implements that change. 

The first step is to remove the shmem/unix/mm/aclocal.m4
and add the attached shmem/unix/mm/apr_mm.m4 file:

rm shmem/unix/mm/aclocal.m4
cvs rm shmem/unix/mm/aclocal.m4
cvs add shmem/unix/mm/apr_mm.m4

Then, the following patch should be applied:

Index: buildconf
===================================================================
RCS file: /home/cvspublic/apr/buildconf,v
retrieving revision 1.17
diff -u -r1.17 buildconf
--- buildconf	2001/05/01 02:06:09	1.17
+++ buildconf	2001/07/08 21:50:11
@@ -74,7 +74,7 @@
 #
 echo "Copying libtool helper files ..."
 
-$libtoolize --copy --automake
+$libtoolize --copy --force --automake
 
 ltpath=`dirname $libtoolize`
 ltfile=`cd $ltpath/../share/aclocal ; pwd`/libtool.m4
@@ -101,6 +101,6 @@
 ### do some work to toss config.cache?
 autoconf
 
-(cd shmem/unix/mm && autoconf)
+(cd shmem/unix/mm && aclocal && autoconf)
 
 exit 0
Index: shmem/unix/mm/Makefile.in
===================================================================
RCS file: /home/cvspublic/apr/shmem/unix/mm/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- shmem/unix/mm/Makefile.in	2000/05/03 17:15:48	1.4
+++ shmem/unix/mm/Makefile.in	2001/07/08 21:50:12
@@ -51,6 +51,10 @@
 includedir  = @includedir@
 mandir      = @mandir@
 
+# This is a nasty hack that is needed because libtool
+# 1.4 uses top_builddir which is undefined here.
+top_builddir = .
+
 SHELL       = /bin/sh
 CC          = @CC@
 CFLAGS      = @CFLAGS@
Index: shmem/unix/mm/configure.in
===================================================================
RCS file: /home/cvspublic/apr/shmem/unix/mm/configure.in,v
retrieving revision 1.9
diff -u -r1.9 configure.in
--- shmem/unix/mm/configure.in	2001/02/18 15:52:12	1.9
+++ shmem/unix/mm/configure.in	2001/07/08 21:50:12
@@ -2,6 +2,8 @@
 dnl ##   Autoconf specification for MM library
 dnl ##
 
+builtin(include,apr_mm.m4)
+
 dnl #
 dnl #   standard Autoconf prolog
 dnl #

cheers
Mo DeJong
Red Hat Inc
Mime
View raw message