From 8d281d3337e39f804c547ed66614e4bcfe1ef1d6 Mon Sep 17 00:00:00 2001 From: Jeff Trawick Date: Thu, 11 May 2000 21:56:51 +0000 Subject: [PATCH] src/build/build2.mk: build PCRE's configure script if needed (when you run buildconf, for example) src/Makefile.in : re-order libpcreposix.la and libpcre.la to make OS/390's binder happy (now the libraries are listed in order of dependencies) git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85195 13f79535-47bb-0310-9956-ffa450edef68 --- Makefile.in | 4 ++-- build/build2.mk | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index d828e81c6e..d19b18748b 100644 --- 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/libpcre.la \ - lib/pcre/libpcreposix.la + lib/pcre/libpcreposix.la \ + lib/pcre/libpcre.la PROGRAMS = $(PROGRAM_NAME) targets = $(PROGRAMS) diff --git a/build/build2.mk b/build/build2.mk index 4803823ef0..5b336428e1 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -64,12 +64,15 @@ config_h_in = include/ap_config_auto.h.in apr_private.h_in = lib/apr/include/apr_private.h.in apr_configure = lib/apr/configure mm_configure = lib/apr/shmem/unix/mm/configure +pcre_configure = lib/pcre/configure APACHE_TARGETS = $(TOUCH_FILES) $(LT_TARGETS) configure $(config_h_in) APR_TARGETS = $(apr_configure) $(apr_private.h_in) $(mm_configure) -targets = .deps aclocal.m4 $(APACHE_TARGETS) $(APR_TARGETS) +PCRE_TARGETS = $(pcre_configure) + +targets = .deps aclocal.m4 $(APACHE_TARGETS) $(APR_TARGETS) $(PCRE_TARGETS) all: $(targets) @@ -112,3 +115,7 @@ $(apr_configure): lib/apr/aclocal.m4 lib/apr/configure.in lib/apr/threads.m4 $(mm_configure): lib/apr/shmem/unix/mm/configure.in @echo rebuilding $@ (cd lib/apr/shmem/unix/mm && autoconf) + +$(pcre_configure): lib/pcre/configure.in + @echo rebuilding $@ + (cd lib/pcre && autoconf)