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

Added the ability to compile tinyproxy with static linking.

Browse Source
This commit is contained in:
Robert James Kaes 2001-10-01 04:01:10 +00:00
parent 7c6cc24b1d
commit af1246c78b
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2001-09-16 Robert James Kaes <rjkaes@flarenet.com>
* src/tinyproxy.c (main): Don't allow Tunnel and Upstream * src/tinyproxy.c (main): Don't allow Tunnel and Upstream

22
configure.in
View File

@ -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 Devlopers, please strive to achieve this order:
dnl dnl
@ -78,9 +78,19 @@ if test "$upstream_enabled" = "yes"; then
AC_DEFINE(UPSTREAM_SUPPORT) AC_DEFINE(UPSTREAM_SUPPORT)
fi 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
dnl Checks for programs dnl Checks for programs
dnl 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_AWK
AC_PROG_MAKE_SET AC_PROG_MAKE_SET
AC_PROG_CC AC_PROG_CC
@ -89,6 +99,8 @@ AC_PROG_LN_S
AM_PROG_LEX AM_PROG_LEX
AC_PROG_YACC AC_PROG_YACC
CFLAGS="$cflags_save"
dnl Make sure YACC is actually bison dnl Make sure YACC is actually bison
if test "$YACC" != "bison -y"; then if test "$YACC" != "bison -y"; then
AC_MSG_WARN(You will need bison if you want to regenerate the parser.) AC_MSG_WARN(You will need bison if you want to regenerate the parser.)
@ -212,7 +224,6 @@ dnl
dnl Checks for functions dnl Checks for functions
dnl dnl
AC_FUNC_ALLOCA AC_FUNC_ALLOCA
dnl AC_FUNC_MEMCMP
AC_FUNC_STRFTIME AC_FUNC_STRFTIME
AC_FUNC_VPRINTF AC_FUNC_VPRINTF
AC_CHECK_FUNCS(\ AC_CHECK_FUNCS(\
@ -238,15 +249,15 @@ dnl Compiler characteristics
dnl dnl
dnl Enable the debugging flags (by checking for the GCC compiler) dnl Enable the debugging flags (by checking for the GCC compiler)
CFLAGS="-Wall $CFLAGS" CFLAGS="-O2 $CFLAGS"
if test "$enable_debug" = "yes" ; then if test "$enable_debug" = "yes" ; then
dnl Add the warnings if we have the GCC compiler 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="-Wshadow -Wcast-qual -Wcast-align -Wstrict-prototypes $CFLAGS"
CFLAGS="-Wmissing-prototypes -Wmissing-declarations $CFLAGS" CFLAGS="-Wmissing-prototypes -Wmissing-declarations $CFLAGS"
CFLAGS="-Wpointer-arith -Waggregate-return -Wnested-externs $CFLAGS" CFLAGS="-Wpointer-arith -Waggregate-return -Wnested-externs $CFLAGS"
fi fi
CFLAGS="-DYYDEBUG $CFLAGS" CFLAGS="-Wall -g -DYYDEBUG $CFLAGS"
YFLAGS="-v -d" YFLAGS="-v -d"
else else
dnl No debugging information, include the optimizations dnl No debugging information, include the optimizations
@ -305,6 +316,7 @@ dnl
dnl Substitute the variables into the various Makefiles dnl Substitute the variables into the various Makefiles
dnl dnl
AC_SUBST(CFLAGS) AC_SUBST(CFLAGS)
AC_SUBST(LDFLAGS)
AC_SUBST(YFLAGS) AC_SUBST(YFLAGS)
AC_SUBST(CPPFLAGS) AC_SUBST(CPPFLAGS)
AC_SUBST(LIBS) AC_SUBST(LIBS)

1
doc/TODO
View File

@ -20,5 +20,4 @@ against the current tree and I'll integrate it if possible.
really have a good way of doing it yet. really have a good way of doing it yet.
Suggested: Ed Avis Suggested: Ed Avis
- Include the ability to rewrite both incoming and outgoing headers. - 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. - Enable an option for chroot() jailing tinyproxy.

3
src/Makefile.am
View File

@ -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@ YFLAGS = @YFLAGS@
LDFLAGS = @LDFLAGS@
bin_PROGRAMS = tinyproxy bin_PROGRAMS = tinyproxy