X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=configure.in;h=50c4d02e56b86749379935b9ec903289864cd271;hp=8af5168eadd2bc1bf65e65e603b388d72b6fde37;hb=114c72fda4a6df07cd8a067a8fbafacaa3730c71;hpb=f1e2c29716cbf36ba082b25fd1b097b1065b109a diff --git a/configure.in b/configure.in index 8af5168e..50c4d02e 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.71 2002/06/04 14:51:49 jongfoster Exp $ +dnl $Id: configure.in,v 1.76 2002/09/05 14:52:17 oes Exp $ dnl dnl Written by and Copyright (C) 2001, 2002 the SourceForge dnl Privoxy team. http://www.privoxy.org/ @@ -28,6 +28,26 @@ 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.76 2002/09/05 14:52:17 oes +dnl Synced in some changes fromm the stable branch: +dnl Fixed detection/inclusion of pcre.h, which is in a pcre subdir on RH +dnl +dnl Revision 1.75 2002/09/04 12:19:33 oes +dnl Resurrected acconfig.h and removed double quotes from AC_DEFINE params to enable build on older systems +dnl +dnl Revision 1.74 2002/09/03 17:31:33 oes +dnl Added workaround for very strange behaviour of AC_PROG_CC, which sets CFLAGS to -g -O2 if empty +dnl +dnl Revision 1.73 2002/06/05 00:26:21 hal9 +dnl Move all doc build stuff to doc/source/GNUmakefile, leaving a 'make dok' +dnl target only in toplevel. Add DOC_STATUS variable so docs can be built without +dnl touching sgml source. +dnl +dnl Revision 1.72 2002/06/04 15:52:25 jongfoster +dnl Removing need for acconfig.h (apparently using acconfig.h is an +dnl obsolete coding style). +dnl Moving the DocBook stuff together +dnl dnl Revision 1.71 2002/06/04 14:51:49 jongfoster dnl Updating for new paths: dnl - Source files in src/ @@ -384,7 +404,7 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.71 $) +AC_REVISION($Revision: 1.76 $) AC_INIT(src/jcc.c) if test ! -f src/config.h.in; then @@ -438,6 +458,10 @@ AC_DEFINE_UNQUOTED(CODE_STATUS,"${CODE_STATUS}", dnl ================================================================= dnl Checks for programs needed to build. dnl ================================================================= + +dnl Keep AC_PROG_CC from setting its own defaults: +CFLAGS=" " + AC_PROG_CC AC_PROG_CPP AC_PROG_INSTALL @@ -605,17 +629,10 @@ if test $have_pthread = yes; then if test "$GCC" = "yes"; then # Set a GCC specific switch: if test "$target_type" = "unix"; then - ac_jgf_save_CFLAGS=$CFLAGS - CFLAGS="$CFLAGS -pthread" - AC_TRY_LINK([#include ], - [void *p = pthread_create;], - [ - # This compiler switch makes GCC on Linux thread-safe - # However, it's not supported on most other OS. - PTHREAD_LIB= - SPECIAL_CFLAGS="-pthread" - ]) - CFLAGS=$ac_jgf_save_CFLAGS + # This compiler switch makes GCC on Linux thread-safe + # However, it's not supported on most other OS. + PTHREAD_LIB= + SPECIAL_CFLAGS="-pthread" fi fi else @@ -883,10 +900,27 @@ 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(pcrs, pcrs_compile, [AC_CHECK_HEADER(pcrs.h, [have_pcrs=yes], [have_pcrs=no])], [have_pcrs=no]) - +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_DEFINE(PCRE_H_IN_SUBDIR)], [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]; [AC_DEFINE(PCREPOSIX_H_IN_SUBDIR)]) + ], [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], -lpcre) dnl ================================================================= dnl Always defined @@ -955,31 +989,31 @@ AC_ARG_ENABLE(ie-images, if test $enableval2 = yes; then AC_DEFINE(FEATURE_IMAGE_DETECT_MSIE,1, [ Detect image requests automatically for MSIE. Will fall back to - other image-detection methods (i.e. "+image" action) for other + other image-detection methods (i.e. ´´+image´´ action) for other browsers. You must also define FEATURE_IMAGE_BLOCKING to use this feature. It detects the following header pair as an image request: - "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)", - "Accept: * / *". + ´´User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)´´, + ´´Accept: * / *´´. And the following as a HTML request: - "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0)", - "Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, * / *". + User-Agent: Mozilla/4.0 (compatible; MSIE 5.5; Windows NT 5.0), + Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, * / *. And no, I haven't got that backwards - IE is being wierd. Known limitations: 1) If you press shift-reload on a blocked HTML page, you get - the image "blocked" page, not the HTML "blocked" page. - 2) Once an image "blocked" page has been sent, viewing it + the image blocked page, not the HTML ´´blocked´´ page. + 2) Once an image ´´blocked´´ page has been sent, viewing it in it's own browser window *should* bring up the HTML - "blocked" page, but it doesn't. You need to clear the + ´´blocked´´ page, but it doesn't. You need to clear the browser cache to get the HTML version again. These limitations are due to IE making inconsistent choices - about which "Accept:" header to send. ]) + about which ´´Accept:´´ header to send. ]) fi AC_ARG_ENABLE(image-blocking, @@ -1102,92 +1136,6 @@ fi AC_SUBST(STATIC_PCRE_ONLY) AC_SUBST(STATIC_PCRS_ONLY) -dnl ================================================================= -dnl config.h Header/footer -dnl ================================================================= - -AH_TOP( -[#ifndef CONFIG_H_INCLUDED -#define CONFIG_H_INCLUDED - -/********************************************************************* - * - * File : config.h - * - * Purpose : This file should be the first thing included in every - * .c file. (Before even system headers). It contains - * #define statements for various features. It was - * introduced because the compile command line started - * getting ludicrously long with feature defines. - * - * Copyright : Written by and Copyright (C) 2001 the SourceForge - * Privoxy team. http://www.privoxy.org/ - * - * This program is free software; you can redistribute it - * and/or modify it under the terms of the GNU General - * Public License as published by the Free Software - * Foundation; either version 2 of the License, or (at - * your option) any later version. - * - * This program is distributed in the hope that it will - * be useful, but WITHOUT ANY WARRANTY; without even the - * implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU General Public - * License for more details. - * - * The GNU General Public License should be included with - * this file. If not, you can view it at - * http://www.gnu.org/copyleft/gpl.html - * or write to the Free Software Foundation, Inc., 59 - * Temple Place - Suite 330, Boston, MA 02111-1307, USA. - * - *********************************************************************/ - - -/* - * It's too easy to accidentally use a Cygwin or MinGW32 version of config.h - * under VC++, and it usually gives many wierd error messages. Let's make - * the error messages understandable, by bailing out now. - */ -#ifdef _MSC_VER -#error For MS VC++, please use vc_config_winthreads.h or vc_config_pthreads.h. You can usually do this by selecting the "Build", "Clean" menu option. -#endif /* def _MSC_VER */ - -]) - -AH_BOTTOM( -[ - -/* - * Defined always. - * FIXME: Don't know what it does or why we need it. - * (presumably something to do with ANSI Standard C?) - */ -#ifndef __STDC__ -#define __STDC__ 1 -#endif /* ndef __STDC__ */ - -/* - * Need to set up this define only for the Pthreads library for - * Win32, available from http://sources.redhat.com/pthreads-win32/ - */ -#if defined(FEATURE_PTHREAD) && defined(_WIN32) -#define __CLEANUP_C -#endif /* defined(FEATURE_PTHREAD) && defined(_WIN32) */ - -/* - * BEOS does not currently support POSIX threads. - * This *should* be detected by ./configure, but let's be sure. - */ -#if defined(FEATURE_PTHREAD) && defined(__BEOS__) -#error BEOS does not support pthread - please run ./configure again with "--disable-pthread" - -#endif /* defined(FEATURE_PTHREAD) && defined(__BEOS__) */ - - -#endif /* CONFIG_H_INCLUDED */ -]) - dnl ================================================================= dnl DocBook stuff dnl ================================================================= @@ -1264,6 +1212,19 @@ dnl Check for man2html for docs. AC_CHECK_PROGS(MAN2HTML,man2html,false) AC_SUBST(MAN2HTML) +dnl Set doc status, used for conditional content inclusions +DOC_STATUS="" +if test $CODE_STATUS = alpha; then + DOC_STATUS="-ip-alpha -ip-not-stable" +fi +if test $CODE_STATUS = beta; then + DOC_STATUS="-ip-beta -ip-not-stable" +fi +if test $CODE_STATUS = stable; then + DOC_STATUS="-ip-stable" +fi +echo "checking for doc status flags... $DOC_STATUS" +AC_SUBST(DOC_STATUS) dnl ================================================================= dnl RPM stuff @@ -1291,4 +1252,4 @@ AC_SUBST(SPECIAL_CFLAGS) AC_SUBST(PTHREAD_LIB) -AC_OUTPUT(GNUmakefile doc/source/ldp.dsl) +AC_OUTPUT(GNUmakefile doc/source/ldp.dsl doc/source/GNUmakefile)