bughz/tinyproxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed a problem where the REGEX library was included even if the system

Browse Source 
already had a working library.
This commit is contained in:
Robert James Kaes 2001-08-29 04:05:33 +00:00
parent 51e4ebb293
commit 551e7cf39f
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
configure.in
View File

@ -1,4 +1,4 @@
dnl $Id: configure.in,v 1.21 2001-08-28 15:52:53 rjkaes Exp $ dnl $Id: configure.in,v 1.22 2001-08-29 04:05:33 rjkaes Exp $
dnl Devlopers, please strive to achieve this order: dnl Devlopers, please strive to achieve this order:
dnl dnl
@ -19,7 +19,7 @@ AC_INIT()
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
AC_DEFINE_UNQUOTED(TARGET_SYSTEM, "$target") AC_DEFINE_UNQUOTED(TARGET_SYSTEM, "$target")
AM_INIT_AUTOMAKE(tinyproxy,1.4.1.5) AM_INIT_AUTOMAKE(tinyproxy,1.4.1.6)
AM_CONFIG_HEADER(config.h) AM_CONFIG_HEADER(config.h)
dnl dnl
@ -58,7 +58,7 @@ AC_ARG_ENABLE(filter,
[ --enable-filter Enable filtering of domains/URLs [default=yes]], [ --enable-filter Enable filtering of domains/URLs [default=yes]],
filter_enabled=yes, filter_enabled=yes) filter_enabled=yes, filter_enabled=yes)
if test "$filter_enabled" = "yes"; then if test "$filter_enabled" = "yes"; then
LIBOBJS="$LIBOBJS filter.o" LIBOBJS="filter.o $LIBOBJS"
AC_DEFINE(FILTER_ENABLE) AC_DEFINE(FILTER_ENABLE)
fi fi
@ -200,27 +200,6 @@ AC_UNP_CHECK_TYPE(in_addr_t, uint32_t)
AC_TYPE_PID_T AC_TYPE_PID_T
AC_TYPE_SIGNAL AC_TYPE_SIGNAL
dnl
dnl Compiler characteristics
dnl
dnl Enable the debugging flags (by checking for the GCC compiler)
CFLAGS="-Wall $CFLAGS"
if test "$enable_debug" = "yes" ; then
dnl Add the warnings if we have the GCC compiler
if test x$ac_cv_prog_gcc = xyes ; then
CFLAGS="-Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes $CFLAGS"
CFLAGS="-Wmissing-prototypes -Wmissing-declarations $CFLAGS"
CFLAGS="-Wpointer-arith -Waggregate-return -Wnested-externs $CFLAGS"
fi
CFLAGS="-DYYDEBUG $CFLAGS"
YFLAGS="-v -d"
else
dnl No debugging information, include the optimizations
CFLAGS="-DNDEBUG $CFLAGS"
YFLAGS="-d"
fi
dnl dnl
dnl Checks for functions dnl Checks for functions
dnl dnl
@ -246,6 +225,27 @@ if test "$ac_cv_func_vprintf" != "yes"; then
AC_CHECK_FUNC(_doprnt, AC_DEFINE(HAVE_DOPRNT)) AC_CHECK_FUNC(_doprnt, AC_DEFINE(HAVE_DOPRNT))
fi fi
dnl
dnl Compiler characteristics
dnl
dnl Enable the debugging flags (by checking for the GCC compiler)
CFLAGS="-Wall $CFLAGS"
if test "$enable_debug" = "yes" ; then
dnl Add the warnings if we have the GCC compiler
if test x$ac_cv_prog_gcc = xyes ; then
CFLAGS="-Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes $CFLAGS"
CFLAGS="-Wmissing-prototypes -Wmissing-declarations $CFLAGS"
CFLAGS="-Wpointer-arith -Waggregate-return -Wnested-externs $CFLAGS"
fi
CFLAGS="-DYYDEBUG $CFLAGS"
YFLAGS="-v -d"
else
dnl No debugging information, include the optimizations
CFLAGS="-DNDEBUG $CFLAGS"
YFLAGS="-d"
fi
dnl dnl
dnl Make sure we can actually handle the "--with-*" and "--enable-*" stuff. dnl Make sure we can actually handle the "--with-*" and "--enable-*" stuff.
dnl dnl
@ -261,7 +261,7 @@ if test "$socks_enabled" = "yes"; then
fi fi
dnl Handle the REGEX library dnl Handle the REGEX library
if test "$ac_cv_func_regex" != "yes"; then if test "$ac_cv_func_regexec" != "yes"; then
dnl We don't have a functioning REGEX so include our copy dnl We don't have a functioning REGEX so include our copy
tinyproxy_use_our_regex=yes tinyproxy_use_our_regex=yes
else else