blob: e84220e923e601cdb40331e66cf30a24fe2852ac (
plain) (
blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
--- ./apr-0.9.20/configure.in.orig 2008-06-20 17:32:47.000000000 +0000
+++ ./apr-0.9.20/configure.in 2010-10-20 21:08:11.857624440 +0000
@@ -7,6 +7,7 @@
AC_INIT(build/apr_common.m4)
AC_CONFIG_HEADER(include/arch/unix/apr_private.h)
AC_CONFIG_AUX_DIR(build)
+AC_CONFIG_MACRO_DIR(build)
dnl
dnl Include our own M4 macros along with those for libtool
@@ -16,6 +17,11 @@
sinclude(build/apr_threads.m4)
sinclude(build/apr_hints.m4)
sinclude(build/libtool.m4)
+sinclude(build/ltsugar.m4)
+sinclude(build/argz.m4)
+sinclude(build/ltoptions.m4)
+sinclude(build/ltversion.m4)
+sinclude(build/lt~obsolete.m4)
dnl Save user-defined environment settings for later restoration
dnl
@@ -98,6 +104,8 @@
dnl preload section from invoking the macro to get compiler info.
AC_PROG_CC
+AC_PROG_SED
+
dnl Preload
APR_PRELOAD
@@ -141,6 +149,11 @@
AC_ARG_ENABLE(experimental-libtool,[ --experimental-libtool Use experimental custom libtool (not included in source distribution)],
[experimental_libtool=$enableval],[experimental_libtool=no])
+dnl Workarounds for busted Libtool 2.x when we don't call AC_PROG_LIBTOOL
+if test "x$Xsed" = "x"; then
+ Xsed="$SED -e 1s/^X//"
+fi
+
case $host in
*os2*)
# Use a custom-made libtool replacement
|
