Return-Path: Delivered-To: apache-cvs-archive@hyperreal.org Received: (qmail 1183 invoked by uid 6000); 11 Mar 1998 21:06:09 -0000 Received: (qmail 1175 invoked by alias); 11 Mar 1998 21:06:07 -0000 Delivered-To: apache-1.3-cvs@hyperreal.org Received: (qmail 1173 invoked by uid 125); 11 Mar 1998 21:06:06 -0000 Date: 11 Mar 1998 21:06:06 -0000 Message-ID: <19980311210606.1172.qmail@hyperreal.org> From: jim@hyperreal.org To: apache-1.3-cvs@hyperreal.org Subject: cvs commit: apache-1.3/src Configure Sender: apache-cvs-owner@apache.org Precedence: bulk Reply-To: new-httpd@apache.org jim 98/03/11 13:06:06 Modified: src Configure Log: Submitted by: Jim Jagielski If Configuration.tmpl is more recent that Configuration, Configure will now complain. Revision Changes Path 1.203 +17 -1 apache-1.3/src/Configure Index: Configure =================================================================== RCS file: /export/home/cvs/apache-1.3/src/Configure,v retrieving revision 1.202 retrieving revision 1.203 diff -u -r1.202 -r1.203 --- Configure 1998/03/11 09:57:25 1.202 +++ Configure 1998/03/11 21:06:05 1.203 @@ -46,7 +46,6 @@ shift 1 fi done -echo "Using config file: $file" if [ ! -r $file ]; then echo "Can't see or read \"$file\"" @@ -55,6 +54,23 @@ exitcode=1 exit 1 fi + +# +# Now see if Configuration.tmpl is more recent than $file. If +# so, then we complain and bail out +# + +if ls -lt Configuration.tmpl $file | head -1 | \ + grep 'Configuration.tmpl' > /dev/null +then + echo "Configuration.tmpl is more recent than $file;" + echo "Make sure that $file is valid and, if it is, simply" + echo "'touch $file' and re-run $0 again." + exitcode=1 + exit 1 +fi + +echo "Using config file: $file" #################################################################### ## From the Configuration file, create a "cleaned-up" version