force GNUregex on solaris

diff --git a/configure.in b/configure.in
index 580d6cd6d49a8cda15aefb57b35156a86f5f25f6..818457888f93ba2f41229446f0c5176ded3a02ff 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,20 +3,21 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.52 1996/11/25 03:19:22 wessels Exp $
+dnl  $Id: configure.in,v 1.53 1996/11/26 19:08:48 wessels Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.52 $)dnl
+AC_REVISION($Revision: 1.53 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(aux)
 
 AC_CANONICAL_HOST
 
 CRYPTLIB=''
-REGEXLIB=''
+REGEXLIB=''    # -lregex
+LIBREGEX=''    # libregex.a
 
 dnl use directory structure of cached as default (hack)
 if test "$libexecdir" = '${exec_prefix}/libexec'; then
@@ -336,15 +337,23 @@ AC_CHECK_FUNCS(\
 )
 
 AC_MSG_CHECKING(if GNUregex needs to be compiled)
-if test "$ac_cv_func_regcomp" = no; then
-       AC_MSG_RESULT(yes)
+if test "$ac_cv_func_regcomp" = "no" ; then
+       COMPILE_GNUREGEX="yes"
+else
+       COMPILE_GNUREGEX="no"
+fi
+case "$host" in
+       *-sun-solaris2.[0-4])
+       COMPILE_GNUREGEX="yes"
+       ;;
+esac
+AC_MSG_RESULT($COMPILE_GNUREGEX)
+if test "$COMPILE_GNUREGEX" = "yes"; then
        REGEXLIB="-lregex"
        LIBREGEX="libregex.a"
-       AC_SUBST(LIBREGEX)
-else
-       AC_MSG_RESULT(no)
 fi
 AC_SUBST(REGEXLIB)
+AC_SUBST(LIBREGEX)
 
 AC_REPLACE_FUNCS(\
        tempnam \