* finding or making base-0 * build reference tree for dilinger@voxel.net--2004-public/apache2--pcre--0--base-0 * from import revision: dilinger@voxel.net--2004-public/apache2--mainline--0--base-0 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--base-0 * finding or making patch-14 * build reference tree for dilinger@voxel.net--2004-public/apache2--pcre--0--patch-14 * from import revision: dilinger@voxel.net--2004-public/apache2--mainline--0--base-0 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--base-0 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--patch-1 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--patch-2 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--patch-3 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--patch-4 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--patch-5 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--patch-6 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--patch-7 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--patch-8 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--patch-9 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--patch-10 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--patch-11 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--patch-12 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--patch-13 * patching for revision: dilinger@voxel.net--2004-public/apache2--pcre--0--patch-14 * computing changeset A {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-1 A {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-10 A {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-11 A {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-12 A {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-13 A {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-14 A {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-2 A {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-3 A {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-4 A {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-5 A {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-6 A {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-7 A {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-8 A {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-9 M acinclude.m4 M configure.in M Makefile.in M include/pcreposix.h M srclib/Makefile.in * changeset report * added files {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-1 {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-10 {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-11 {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-12 {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-13 {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-14 {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-2 {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-3 {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-4 {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-5 {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-6 {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-7 {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-8 {arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-9 * modified files --- orig/Makefile.in +++ mod/Makefile.in @@ -179,7 +179,9 @@ @cp -p $(srcdir)/modules/http/mod_core.h $(DESTDIR)$(includedir) @cp -p $(srcdir)/modules/proxy/mod_proxy.h $(DESTDIR)$(includedir) @cp -p $(srcdir)/modules/ssl/*.h $(DESTDIR)$(includedir) - @cp -p $(srcdir)/srclib/pcre/pcre*.h $(DESTDIR)$(includedir) + @if test "$(AP_NEEDS_PCRE)" = "1"; then \ + cp -p $(srcdir)/srclib/pcre/pcre*.h $(DESTDIR)$(includedir); \ + fi @cp -p $(srcdir)/os/$(OS_DIR)/*.h $(DESTDIR)$(includedir) @chmod 644 $(DESTDIR)$(includedir)/*.h --- orig/acinclude.m4 +++ mod/acinclude.m4 @@ -501,6 +501,46 @@ ]) dnl +dnl APACHE_REGEX_CHECK +dnl Check whether system's glibc provides regex.h and POSIX.2 regex +dnl functions; sets AP_NEEDS_REGEX accordingly. +dnl +AC_DEFUN(APACHE_REGEX_CHECK,[ + AP_NEEDS_REGEX=1 + AC_CHECK_HEADER(regex.h,[ + AC_CHECK_FUNCS([regcomp regexec regerror regfree],[ + AC_DEFINE(HAVE_REGEX_H, 1, [Define to 1 if is available]) + AP_NEEDS_REGEX=0 + ]) + ]) + APACHE_SUBST(AP_NEEDS_REGEX) +]) + +dnl +dnl APACHE_PCRE_CHECK +dnl Check whether system has PCRE library available to it. Set +dnl AP_NEEDS_PCRE (and CFLAGS/LIBS) accordingly. +dnl +AC_DEFUN(APACHE_PCRE_CHECK,[ + AP_NEEDS_PCRE=1 + + AC_PATH_PROG(ap_pcre_conf, pcre-config) + ap_save_CFLAGS="$CFLAGS" + ap_save_LIBS="$LIBS" + CFLAGS="$CFLAGS `$ap_pcre_conf --cflags 2>/dev/null`" + LIBS="$LIBS `$ap_pcre_conf --libs 2>/dev/null`" + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], + [[char *foo = pcre_version();]])],[ + AP_NEEDS_PCRE=0 + ],[ + CFLAGS="$ap_save_CFLAGS" + LIBS="$ap_save_LIBS" + ]) + + APACHE_SUBST(AP_NEEDS_PCRE) +]) + +dnl dnl APACHE_EXPORT_ARGUMENTS dnl Export (via APACHE_SUBST) the various path-related variables that dnl apache will use while generating scripts like autoconf and apxs and --- orig/configure.in +++ mod/configure.in @@ -114,10 +114,18 @@ AC_PROG_CC AC_PROG_CPP -echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}" +APACHE_REGEX_CHECK +if test "$AP_NEEDS_REGEX" = "1"; then + APACHE_PCRE_CHECK +fi -APR_SUBDIR_CONFIG(srclib/pcre, - [--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir]) +if test "$AP_NEEDS_PCRE" = "1"; then + echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}" + APR_SUBDIR_CONFIG(srclib/pcre, + [--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir]) + AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS pcre" + AP_CLEAN_SRCLIB_DIRS="pcre $AP_CLEAN_SRCLIB_DIRS" +fi echo $ac_n "${nl}Configuring Apache httpd ...${nl}" @@ -475,7 +483,9 @@ AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] ) dnl AP_LIBS specifies the actual libraries. note we have some required libs. -AP_LIBS="$abs_builddir/srclib/pcre/libpcre.la $AP_LIBS" +if test "$AP_NEEDS_PCRE" = "1"; then + AP_LIBS="$abs_builddir/srclib/pcre/libpcre.la $AP_LIBS" +fi dnl APR should go after the other libs, so the right symbols can be picked up AP_LIBS="$AP_LIBS `$apu_config --link-libtool --libs` `$apr_config --link-libtool --libs`" --- orig/include/pcreposix.h +++ mod/include/pcreposix.h @@ -12,6 +12,13 @@ #ifndef _PCREPOSIX_H #define _PCREPOSIX_H +#ifdef HAVE_REGEX_H +#ifdef HAVE_SYS_TYPES_H +#include +#endif /* HAVE_SYS_TYPES_H */ +#include +#else + /* This is the header for the POSIX wrapper interface to the PCRE Perl- Compatible Regular Expression library. It defines the things POSIX says should be there. I hope. */ @@ -96,4 +103,5 @@ } /* extern "C" */ #endif +#endif /* !HAVE_REGEX_H */ #endif /* End of pcreposix.h */ --- orig/srclib/Makefile.in +++ mod/srclib/Makefile.in @@ -1,5 +1,5 @@ -SUBDIRS = pcre +SUBDIRS = BUILD_SUBDIRS = $(AP_BUILD_SRCLIB_DIRS) CLEAN_SUBDIRS = $(AP_CLEAN_SRCLIB_DIRS)