From: oes Date: Tue, 6 Aug 2002 11:29:36 +0000 (+0000) Subject: Fixed detection/inclusion of pcre.h, which is in a pcre subdir on RH X-Git-Tag: v_2_9_18~15 X-Git-Url: http://www.privoxy.org/gitweb/trouble.html?a=commitdiff_plain;h=974ef6465cbc6ad6fab50071cb0b9519e7e0f2ae;p=privoxy.git Fixed detection/inclusion of pcre.h, which is in a pcre subdir on RH --- diff --git a/GNUmakefile.in b/GNUmakefile.in index 018d73f1..4bdf5404 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -1,6 +1,6 @@ # Note: Makefile is built automatically from Makefile.in # -# $Id: GNUmakefile.in,v 1.104.2.10 2002/07/27 22:56:53 kick_ Exp $ +# $Id: GNUmakefile.in,v 1.104.2.11 2002/07/30 19:38:11 hal9 Exp $ # # Written by and Copyright (C) 2001 the SourceForge # Privoxy team. http://www.privoxy.org/ @@ -197,8 +197,7 @@ SPECIAL_CFLAGS = @SPECIAL_CFLAGS@ # Add your flags here OTHER_CFLAGS = -CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall \ - @STATIC_PCRE_ONLY@ -Ipcre +CFLAGS = @CFLAGS@ @CPPFLAGS@ $(OTHER_CFLAGS) $(SPECIAL_CFLAGS) -Wall -Ipcre LDFLAGS = $(DEBUG_CFLAGS) $(SPECIAL_CFLAGS) @@ -979,6 +978,11 @@ coffee: ## end: # $Log: GNUmakefile.in,v $ +# Revision 1.104.2.11 2002/07/30 19:38:11 hal9 +# Add redhat-test target for testing purposes only. Fix RPM_PACKAGEV to what +# *I think* it was supposed to be (was breaking upload targets since it was +# set to RPM_VERSION). +# # Revision 1.104.2.10 2002/07/27 22:56:53 kick_ # cleanups of the redhat-srpm target # diff --git a/configure.in b/configure.in index 41a474be..d5d70a3b 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. dnl -dnl $Id: configure.in,v 1.68.2.1 2002/07/26 15:21:12 oes Exp $ +dnl $Id: configure.in,v 1.68.2.2 2002/07/30 19:36:09 hal9 Exp $ dnl dnl Written by and Copyright (C) 2001, 2002 the SourceForge dnl Privoxy team. http://www.privoxy.org/ @@ -28,6 +28,9 @@ dnl or write to the Free Software Foundation, Inc., 59 dnl Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl dnl $Log: configure.in,v $ +dnl Revision 1.68.2.2 2002/07/30 19:36:09 hal9 +dnl Bump version to 2.9.17. +dnl dnl Revision 1.68.2.1 2002/07/26 15:21:12 oes dnl Bumped version number for 2.9.16 freeze dnl @@ -373,7 +376,7 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.68.2.1 $) +AC_REVISION($Revision: 1.68.2.2 $) AC_INIT(jcc.c) if test ! -f config.h.in; then @@ -419,7 +422,7 @@ dnl ================================================================= VERSION_MAJOR=2 VERSION_MINOR=9 -VERSION_POINT=17 +VERSION_POINT=18 CODE_STATUS="beta" dnl CODE_STATUS can be "alpha", "beta", or "stable", and will be @@ -960,8 +963,10 @@ dnl ================================================================= dnl Note: Some systems may have the library but not the system header dnl file, so we must check for both. dnl Also check for correct version -AC_CHECK_LIB(pcre, pcre_compile, [AC_CHECK_HEADER(pcre.h, [AC_EGREP_HEADER(pcre_fullinfo, pcre.h, [have_pcre=yes], [AC_MSG_WARN([[pcre old version installed]]); have_pcre=no])], [have_pcre=no])], [have_pcre=no]) -AC_CHECK_LIB(pcreposix, regcomp, [AC_CHECK_HEADER(pcreposix.h, [AC_EGREP_HEADER(pcreposix_regerror, pcreposix.h, [AC_MSG_WARN([[pcreposix old version installed]]); have_pcreposix=no], [have_pcreposix=yes])], [have_pcreposix=no])], [have_pcreposix=no], -lpcre) +AC_CHECK_LIB(pcre, pcre_compile, [AC_CHECK_HEADER(pcre.h, [AC_EGREP_HEADER(pcre_fullinfo, pcre.h, [have_pcre=yes], [AC_MSG_WARN([[pcre old version installed]]); have_pcre=no])], [AC_CHECK_HEADER(pcre/pcre.h, [AC_EGREP_HEADER(pcre_fullinfo, pcre/pcre.h, [have_pcre=yes], [AC_MSG_WARN([[pcre old version installed]]); have_pcre=no])], [have_pcre=no])])], [have_pcre=no]) + +AC_CHECK_LIB(pcreposix, regcomp, [AC_CHECK_HEADER(pcreposix.h, [AC_EGREP_HEADER(pcreposix_regerror, pcreposix.h, [AC_MSG_WARN([[pcreposix old version installed]]); have_pcreposix=no], [have_pcreposix=yes])], [AC_CHECK_HEADER(pcre/pcreposix.h, [AC_EGREP_HEADER(pcreposix_regerror, pcre/pcreposix.h, [AC_MSG_WARN([[pcreposix old version installed]]); have_pcreposix=no], [have_pcreposix=yes])], [have_pcreposix=no])])], [have_pcreposix=no], -lpcre) + AC_CHECK_LIB(pcrs, pcrs_compile, [AC_CHECK_HEADER(pcrs.h, [have_pcrs=yes], [have_pcrs=no])], [have_pcrs=no])