dnl Process this file with autoconf to produce a configure script.
dnl
-dnl $Id: configure.in,v 1.17 2001/09/12 23:44:55 david__schmidt Exp $
+dnl $Id: configure.in,v 1.28 2002/02/27 15:02:38 oes Exp $
dnl
dnl Written by and Copyright (C) 2001 the SourceForge
dnl IJBSWA team. http://ijbswa.sourceforge.net
dnl Temple Place - Suite 330, Boston, MA 02111-1307, USA.
dnl
dnl $Log: configure.in,v $
+dnl Revision 1.28 2002/02/27 15:02:38 oes
+dnl Incremented version number
+dnl
+dnl Revision 1.27 2002/01/10 12:35:18 oes
+dnl Added cross-compile defaults to the AC_CHECK_SIZEOF macros
+dnl to silence autoconf warnings. Numbers are for Intel/Linux.
+dnl Is there a better way?
+dnl
+dnl Revision 1.26 2002/01/09 14:29:49 oes
+dnl - Added AC_CHECK_FUNC tests for the availability of
+dnl gethostbyname_r, gethostbyaddr_r, gmtime_r and
+dnl localtime_r, as well as AC_TRY_COMPILE tests to
+dnl determine their signatures.
+dnl
+dnl - Fixed a bug with the init of CFLAGS that was
+dnl reported by barsnick
+dnl
+dnl Revision 1.25 2002/01/04 15:27:18 oes
+dnl Changed quoting of CODE_STATUS for use in make
+dnl
+dnl Revision 1.24 2001/12/30 14:07:31 steudten
+dnl - Add signal handling (unix)
+dnl - Add SIGHUP handler (unix)
+dnl - Add creation of pidfile (unix)
+dnl - Add action 'top' in rc file (RH)
+dnl - Add entry 'SIGNALS' to manpage
+dnl - Add exit message to logfile (unix)
+dnl
+dnl Revision 1.23 2001/12/09 20:24:42 david__schmidt
+dnl Change from "alpha" to "beta" in configure.in
+dnl
+dnl Revision 1.22 2001/12/01 11:24:01 jongfoster
+dnl Renaming Makefile.in to GNUmakefile.in so that non-GNU versions of
+dnl make break in a more obvious way.
+dnl
+dnl Revision 1.21 2001/11/30 21:35:54 jongfoster
+dnl Bumping version number to 2.9.10
+dnl
+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 AutoConf Initialization
dnl =================================================================
-AC_REVISION($Revision: 1.17 $)
+AC_REVISION($Revision: 1.28 $)
AC_INIT(jcc.c)
AC_CONFIG_HEADER(config.h)
AC_CANONICAL_HOST
VERSION_MAJOR=2
VERSION_MINOR=9
-VERSION_POINT=8
-CODE_STATUS="\"alpha\""
+VERSION_POINT=11
+CODE_STATUS="beta"
dnl CODE_STATUS can be "alpha", "beta", or "stable", and will be
dnl used for CGI output
AC_SUBST(VERSION_MAJOR)
AC_SUBST(VERSION_MINOR)
AC_SUBST(VERSION_POINT)
+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,"${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_POINT}")
-AC_DEFINE_UNQUOTED(CODE_STATUS,${CODE_STATUS})
+AC_DEFINE_UNQUOTED(CODE_STATUS,"${CODE_STATUS}")
+dnl =================================================================
+dnl pid file only for unix
+dnl =================================================================
+dnl
+PID_FILE_PATH="\"/etc/junkbuster"\"
dnl =================================================================
dnl Checks for programs needed to build.
dnl =================================================================
AC_ARG_WITH(debug,
- [ --with-debug Enable debug mode],
+ [ --with-debug Enable debug mode],
[
if test "x$withval" != "$xno" ; then
if test $ac_cv_prog_cc_g = yes; then
fi
],
[
- if test "$GCC" = yes; then
- CFLAGS="-O2"
- else
- CFLAGS=
+ if test "X$CFLAGS" = "X"; then # if CFLAGS are unset
+ if test "$GCC" = yes; then
+ CFLAGS="-O2"
+ else
+ CFLAGS=
+ fi
fi
]
)
AC_SUBST(PTHREAD_ONLY)
+dnl =================================================================
+dnl Support for thread-safe versions of gethostbyaddr, gethostbyname,
+dnl gmtime and localtime
+dnl =================================================================
+
+dnl Next line needed to find the gethost*_r functions on Solaris
+AC_CHECK_LIB(nsl, gethostbyname)
+
+AC_CHECK_FUNC(gethostbyaddr_r, [
+ AC_MSG_CHECKING([signature of gethostbyaddr_r])
+ AC_TRY_COMPILE([
+# include <netdb.h>
+ ], [
+ struct hostent *h, *hp;
+ char *a, *b;
+ int l, bl, t, e;
+ (void) gethostbyaddr_r(a, l, t, h, b, bl, &hp, &e)
+ ], [
+ AC_DEFINE(HAVE_GETHOSTBYADDR_R_8_ARGS)
+ AC_MSG_RESULT([8 args])
+ ], [
+ AC_TRY_COMPILE([
+# include <netdb.h>
+ ], [
+ struct hostent *h;
+ char *a, *b;
+ int l, bl, t, e;
+ (void) gethostbyaddr_r(a, l, t, h, b, bl, &e)
+ ], [
+ AC_DEFINE(HAVE_GETHOSTBYADDR_R_7_ARGS)
+ AC_MSG_RESULT([7 args])
+ ], [
+ AC_TRY_COMPILE([
+# include <netdb.h>
+ ], [
+ struct hostent_data *d;
+ struct hostent *h;
+ char a,
+ int l, t;
+ (void) gethostbyaddr_r(a, l, t, h, d)
+ ], [
+ AC_DEFINE(HAVE_GETHOSTBYADDR_R_5_ARGS)
+ AC_MSG_RESULT([5 args])
+ ], [
+ AC_MSG_RESULT(unrecognised)
+ ])
+ ])
+ ])
+], [
+ AC_MSG_RESULT(no)
+])
+
+AC_CHECK_FUNC(gethostbyname_r, [
+ AC_MSG_CHECKING([signature of gethostbyname_r])
+ AC_TRY_COMPILE([
+# include <netdb.h>
+ ], [
+ struct hostent *h, *r;
+ char *n, *b;
+ int bl, e;
+ (void) gethostbyname_r(n, h, b, bl, &r, &e)
+ ], [
+ AC_DEFINE(HAVE_GETHOSTBYNAME_R_6_ARGS)
+ AC_MSG_RESULT([6 args])
+ ], [
+ AC_TRY_COMPILE([
+# include <netdb.h>
+ ], [
+ struct hostent *h;
+ char *n, *b;
+ int bl, e;
+ (void) gethostbyname_r(n, h, b, bl, &e)
+ ], [
+ AC_DEFINE(HAVE_GETHOSTBYNAME_R_5_ARGS)
+ AC_MSG_RESULT([5 args])
+ ], [
+ AC_TRY_COMPILE([
+# include <netdb.h>
+ ], [
+ struct hostent_data *d;
+ struct hostent *h;
+ char *n,
+ (void) gethostbyname_r(n, h, d)
+ ], [
+ AC_DEFINE(HAVE_GETHOSTBYNAME_R_3_ARGS)
+ AC_MSG_RESULT([3 args])
+ ], [
+ AC_MSG_RESULT(unrecognised)
+ ])
+ ])
+ ])
+], [
+ AC_MSG_RESULT(no)
+])
+
+AC_CHECK_FUNC(gmtime_r, [
+ AC_MSG_CHECKING([signature of gmtime_r])
+ AC_TRY_COMPILE([
+# include <time.h>
+ ], [
+ struct time *t;
+ struct tm *tm;
+ (void) gmtime_r(t, tm)
+ ], [
+ AC_MSG_RESULT(ok)
+ AC_DEFINE(HAVE_GMTIME_R)
+ ], [
+ AC_MSG_RESULT(unrecognised)
+ ])
+], [
+ AC_MSG_RESULT(no)
+])
+
+AC_CHECK_FUNC(localtime_r, [
+ AC_MSG_CHECKING([signature of localtime_r])
+ AC_TRY_COMPILE([
+# include <time.h>
+ ], [
+ struct time *t;
+ struct tm *tm;
+ (void) localtime_r(t, tm)
+ ], [
+ AC_MSG_RESULT(ok)
+ AC_DEFINE(HAVE_LOCALTIME_R)
+ ], [
+ AC_MSG_RESULT(unrecognised)
+ ])
+], [
+ AC_MSG_RESULT(no)
+])
dnl =================================================================
dnl Solaris specific
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)
+AC_CHECK_SIZEOF(int, 4)
+AC_CHECK_SIZEOF(char *, 4)
+AC_CHECK_SIZEOF(long, 4)
+AC_CHECK_SIZEOF(long long, 8)
+AC_CHECK_SIZEOF(size_t, 4)
dnl Checks for header files.
dnl AC_HEADER_SYS_WAIT
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))
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 ])
CFLAGS=$old_CFLAGS_nospecial
AC_SUBST(SPECIAL_CFLAGS)
+AC_SUBST(PID_FILE_PATH)
+AC_DEFINE_UNQUOTED(PID_FILE_PATH,${PID_FILE_PATH})
+
AC_SUBST(PTHREAD_LIB)
-AC_OUTPUT(Makefile)
+AC_OUTPUT(GNUmakefile)
projects / privoxy.git / blobdiff