jerenkrantz 2004/07/08 16:18:52
Modified: . CHANGES configure.in
Added: build jlibtool.c
Log:
Re-instate jlibtool from deleted revision 1.5. Paperwork filed. All is well.
* configure.in: We now include jlibtool in our base distribution.
* build/jlibtool.c: Restore deleted revision 1.5.
Revision Changes Path
1.481 +3 -0 apr/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apr/CHANGES,v
retrieving revision 1.480
retrieving revision 1.481
diff -u -u -r1.480 -r1.481
--- CHANGES 6 Jul 2004 03:38:06 -0000 1.480
+++ CHANGES 8 Jul 2004 23:18:52 -0000 1.481
@@ -7,6 +7,9 @@
Changes with APR 1.0
+ *) Add jlibtool - enabled with '--enable-experimental-libtool' option.
+ [Justin Erenkrantz]
+
*) Add support for KQueue and sys_epoll to apr_pollset. [Paul Querna]
*) Support threading on FreeBSD 5.x where kern.osreldate >= 502102.
1.596 +1 -4 apr/configure.in
Index: configure.in
===================================================================
RCS file: /home/cvs/apr/configure.in,v
retrieving revision 1.595
retrieving revision 1.596
diff -u -u -r1.595 -r1.596
--- configure.in 7 Jul 2004 07:40:12 -0000 1.595
+++ configure.in 8 Jul 2004 23:18:52 -0000 1.596
@@ -135,7 +135,7 @@
dnl
echo "performing libtool configuration..."
-AC_ARG_ENABLE(experimental-libtool,[ --experimental-libtool Use
experimental custom libtool (not included in source distribution)],
+AC_ARG_ENABLE(experimental-libtool,[ --experimental-libtool Use
experimental custom libtool],
[experimental_libtool=$enableval],[experimental_libtool=no])
case $host in
@@ -154,9 +154,6 @@
echo "using jlibtool"
LIBTOOL="$apr_builddir/libtool"
LIBTOOL_SRC="$apr_srcdir/build/jlibtool.c"
- if test ! -f $LIBTOOL_SRC; then
- AC_MSG_ERROR([Experimental libtool source not found. It is not
included with APR by default.])
- fi
$CC $CFLAGS $CPPFLAGS -o $LIBTOOL $LIBTOOL_SRC
else
dnl libtoolize requires that the following not be indented
1.6 +0 -0 apr/build/jlibtool.c