You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@httpd.apache.org by "Ralf S. Engelschall" <rs...@engelschall.com> on 1999/01/02 15:19:31 UTC
Re: minor patch for Configure
In article <19...@chill.innovation.ch> you wrote:
> Looking at the Configure script, I ran across a small error in the
> socks stuff - it looks for socks settings in the EXTRA_ definitions
> in the wrong file. The patch follows below.
> ------------------------------------------------------------------------
> --- Configure.orig Fri Nov 6 18:12:23 1998
> +++ Configure Wed Dec 30 13:55:59 1998
> @@ -1306,7 +1306,7 @@
> CFLAGS="$CFLAGS -DSOCKS -DSOCKS4"
> CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect"
> CFLAGS="$CFLAGS -Dgethostbyname=Rgethostbyname"
> - if [ "x`grep EXTRA_ Makefile | grep lsocks`" = "x" ]; then
> + if [ "x`grep EXTRA_ Makefile.config | grep lsocks`" = "x" ]; then
> LIBS="$LIBS -L/usr/local/lib -lsocks"
> fi
> case $PLAT in
> @@ -1325,7 +1325,7 @@
> CFLAGS="$CFLAGS -DSOCKS -DSOCKS5"
> CFLAGS="$CFLAGS -Dconnect=SOCKSconnect -Dselect=SOCKSselect"
> CFLAGS="$CFLAGS -Dgethostbyname=SOCKSgethostbyname -Dclose=SOCKSclose"
> - if [ "x`grep EXTRA_ Makefile | grep lsocks5`" = "x" ]; then
> + if [ "x`grep EXTRA_ Makefile.config | grep lsocks5`" = "x" ]; then
> LIBS="$LIBS -L/usr/local/lib -lsocks5"
> fi
> case $PLAT in
> ------------------------------------------------------------------------
Hmmm... sorry to say this, but Makefile.config is not really correct, I think.
And actually we additionally should look for ^EXTRA_, because out-commented
EXTRA_ lines can exists. So, wouldn't be this better ($file is Configuration
or the file given via -file):
Index: Configure
===================================================================
RCS file: /e/apache/REPOS/apache-1.3/src/Configure,v
retrieving revision 1.317
diff -u -r1.317 Configure
--- Configure 1999/01/01 23:48:01 1.317
+++ Configure 1999/01/02 14:17:44
@@ -1334,7 +1334,7 @@
CFLAGS="$CFLAGS -DSOCKS -DSOCKS4"
CFLAGS="$CFLAGS -Dconnect=Rconnect -Dselect=Rselect"
CFLAGS="$CFLAGS -Dgethostbyname=Rgethostbyname"
- if [ "x`grep EXTRA_ Makefile | grep lsocks`" = "x" ]; then
+ if [ "x`grep '^EXTRA_' $file | grep lsocks`" = "x" ]; then
LIBS="$LIBS -L/usr/local/lib -lsocks"
fi
case $PLAT in
@@ -1353,7 +1353,7 @@
CFLAGS="$CFLAGS -DSOCKS -DSOCKS5"
CFLAGS="$CFLAGS -Dconnect=SOCKSconnect -Dselect=SOCKSselect"
CFLAGS="$CFLAGS -Dgethostbyname=SOCKSgethostbyname -Dclose=SOCKSclose"
- if [ "x`grep EXTRA_ Makefile | grep lsocks5`" = "x" ]; then
+ if [ "x`grep '^EXTRA_' $file | grep lsocks5`" = "x" ]; then
LIBS="$LIBS -L/usr/local/lib -lsocks5"
fi
case $PLAT in
Ralf S. Engelschall
rse@engelschall.com
www.engelschall.com