Fix PCRE build on OS/2. This includes taking libtool out of the picture,

making static build the default.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85228 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/Makefile.in b/Makefile.in
index d19b18748bf5ec916e99911aa7e94d2d5b264733..d706213f0d3ffd68900e313c1be61dafc28b2b94 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,8 +11,8 @@ PROGRAM_DEPENDENCIES = \
   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)

diff --git a/srclib/pcre/Makefile.in b/srclib/pcre/Makefile.in
index b837424777820346c505dd32598e3c3792e9ef63..cebb44d0550a3be95fab08e7729229cb0ee28c26 100644 (file)
--- a/srclib/pcre/Makefile.in
+++ b/srclib/pcre/Makefile.in
@@ -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 @@ install:        all
 # 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
 

diff --git a/srclib/pcre/configure.in b/srclib/pcre/configure.in
index a947f19d2dcfd35a8d0f701d00a75deb59916160..b59bab6bbe1e054e98d50d33cb5f98796d7a7c91 100644 (file)
--- a/srclib/pcre/configure.in
+++ b/srclib/pcre/configure.in
@@ -48,16 +48,24 @@ AC_CHECK_FUNCS(memmove strerror)
 
 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
 
 AC_SUBST(HAVE_MEMMOVE)