From af1246c78be15a165580e9b74f694de5a49549b1 Mon Sep 17 00:00:00 2001
From: Robert James Kaes <rjkaes@users.sourceforge.net>
Date: Mon, 1 Oct 2001 04:01:10 +0000
Subject: Added the ability to compile tinyproxy with static linking.

---
 ChangeLog       |  7 +++++++
 configure.in    | 22 +++++++++++++++++-----
 doc/TODO        |  1 -
 src/Makefile.am |  3 ++-
 4 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 3737d85..d6de12a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-09-29  Robert James Kaes  <rjkaes@flarenet.com>
+
+	* configure.in: Uses any CFLAGS variable passed to the configure
+	script. Also, '-g -Wall' is _not_ enabled unless debugging support
+	is compiled in. Use --enable-static to compile a statically linked
+	tinyproxy.
+
 2001-09-16  Robert James Kaes  <rjkaes@flarenet.com>
 
 	* src/tinyproxy.c (main): Don't allow Tunnel and Upstream
diff --git a/configure.in b/configure.in
index 4de43e1..596bc55 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl $Id: configure.in,v 1.30 2001-09-16 20:07:24 rjkaes Exp $
+dnl $Id: configure.in,v 1.31 2001-10-01 04:01:10 rjkaes Exp $
 
 dnl Devlopers, please strive to achieve this order:
 dnl
@@ -78,9 +78,19 @@ if test "$upstream_enabled" = "yes"; then
     AC_DEFINE(UPSTREAM_SUPPORT)
 fi
 
+dnl Include support for a statically compiled tinyproxy
+AC_ARG_ENABLE(static,
+[  --enable-static         Statically link tinyproxy [default=no]],
+	[ LDFLAGS="-static $LDFLAGS" ])
+
 dnl
 dnl Checks for programs
 dnl
+
+dnl Save $CFLAGS since AC_PROG_CC likes to insert "-g -O2"
+dnl if $CFLAGS is blank
+cflags_save="$CFLAGS"
+
 AC_PROG_AWK
 AC_PROG_MAKE_SET
 AC_PROG_CC
@@ -89,6 +99,8 @@ AC_PROG_LN_S
 AM_PROG_LEX
 AC_PROG_YACC
 
+CFLAGS="$cflags_save"
+
 dnl Make sure YACC is actually bison
 if test "$YACC" != "bison -y"; then
     AC_MSG_WARN(You will need bison if you want to regenerate the parser.)
@@ -212,7 +224,6 @@ dnl
 dnl Checks for functions
 dnl
 AC_FUNC_ALLOCA
-dnl AC_FUNC_MEMCMP
 AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS(\
@@ -238,15 +249,15 @@ dnl Compiler characteristics
 dnl
 
 dnl Enable the debugging flags (by checking for the GCC compiler)
-CFLAGS="-Wall $CFLAGS"
+CFLAGS="-O2 $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
+    if test "$ac_cv_prog_gcc" = "yes" ; 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"
+    CFLAGS="-Wall -g -DYYDEBUG $CFLAGS"
     YFLAGS="-v -d"
 else
     dnl No debugging information, include the optimizations
@@ -305,6 +316,7 @@ dnl
 dnl Substitute the variables into the various Makefiles
 dnl
 AC_SUBST(CFLAGS)
+AC_SUBST(LDFLAGS)
 AC_SUBST(YFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LIBS)
diff --git a/doc/TODO b/doc/TODO
index bbd10bd..7f20146 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -20,5 +20,4 @@ against the current tree and I'll integrate it if possible.
     really have a good way of doing it yet.
     Suggested: Ed Avis
   - Include the ability to rewrite both incoming and outgoing headers.
-  - Have a configuration option to build a statically linked program
   - Enable an option for chroot() jailing tinyproxy.
diff --git a/src/Makefile.am b/src/Makefile.am
index 0d28fdb..058a83e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.4 2001-09-14 04:55:06 rjkaes Exp $
+# $Id: Makefile.am,v 1.5 2001-10-01 04:01:10 rjkaes Exp $
 #
 # 
 #
@@ -16,6 +16,7 @@
 #
 
 YFLAGS = @YFLAGS@
+LDFLAGS = @LDFLAGS@
 
 bin_PROGRAMS = tinyproxy
 
-- 
cgit v1.2.3