On Sun, 14 May 2000 22:44:50 -0700 (PDT), Greg Stein wrote:
>On Sat, 13 May 2000, Brian Havard wrote:
>>...
>> I've implemented (2) in my tree here to get things working again but like
>> the idea of (1) better. Preferences/opinions/ideas anyone?
>
>I say, link the thing right into Apache (and export from there). I don't
>see any need to turn it into a dynamically-loaded library since it is a
>required part of Apache. I think it will also simplify things by reducing
>the number of config/build options.
Yup, I agree, and eliminating libtool will reduce build time too. If nobody
objects I'll apply the patch below. To keep it simple I've just changed
--disable-shared to be the default. Oddly enough, there's a comment in the
makefile that suggests that's the way it's supposed to be.
Index: Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/Makefile.in,v
retrieving revision 1.20
diff -u -r1.20 Makefile.in
--- Makefile.in 2000/05/11 21:56:51 1.20
+++ Makefile.in 2000/05/15 14:08:52
@@ -11,8 +11,8 @@
os/$(OS_DIR)/libos.la \
ap/libap.la \
lib/apr/$(LIBPRE)apr.a \
- lib/pcre/libpcreposix.la \
- lib/pcre/libpcre.la
+ lib/pcre/libpcreposix.a \
+ lib/pcre/libpcre.a
PROGRAMS = $(PROGRAM_NAME)
targets = $(PROGRAMS)
Index: lib/pcre/Makefile.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/pcre/Makefile.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile.in
--- lib/pcre/Makefile.in 2000/05/05 23:28:21 1.1.1.1
+++ lib/pcre/Makefile.in 2000/05/15 14:09:23
@@ -24,6 +24,7 @@
# The pcretest program, as it is a test program, does not get installed
# anywhere.
+SHELL=@SHELL@
prefix = @prefix@
exec_prefix = @exec_prefix@
@@ -180,7 +181,7 @@
# chartables.c shouldn't change, and if people have edited the tables by hand,
# you don't want to throw them away.
-clean:; -rm -rf *.o *.lo *.a *.la .libs pcretest pgrep testtry
+clean:; -rm -rf *.o *.lo *.a *.la .libs pcretest pgrep testtry *.exe
# But "make distclean" should get back to a virgin distribution
Index: lib/pcre/configure.in
===================================================================
RCS file: /home/cvs/apache-2.0/src/lib/pcre/configure.in,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 configure.in
--- lib/pcre/configure.in 2000/05/05 23:28:21 1.1.1.1
+++ lib/pcre/configure.in 2000/05/15 14:09:27
@@ -48,15 +48,23 @@
dnl Handle --enable-shared-libraries
-LIBTOOL=libtool
-LIBSUFFIX=la
+LIBTOOL=
+LIBSUFFIX=a
AC_ARG_ENABLE(shared,
-[ --disable-shared build PCRE as a static library],
-if test "$enableval" = "no"; then
- LIBTOOL=
- LIBSUFFIX=a
+[ --enable-shared build PCRE as a shared library],
+if test "$enableval" = "yes"; then
+ LIBTOOL=libtool
+ LIBSUFFIX=la
fi
)
+
+PLATFORM=`uname -s`
+
+case "$PLATFORM" in
+*OS/2*)
+ CFLAGS="$CFLAGS -Zexe"
+ ;;
+esac
dnl "Export" these variables
--
______________________________________________________________________________
| Brian Havard | "He is not the messiah! |
| brianh@kheldar.apana.org.au | He's a very naughty boy!" - Life of Brian |
------------------------------------------------------------------------------
|