Attachment #13661 for bug #27550

View | Details | Raw Unified | Return to bug 27550
Collapse All | Expand All




   {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
++ mod/Makefile.in

	@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)
	@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

++ mod/acinclude.m4

])

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 <regex.h> 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 <pcre.h>]],
      [[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
++ mod/configure.in

AC_PROG_CC
AC_PROG_CPP

APACHE_REGEX_CHECK
if test "$AP_NEEDS_REGEX" = "1"; then
  APACHE_PCRE_CHECK
fi

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}"


  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.
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`"
++ mod/include/pcreposix.h

#ifndef _PCREPOSIX_H
#define _PCREPOSIX_H

#ifdef HAVE_REGEX_H 
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif /* HAVE_SYS_TYPES_H */
#include <regex.h>
#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. */

}   /* extern "C" */
#endif

#endif /* !HAVE_REGEX_H */
#endif /* End of pcreposix.h */
++ mod/srclib/Makefile.in


SUBDIRS =
BUILD_SUBDIRS = $(AP_BUILD_SRCLIB_DIRS)
CLEAN_SUBDIRS = $(AP_CLEAN_SRCLIB_DIRS)


Return to bug 27550

Line Link Here

(-)file_not_specified_in_diff (-11 / +71 lines)
	{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-1
1	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-10	1	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-10
2	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-11	2	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-11
3	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-12	3	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-12
4	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-13	4	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-13
5	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-14	5	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-14
6	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-2	6	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-2
7	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-3	7	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-3
8	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-4	8	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-4
9	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-5	9	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-5
10	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-6	10	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-6
11	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-7	11	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-7
12	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-8	12	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-8
13	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-9	13	{arch}/apache2/apache2--pcre/apache2--pcre--0/dilinger@voxel.net--2004-public/patch-log/patch-9
14	-- orig/Makefile.in	14	++ mod/Makefile.in
Lines 179-185 Link Here
179	@cp -p $(srcdir)/modules/http/mod_core.h $(DESTDIR)$(includedir)	179	@cp -p $(srcdir)/modules/http/mod_core.h $(DESTDIR)$(includedir)
180	@cp -p $(srcdir)/modules/proxy/mod_proxy.h $(DESTDIR)$(includedir)	180	@cp -p $(srcdir)/modules/proxy/mod_proxy.h $(DESTDIR)$(includedir)
181	@cp -p $(srcdir)/modules/ssl/*.h $(DESTDIR)$(includedir)	181	@cp -p $(srcdir)/modules/ssl/*.h $(DESTDIR)$(includedir)
182	@cp -p $(srcdir)/srclib/pcre/pcre*.h $(DESTDIR)$(includedir)	182	@if test "$(AP_NEEDS_PCRE)" = "1"; then \
		183	cp -p $(srcdir)/srclib/pcre/pcre*.h $(DESTDIR)$(includedir); \
		184	fi
183	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(DESTDIR)$(includedir)	185	@cp -p $(srcdir)/os/$(OS_DIR)/*.h $(DESTDIR)$(includedir)
184	@chmod 644 $(DESTDIR)$(includedir)/*.h	186	@chmod 644 $(DESTDIR)$(includedir)/*.h
185		187
186	-- orig/acinclude.m4	188	++ mod/acinclude.m4
Lines 501-506 Link Here
501	])	501	])
502		502
503	dnl	503	dnl
		504	dnl APACHE_REGEX_CHECK
		505	dnl Check whether system's glibc provides regex.h and POSIX.2 regex
		506	dnl functions; sets AP_NEEDS_REGEX accordingly.
		507	dnl
		508	AC_DEFUN(APACHE_REGEX_CHECK,[
		509	AP_NEEDS_REGEX=1
		510	AC_CHECK_HEADER(regex.h,[
		511	AC_CHECK_FUNCS([regcomp regexec regerror regfree],[
		512	AC_DEFINE(HAVE_REGEX_H, 1, [Define to 1 if <regex.h> is available])
		513	AP_NEEDS_REGEX=0
		514	])
		515	])
		516	APACHE_SUBST(AP_NEEDS_REGEX)
		517	])
		518
		519	dnl
		520	dnl APACHE_PCRE_CHECK
		521	dnl Check whether system has PCRE library available to it. Set
		522	dnl AP_NEEDS_PCRE (and CFLAGS/LIBS) accordingly.
		523	dnl
		524	AC_DEFUN(APACHE_PCRE_CHECK,[
		525	AP_NEEDS_PCRE=1
		526
		527	AC_PATH_PROG(ap_pcre_conf, pcre-config)
		528	ap_save_CFLAGS="$CFLAGS"
		529	ap_save_LIBS="$LIBS"
		530	CFLAGS="$CFLAGS `$ap_pcre_conf --cflags 2>/dev/null`"
		531	LIBS="$LIBS `$ap_pcre_conf --libs 2>/dev/null`"
		532	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <pcre.h>]],
		533	[[char *foo = pcre_version();]])],[
		534	AP_NEEDS_PCRE=0
		535	],[
		536	CFLAGS="$ap_save_CFLAGS"
		537	LIBS="$ap_save_LIBS"
		538	])
		539
		540	APACHE_SUBST(AP_NEEDS_PCRE)
		541	])
		542
		543	dnl
504	dnl APACHE_EXPORT_ARGUMENTS	544	dnl APACHE_EXPORT_ARGUMENTS
505	dnl Export (via APACHE_SUBST) the various path-related variables that	545	dnl Export (via APACHE_SUBST) the various path-related variables that
506	dnl apache will use while generating scripts like autoconf and apxs and	546	dnl apache will use while generating scripts like autoconf and apxs and
507	-- orig/configure.in	547	++ mod/configure.in
Lines 114-123 Link Here
114	AC_PROG_CC	114	AC_PROG_CC
115	AC_PROG_CPP	115	AC_PROG_CPP
116		116
117	echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"	117	APACHE_REGEX_CHECK
		118	if test "$AP_NEEDS_REGEX" = "1"; then
		119	APACHE_PCRE_CHECK
		120	fi
118		121
119	APR_SUBDIR_CONFIG(srclib/pcre,	122	if test "$AP_NEEDS_PCRE" = "1"; then
120	[--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir])	123	echo $ac_n "${nl}Configuring PCRE regular expression library ...${nl}"
		124	APR_SUBDIR_CONFIG(srclib/pcre,
		125	[--prefix=$prefix --exec-prefix=$exec_prefix --libdir=$libdir --includedir=$includedir --bindir=$bindir])
		126	AP_BUILD_SRCLIB_DIRS="$AP_BUILD_SRCLIB_DIRS pcre"
		127	AP_CLEAN_SRCLIB_DIRS="pcre $AP_CLEAN_SRCLIB_DIRS"
		128	fi
121		129
122	echo $ac_n "${nl}Configuring Apache httpd ...${nl}"	130	echo $ac_n "${nl}Configuring Apache httpd ...${nl}"
123		131
Lines 475-481 Link Here
475	AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] )	483	AC_DEFINE_UNQUOTED(AP_SUEXEC_UMASK, 0$withval, [umask for suexec'd process] ) ] )
476		484
477	dnl AP_LIBS specifies the actual libraries. note we have some required libs.	485	dnl AP_LIBS specifies the actual libraries. note we have some required libs.
478	AP_LIBS="$abs_builddir/srclib/pcre/libpcre.la $AP_LIBS"	486	if test "$AP_NEEDS_PCRE" = "1"; then
		487	AP_LIBS="$abs_builddir/srclib/pcre/libpcre.la $AP_LIBS"
		488	fi
479		489
480	dnl APR should go after the other libs, so the right symbols can be picked up	490	dnl APR should go after the other libs, so the right symbols can be picked up
481	AP_LIBS="$AP_LIBS `$apu_config --link-libtool --libs` `$apr_config --link-libtool --libs`"	491	AP_LIBS="$AP_LIBS `$apu_config --link-libtool --libs` `$apr_config --link-libtool --libs`"
482	-- orig/include/pcreposix.h	492	++ mod/include/pcreposix.h
Lines 12-17 Link Here
12	#ifndef _PCREPOSIX_H	12	#ifndef _PCREPOSIX_H
13	#define _PCREPOSIX_H	13	#define _PCREPOSIX_H
14		14
		15	#ifdef HAVE_REGEX_H
		16	#ifdef HAVE_SYS_TYPES_H
		17	#include <sys/types.h>
		18	#endif /* HAVE_SYS_TYPES_H */
		19	#include <regex.h>
		20	#else
		21
15	/* This is the header for the POSIX wrapper interface to the PCRE Perl-	22	/* This is the header for the POSIX wrapper interface to the PCRE Perl-
16	Compatible Regular Expression library. It defines the things POSIX says should	23	Compatible Regular Expression library. It defines the things POSIX says should
17	be there. I hope. */	24	be there. I hope. */
Lines 96-99 Link Here
96	} /* extern "C" */	103	} /* extern "C" */
97	#endif	104	#endif
98		105
		106	#endif /* !HAVE_REGEX_H */
99	#endif /* End of pcreposix.h */	107	#endif /* End of pcreposix.h */
100	-- orig/srclib/Makefile.in	108	++ mod/srclib/Makefile.in
Lines 1-5 Link Here
1		1
2	SUBDIRS = pcre	2	SUBDIRS =
3	BUILD_SUBDIRS = $(AP_BUILD_SRCLIB_DIRS)	3	BUILD_SUBDIRS = $(AP_BUILD_SRCLIB_DIRS)
4	CLEAN_SUBDIRS = $(AP_CLEAN_SRCLIB_DIRS)	4	CLEAN_SUBDIRS = $(AP_CLEAN_SRCLIB_DIRS)
5		5