X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=configure.in;h=fe6a16f896343eebcd1f838a1b20f985fe5db4d7;hp=c1be3197e846cb7cb36cd15fbaf6eeec6eae4519;hb=004d0cf61c498b0309f4b3b58818114fe3330a20;hpb=d2ddfb86896d7e02d284228b01ff896d1770f511 diff --git a/configure.in b/configure.in index c1be3197..fe6a16f8 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.15 2001/09/12 17:28:59 david__schmidt Exp $ +dnl $Id: configure.in,v 1.20 2001/10/23 21:24:09 jongfoster Exp $ dnl dnl Written by and Copyright (C) 2001 the SourceForge dnl IJBSWA team. http://ijbswa.sourceforge.net @@ -28,6 +28,24 @@ 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.20 2001/10/23 21:24:09 jongfoster +dnl Support for FEATURE_CGI_EDIT_ACTIONS +dnl +dnl Revision 1.19 2001/10/07 15:33:14 oes +dnl Removed FEATURE_DENY_GZIP +dnl Bumped up version number +dnl +dnl Revision 1.18 2001/09/13 13:10:24 steudten +dnl +dnl PreWork for Debug Interface. +dnl Add new option "--with-debug" to enable debugging (flags aso.) +dnl +dnl Revision 1.17 2001/09/12 23:44:55 david__schmidt +dnl Mac OSX (Darwin) support added. +dnl +dnl Revision 1.16 2001/09/12 22:55:45 joergs +dnl AmigaOS support added. +dnl dnl Revision 1.15 2001/09/12 17:28:59 david__schmidt dnl dnl OS/2 port: update autoconf'd support for the platform. @@ -175,9 +193,10 @@ dnl ================================================================= dnl AutoConf Initialization dnl ================================================================= -AC_REVISION($Revision: 1.15 $) +AC_REVISION($Revision: 1.20 $) AC_INIT(jcc.c) AC_CONFIG_HEADER(config.h) +AC_CANONICAL_HOST dnl ================================================================= @@ -186,7 +205,7 @@ dnl ================================================================= VERSION_MAJOR=2 VERSION_MINOR=9 -VERSION_POINT=8 +VERSION_POINT=10 CODE_STATUS="\"alpha\"" dnl CODE_STATUS can be "alpha", "beta", or "stable", and will be @@ -220,6 +239,48 @@ dnl AC_PROG_MAKE_SET dnl RANLIB is for PCRE: dnl AC_PROG_RANLIB +AC_CHECK_PROG(GDB,gdb,yes,no) + +dnl ================================================================= +dnl debug, gcc and gdb support +dnl ================================================================= + +AC_ARG_WITH(debug, + [ --with-debug Enable debug mode], + [ + if test "x$withval" != "$xno" ; then + if test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then + if test "$GDB"; then + CFLAGS="-ggdb" + else + CFLAGS="-g" + fi + CFLAGS="$CFLAGS -Wshadow -Wconversion" + else + CFLAGS="-g" + fi + fi + CFLAGS="$CFLAGS -D_DEBUG" + fi + ], + [ + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi + ] +) + +dnl ================================================================= +dnl additional gcc flags +dnl ================================================================= +dnl +if test "$GCC"; then + CFLAGS="-pipe $CFLAGS" +fi + dnl ================================================================= dnl Build type @@ -275,6 +336,7 @@ else fi AC_SUBST(WIN_ONLY) + dnl Save old CFLAGS so we can restore them later, then add SPECIAL_CFLAGS old_CFLAGS_nospecial=$CFLAGS CFLAGS="$CFLAGS $SPECIAL_CFLAGS" @@ -327,12 +389,11 @@ dnl Solaris specific dnl FIXME: Not tested on Solaris yet... dnl ================================================================= -AC_CANONICAL_HOST SOCKET_LIB= case "$host" in -*-solaris*) SOCKET_LIB=-lsocket -lnsl +*-solaris*) SOCKET_LIB="-lsocket -lnsl" AC_DEFINE(__EXTENSIONS__) if test "$GCC" = "yes"; then # Set a GCC specific switch: @@ -381,6 +442,11 @@ AC_OBJEXT AC_HEADER_STDC AC_C_CONST AC_TYPE_SIZE_T +AC_CHECK_SIZEOF(int) +AC_CHECK_SIZEOF(char *) +AC_CHECK_SIZEOF(long) +AC_CHECK_SIZEOF(long long) +AC_CHECK_SIZEOF(size_t) dnl Checks for header files. dnl AC_HEADER_SYS_WAIT @@ -414,21 +480,13 @@ dnl Features dnl ================================================================= AC_ARG_ENABLE(toggle, -[ --disable-toggle Don't support temporary disable], +[ --disable-toggle Don't support temporary disable], [if test $enableval = yes; then AC_DEFINE(FEATURE_TOGGLE) fi],AC_DEFINE(FEATURE_TOGGLE)) -AC_ARG_ENABLE(gzip, -[ --disable-gzip Block gzip'ed transfer of documents. Note that - this is required if you want content modification - even with gzip-supporting servers.], -[if test $enableval = "no"; then - AC_DEFINE(FEATURE_DENY_GZIP) -fi]) - AC_ARG_ENABLE(force, -[ --disable-force Don't allow blockfile to be bypassed], +[ --disable-force Don't allow single-page disable], [if test $enableval = yes; then AC_DEFINE(FEATURE_FORCE_LOAD) fi],AC_DEFINE(FEATURE_FORCE_LOAD)) @@ -440,77 +498,85 @@ AC_ARG_ENABLE(fast-redirects, fi], AC_DEFINE(FEATURE_FAST_REDIRECTS)) AC_ARG_ENABLE(killpopup, -[ --disable-killpopup Never block popups], +[ --disable-killpopup Never block popups], [if test $enableval = yes; then AC_DEFINE(FEATURE_KILL_POPUPS) fi],AC_DEFINE(FEATURE_KILL_POPUPS)) AC_ARG_ENABLE(stats, -[ --disable-stats Don't keep statistics], +[ --disable-stats Don't keep statistics], [if test $enableval = yes; then AC_DEFINE(FEATURE_STATISTICS) fi],AC_DEFINE(FEATURE_STATISTICS)) AC_ARG_ENABLE(ie-images, -[ --disable-ie-images Don't auto-detect whether a request from MS Internet - Explorer is for an image or HTML.], +[ --disable-ie-images Don't auto-detect whether a request from MS Internet + Explorer is for an image or HTML.], [if test $enableval = yes; then AC_DEFINE(FEATURE_IMAGE_DETECT_MSIE) fi], AC_DEFINE(FEATURE_IMAGE_DETECT_MSIE)) AC_ARG_ENABLE(image-blocking, -[ --disable-image-blocking Don't try to figure out whether a request is - for an image or HTML - assume HTML.], +[ --disable-image-blocking Don't try to figure out whether a request is + for an image or HTML - assume HTML.], [if test $enableval = yes; then AC_DEFINE(FEATURE_IMAGE_BLOCKING) fi], AC_DEFINE(FEATURE_IMAGE_BLOCKING)) AC_ARG_ENABLE(acl-files, -[ --disable-acl-files Prevents the use of ACL files to control access to - the proxy by IP address.], +[ --disable-acl-files Prevents the use of ACL files to control access to + the proxy by IP address.], [if test $enableval = yes; then AC_DEFINE(FEATURE_ACL) fi], AC_DEFINE(FEATURE_ACL)) AC_ARG_ENABLE(trust-files, -[ --disable-trust-files Prevents the use of trust files.], +[ --disable-trust-files Prevents the use of trust files.], [if test $enableval = yes; then AC_DEFINE(FEATURE_TRUST) fi], AC_DEFINE(FEATURE_TRUST)) AC_ARG_ENABLE(jar-files, -[ --disable-jar-files Prevents the use of jar files to capture cookies.], +[ --disable-jar-files Prevents the use of jar files to capture cookies.], [if test $enableval = yes; then AC_DEFINE(FEATURE_COOKIE_JAR) fi], AC_DEFINE(FEATURE_COOKIE_JAR)) +AC_ARG_ENABLE(editor, +[ --disable-editor Prevents the use of the web-based actions file + editor and web-based temporary disable setting.], +[if test $enableval = yes; then + AC_DEFINE(FEATURE_CGI_EDIT_ACTIONS) +fi], +AC_DEFINE(FEATURE_CGI_EDIT_ACTIONS)) + 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)], +[ --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], +[ --disable-dynamic-pcre Use the built-in, static pcre, even if + libpcre is available], [ if test $enableval = "no"; then have_pcre=no; fi ]) AC_ARG_ENABLE(dynamic-pcrs, -[ --disable-dynamic-pcrs Use the built-in, static pcrs, even if - libpcrs is available], +[ --disable-dynamic-pcrs Use the built-in, static pcrs, even if + libpcrs is available], [ if test $enableval = "no"; then have_pcrs=no; fi ])