Fixing Solaris build (I hope) and tidying up #defines:

- All feature #defines are now of the form FEATURE_xxx
- Permanently turned off WIN_GUI_EDIT
- Permanently turned on WEBDAV and SPLIT_PROXY_ARGS

diff --git a/configure.in b/configure.in
index 89f1c1a..172168d 100644 (file)
--- 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.12 2001/07/25 19:16:27 oes Exp $
+dnl $Id: configure.in,v 1.13 2001/07/29 17:09:17 jongfoster Exp $
 dnl 
 dnl Written by and Copyright (C) 2001 the SourceForge
 dnl IJBSWA team.  http://ijbswa.sourceforge.net
@@ -28,6 +28,13 @@ 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.13  2001/07/29 17:09:17  jongfoster
+dnl Major changes to build system in order to fix these bugs:
+dnl - pthreads under Linux was broken - changed -lpthread to -pthread
+dnl - Compiling in MinGW32 mode under CygWin now correctly detects
+dnl   which shared libraries are available
+dnl - Solaris support (?) (Not tested under Solaris yet)
+dnl
 dnl Revision 1.12  2001/07/25 19:16:27  oes
 dnl Bumping version number to 2.9.8
 dnl
@@ -158,7 +165,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
-AC_REVISION($Revision: 1.11 $)
+AC_REVISION($Revision: 1.13 $)
 AC_INIT(jcc.c)
 AC_CONFIG_HEADER(config.h)
 
@@ -302,10 +309,35 @@ else
   echo Using native threads
 fi
 
-AC_SUBST(PTHREAD_LIB)
 AC_SUBST(PTHREAD_ONLY)
 
 
+dnl =================================================================
+dnl Solaris specific
+dnl FIXME: Not tested on Solaris yet...
+dnl =================================================================
+
+AC_CANONICAL_HOST
+
+SOLARIS_ONLY=#
+
+case "$host" in
+*-solaris*) SOLARIS_ONLY=
+            AC_DEFINE(__EXTENSIONS__)
+            if test "$GCC" = "yes"; then
+              # Set a GCC specific switch:
+              # This compiler switch makes Solaris thread-safe
+              PTHREAD_LIB=
+              SPECIAL_CFLAGS="-pthreads"
+            else
+              # What do we do without GCC? Guess this:
+              SPECIAL_CFLAGS="-D_REENTRANT"
+            fi
+;;
+esac
+
+AC_SUBST(SOLARIS_ONLY)
+
 dnl =================================================================
 dnl Check for standard compiler stuff
 dnl =================================================================
@@ -337,24 +369,6 @@ AC_CHECK_LIB(pcreposix, regcomp, [AC_CHECK_HEADER(pcreposix.h, [have_pcreposix=y
 AC_CHECK_LIB(pcrs, pcrs_compile, [AC_CHECK_HEADER(pcrs.h, [have_pcrs=yes], [have_pcrs=no])], [have_pcrs=no])
 
 
-dnl =================================================================
-dnl Solaris specific
-dnl FIXME: Not tested on Solaris yet...
-dnl =================================================================
-
-AC_CANONICAL_HOST
-
-SOLARIS_ONLY=#
-
-case "$target" in
-*-solaris*) AC_DEFINE(_REENTRANT)
-            AC_DEFINE(__EXTENSIONS__)
-            SOLARIS_ONLY=
-;;
-esac
-
-AC_SUBST(SOLARIS_ONLY)
-
 dnl =================================================================
 dnl Always defined
 dnl =================================================================
@@ -368,92 +382,78 @@ dnl =================================================================
 AC_ARG_ENABLE(toggle,
 [  --disable-toggle        Don't support temporary disable],
 [if test $enableval = yes; then
-  AC_DEFINE(TOGGLE)
-fi],AC_DEFINE(TOGGLE))
+  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(DENY_GZIP)
+  AC_DEFINE(FEATURE_DENY_GZIP)
 fi])
 
 AC_ARG_ENABLE(force,
 [  --disable-force         Don't allow blockfile to be bypassed],
 [if test $enableval = yes; then
-  AC_DEFINE(FORCE_LOAD)
-fi],AC_DEFINE(FORCE_LOAD))
+  AC_DEFINE(FEATURE_FORCE_LOAD)
+fi],AC_DEFINE(FEATURE_FORCE_LOAD))
 
 AC_ARG_ENABLE(fast-redirects,
 [  --disable-fast-redirects Don't support fast redirects],
 [if test $enableval = yes; then
-  AC_DEFINE(FAST_REDIRECTS)
-fi], AC_DEFINE(FAST_REDIRECTS))
+  AC_DEFINE(FEATURE_FAST_REDIRECTS)
+fi], AC_DEFINE(FEATURE_FAST_REDIRECTS))
 
 AC_ARG_ENABLE(killpopup,
 [  --disable-killpopup     Never block popups],
 [if test $enableval = yes; then
-  AC_DEFINE(KILLPOPUPS)
-fi],AC_DEFINE(KILLPOPUPS))
+  AC_DEFINE(FEATURE_KILL_POPUPS)
+fi],AC_DEFINE(FEATURE_KILL_POPUPS))
 
 AC_ARG_ENABLE(stats,
 [  --disable-stats         Don't keep statistics],
 [if test $enableval = yes; then
-  AC_DEFINE(STATISTICS)
-fi],AC_DEFINE(STATISTICS))
-
-AC_ARG_ENABLE(split-proxy-args,
-[  --disable-split-proxy-args  One big show-proxy-args page, not one per file.],
-[if test $enableval = yes; then
-  AC_DEFINE(SPLIT_PROXY_ARGS)
-fi],AC_DEFINE(SPLIT_PROXY_ARGS))
-
-AC_ARG_ENABLE(webdav,
-[  --disable-webdav        Don't support WebDAV.  This option breaks MS
-                          Outlook Express when accessing HotMail e-mail.],
-[if test $enableval = yes; then
-  AC_DEFINE(WEBDAV)
-fi],
-AC_DEFINE(WEBDAV))
+  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.],
 [if test $enableval = yes; then
-  AC_DEFINE(DETECT_MSIE_IMAGES)
+  AC_DEFINE(FEATURE_IMAGE_DETECT_MSIE)
 fi],
-AC_DEFINE(DETECT_MSIE_IMAGES))
+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.],
 [if test $enableval = yes; then
-  AC_DEFINE(IMAGE_BLOCKING)
+  AC_DEFINE(FEATURE_IMAGE_BLOCKING)
 fi],
-AC_DEFINE(IMAGE_BLOCKING))
+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.],
 [if test $enableval = yes; then
-  AC_DEFINE(ACL_FILES)
+  AC_DEFINE(FEATURE_ACL)
 fi],
-AC_DEFINE(ACL_FILES))
+AC_DEFINE(FEATURE_ACL))
 
 AC_ARG_ENABLE(trust-files,
 [  --disable-trust-files   Prevents the use of trust files.],
 [if test $enableval = yes; then
-  AC_DEFINE(TRUST_FILES)
+  AC_DEFINE(FEATURE_TRUST)
 fi],
-AC_DEFINE(TRUST_FILES))
+AC_DEFINE(FEATURE_TRUST))
 
 AC_ARG_ENABLE(jar-files,
 [  --disable-jar-files     Prevents the use of jar files to capture cookies.],
 [if test $enableval = yes; then
-  AC_DEFINE(JAR_FILES)
+  AC_DEFINE(FEATURE_COOKIE_JAR)
 fi],
-AC_DEFINE(JAR_FILES))
+AC_DEFINE(FEATURE_COOKIE_JAR))
 
 dnl pcre/pcrs is needed for CGI anyway, so
 dnl the choice is only between static and
@@ -555,5 +555,7 @@ dnl in the Makefile
 CFLAGS=$old_CFLAGS_nospecial
 AC_SUBST(SPECIAL_CFLAGS)
 
+AC_SUBST(PTHREAD_LIB)
+
 AC_OUTPUT(Makefile)