X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=configure.in;h=6e629ff10d7db80e732493ae74e5a980ffa4fbb0;hp=3259d775f3e819f9409f56afb220b1034f7f5c18;hb=e8b4f286757813a2a30dcc277b283b485a22ff44;hpb=0e1b13f3c38b2b8fc5dc675361db629ebb4ed421 diff --git a/configure.in b/configure.in index 3259d775..6e629ff1 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.54 2002/04/01 00:54:24 gliptak Exp $ +dnl $Id: configure.in,v 1.66 2002/05/03 00:41:56 oes Exp $ dnl dnl Written by and Copyright (C) 2001, 2002 the SourceForge dnl Privoxy team. http://www.privoxy.org/ @@ -28,6 +28,50 @@ 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.66 2002/05/03 00:41:56 oes +dnl Set version to 2.9.15 to comply with new versioning scheme +dnl +dnl Revision 1.65 2002/04/25 19:13:57 morcego +dnl Removed RPM release number declaration on configure.in +dnl Changed makefile to use given value for RPM_PACKAGEV when on uploading +dnl targets (will produce an error, explaining who to do it, if no value +dnl if provided). +dnl +dnl Revision 1.64 2002/04/22 16:32:31 morcego +dnl configure.in, *.spec: Bumping release to 2 (2.9.14-2) +dnl -rh.spec: uid and gid are now macros +dnl -suse.spec: Changing the header Copyright to License (Copyright is +dnl deprecable) +dnl +dnl Revision 1.63 2002/04/11 11:00:21 oes +dnl Applied Moritz' fix for socklen_t on Solaris +dnl +dnl Revision 1.62 2002/04/11 10:09:20 oes +dnl Version 2.9.14 +dnl +dnl Revision 1.61 2002/04/10 18:14:45 morcego +dnl - (privoxy-rh.spec only) Relisting template files on the %%files section +dnl - (configure.in, privoxy-rh.spec) Bumped package release to 5 +dnl +dnl Revision 1.60 2002/04/09 16:38:49 oes +dnl Added detection of missing config.h.in +dnl +dnl Revision 1.59 2002/04/06 20:23:55 jongfoster +dnl Removing unnessacery tests (C++, ranlib) +dnl +dnl Revision 1.58 2002/04/04 20:49:20 swa +dnl attempt to consolidate the +dnl different dokbook versions. +dnl +dnl Revision 1.57 2002/04/04 00:36:36 gliptak +dnl always use pcre for matching +dnl +dnl Revision 1.56 2002/04/03 22:28:03 gliptak +dnl Removed references to gnu_regex +dnl +dnl Revision 1.55 2002/04/03 03:54:38 gliptak +dnl Checking pcre version +dnl dnl Revision 1.54 2002/04/01 00:54:24 gliptak dnl More changes needed around regex support. dnl @@ -318,8 +362,20 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.54 $) +AC_REVISION($Revision: 1.66 $) AC_INIT(jcc.c) + +if test ! -f config.h.in; then + echo "You need to run autoheader first. " + echo -n "Shall I do this for you now? (y/n) " + read answer + if test $answer != "y"; then + exit 1 + else + autoheader + fi +fi + AC_CONFIG_HEADER([config.h]) AC_CANONICAL_HOST @@ -352,8 +408,7 @@ dnl ================================================================= VERSION_MAJOR=2 VERSION_MINOR=9 -VERSION_POINT=13 -VERSION_RPM_PACKAGE=3 +VERSION_POINT=15 CODE_STATUS="beta" dnl CODE_STATUS can be "alpha", "beta", or "stable", and will be @@ -366,14 +421,12 @@ dnl ================================================================= AC_SUBST(VERSION_MAJOR) AC_SUBST(VERSION_MINOR) AC_SUBST(VERSION_POINT) -AC_SUBST(VERSION_RPM_PACKAGE) AC_SUBST(CODE_STATUS) dnl AC_DEFINE_UNQUOTED(VERSION_MAJOR,${VERSION_MAJOR}) AC_DEFINE_UNQUOTED(VERSION_MINOR,${VERSION_MINOR}) AC_DEFINE_UNQUOTED(VERSION_POINT,${VERSION_POINT}) -AC_DEFINE_UNQUOTED(VERSION_RPM_PACKAGE,${VERSION_RPM_PACKAGE}) AC_DEFINE_UNQUOTED(VERSION,"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_POINT}") AC_DEFINE_UNQUOTED(CODE_STATUS,"${CODE_STATUS}") @@ -382,12 +435,9 @@ dnl Checks for programs needed to build. dnl ================================================================= AC_PROG_CC AC_PROG_CPP -AC_PROG_CXX AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -dnl RANLIB is for PCRE: -AC_PROG_RANLIB AC_CHECK_PROG(GDB,gdb,yes,no) @@ -563,6 +613,7 @@ AC_SUBST(MAN2HTML) dnl Checking for the docbook.dsl stylesheet file dnl It is still not portable (directory slash) +JADECAT="" if test $dodk = yes; then if test $DKPREFIX = none; then for i in /usr/share/sgml/docbook/dsssl-stylesheets /usr/share/sgml/docbkdsl /usr/share/sgml/docbook-dsssl; do @@ -575,8 +626,19 @@ if test $dodk = yes; then echo "no" fi done +# where are the catalogs? + for i in /usr/share/sgml/CATALOG.docbk30 /usr/share/sgml/CATALOG.docbk31; do + echo -n "checking for $i..." + if test -f $i; then + echo "yes" + JADECAT="$JADECAT -c $i" + else + echo "no" + fi + done fi fi +AC_SUBST(JADECAT) AC_SUBST(DKPREFIX) dnl Save old CFLAGS so we can restore them later, then add SPECIAL_CFLAGS @@ -759,6 +821,10 @@ AC_CHECK_FUNC(localtime_r, [ dnl ================================================================= dnl Solaris specific dnl FIXME: Not tested on Solaris yet... +dnl ISFIXED: Have tested it on Solaris, but there are other ways to +dnl make these checks generic, e.g.: +dnl AC_CHECK_FUNC(getsockopt, , AC_CHECK_LIB(socket, getsockopt)) +dnl (Moritz Barsnick ) dnl ================================================================= @@ -781,6 +847,17 @@ esac AC_SUBST(SOCKET_LIB) +dnl ================================================================= +dnl Solaris problem, and others perhaps (socklen_t is undefined) +dnl ================================================================= + +AC_MSG_CHECKING([for socklen_t]) +AC_EGREP_HEADER(socklen_t, sys/socket.h, AC_MSG_RESULT([yes]), + AC_MSG_RESULT([no]) + AC_DEFINE(socklen_t,int, + [ Define to 'int' if doesn't have it. ])) + + dnl ================================================================= dnl OS/2 specific dnl ================================================================= @@ -962,16 +1039,6 @@ dnl pcre/pcrs is needed for CGI anyway, so dnl the choice is only between static and dnl dynamic: -AC_ARG_ENABLE(regex-matching, -[ --enable-regex-matching=pcre Use perl-compatible regex for actionsfile - pattern matching (default) - --enable-regex-matching=gnu Use gnu style regex for actionsfile pattern - matching (-> bigger binary) - --disable-regex-matching Don't use regex matching, compare URL - prefix instead (won't shrink birary)], -[ regex_matching=$enableval ], -[ regex_matching=pcre ]) - AC_ARG_ENABLE(dynamic-pcre, [ --disable-dynamic-pcre Use the built-in, static pcre, even if libpcre is available], @@ -983,24 +1050,15 @@ AC_ARG_ENABLE(dynamic-pcrs, [ if test $enableval = "no"; then have_pcrs=no; fi ]) -# Is the regex URL matching based on libpcreposix, but we -# don't have that library? -# -if test $have_pcreposix = "yes" -o $regex_matching != "pcre"; then - dont_miss_pcreposix=yes -else - dont_miss_pcreposix=no -fi - # If we have libpcre and either we also have pcreposix or # we don't need pcreposix, then link pcre dynamically; else # build it and link statically # -if test $have_pcre = "yes" -a $dont_miss_pcreposix = "yes"; then +if test $have_pcre = "yes"; then echo "using libpcre" pcre_dyn=yes STATIC_PCRE_ONLY=# - LIBS="$LIBS -lpcre" + LIBS="$LIBS -lpcre -lpcreposix" else echo "using built-in static pcre" pcre_dyn=no @@ -1022,30 +1080,6 @@ else STATIC_PCRS_ONLY= fi -# Which method should be used for URL matching? -# pcre, gnu regex or prefix matching? -# -if test $regex_matching = "gnu"; then - echo "using gnu regex for URL matching" - AC_DEFINE(REGEX_GNU) - GNU_REGEX_ONLY= - PCRE_REGEX_ONLY=# -elif test $regex_matching = "pcre"; then - echo "using pcre regex for URL matching" - AC_DEFINE(REGEX_PCRE) - GNU_REGEX_ONLY=# - PCRE_REGEX_ONLY= - if test $pcre_dyn = "yes"; then - LIBS="$LIBS -lpcreposix" - fi -else - echo -e "using prefix matching for URLs\nHint: This does NOT make the executable any smaller!" - GNU_REGEX_ONLY=# - PCRE_REGEX_ONLY=# -fi - -AC_SUBST(GNU_REGEX_ONLY) -AC_SUBST(PCRE_REGEX_ONLY) AC_SUBST(STATIC_PCRE_ONLY) AC_SUBST(STATIC_PCRS_ONLY) @@ -1060,4 +1094,4 @@ AC_SUBST(SPECIAL_CFLAGS) AC_SUBST(PTHREAD_LIB) -AC_OUTPUT(GNUmakefile) +AC_OUTPUT(GNUmakefile doc/source/ldp.dsl)