Return-Path: Delivered-To: new-httpd-archive@hyperreal.org Received: (qmail 17598 invoked by uid 6000); 2 Jan 1999 16:02:27 -0000 Received: (qmail 17586 invoked from network); 2 Jan 1999 16:02:26 -0000 Received: from dns.omniport.net (sambo@206.54.164.2) by taz.hyperreal.org with SMTP; 2 Jan 1999 16:02:26 -0000 Received: (from sambo@localhost) by dns.omniport.net (8.6.12/8.6.9) id KAA29467 for new-httpd@apache.org; Sat, 2 Jan 1999 10:02:26 -0600 Date: Sat, 2 Jan 1999 10:02:26 -0600 From: Sam Rasins Message-Id: <199901021602.KAA29467@dns.omniport.net> To: new-httpd@apache.org Subject: Re: minor patch for Configure Sender: new-httpd-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org > Jim Jagielski wrote: > > Ralf S. Engelschall wrote: > > > > > > 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 > > I'm not sure about that. At this point in time, Makefile.config does contain > the "filtered" assignments already, including the EXTRA_* stuff. Searching > for '^EXTRA_' is right though. > What about leading whitespace? Sambo P-)