diff -uNr ircservices-5.0.3/Changes ircservices-5.0.4/Changes --- ircservices-5.0.3/Changes 2002-11-16 18:44:49.000000000 +0900 +++ ircservices-5.0.4/Changes 2002-11-19 09:33:48.000000000 +0900 @@ -1,5 +1,8 @@ Version 5.0 ----------- +2002/11/18 .4 The Makefile now checks that the results of `configure' are + up to date before compiling. This solves a compilation + problem reported by several people in version 5.0.3. 2002/11/16 .3 Fixed case-sensitivity bug with channel bans. Reported by Alexander Janssens 2002/11/16 Fixed topic time setting on Unreal. Reported by diff -uNr ircservices-5.0.3/Makefile ircservices-5.0.4/Makefile --- ircservices-5.0.3/Makefile 2002-11-16 20:12:20.000000000 +0900 +++ ircservices-5.0.4/Makefile 2002-11-19 09:56:47.000000000 +0900 @@ -10,6 +10,7 @@ include Makefile.inc TOPDIR=. +default: config-check all ########################################################################### ########################## Configuration section ########################## @@ -52,11 +53,19 @@ ########################################################################### -.PHONY: all myall myclean clean spotless distclean install instbin instmod \ - insttools modules languages tools version.c +.PHONY: default config-check all myall myclean clean spotless distclean \ + install instbin instmod insttools modules languages tools version.c ########################################################################### +config-check: + @if ! ./configure -check ; then \ + echo 'Either you have not yet run the "configure" script, or the script has been' ; \ + echo 'updated since you last ran it. Please run "./configure" before running' ; \ + echo '"make".' ; \ + exit 1 ; \ + fi + all: myall @echo Now run \"$(MAKE) install\" to install Services. diff -uNr ircservices-5.0.3/configure ircservices-5.0.4/configure --- ircservices-5.0.3/configure 2002-11-13 19:39:30.000000000 +0900 +++ ircservices-5.0.4/configure 2002-11-19 09:32:08.000000000 +0900 @@ -169,7 +169,7 @@ # Variable initialization. -MY_CONFIG_VERSION=2 +MY_CONFIG_VERSION=3 CONFIG_VERSION= PROGRAM=ircservices @@ -293,7 +293,18 @@ set -- "$value" "$@" fi fi - if [ "$option" = "ignore-cache" ] ; then + if [ "$option" = "check" ] ; then + if [ -f config.cache ] ; then + CACHEVER=`grep '^CONFIG_VERSION=' config.cache | cut -d= -f2` + if [ "x$CACHEVER" = "x$MY_CONFIG_VERSION" ] ; then + exit 0 + else + exit 1 + fi + else + exit 1 + fi + elif [ "$option" = "ignore-cache" ] ; then IGNORE_CACHE=bonkle elif [ "$option" = "no-dir-check" ] ; then NO_DIR_CHECK=bonkle @@ -408,6 +419,10 @@ -force-gcc-2.96 Allow use of GCC 2.96 (unsupported). See question B.1 in the FAQ for details. + -check Check whether this script has already been run + and whether the cache is up-to-date. Exits + with 0 if up-to-date, 1 if not. + GNU-style long options (--option[=value]) may also be used. diff -uNr ircservices-5.0.3/version.sh ircservices-5.0.4/version.sh --- ircservices-5.0.3/version.sh 2002-11-16 18:44:53.000000000 +0900 +++ ircservices-5.0.4/version.sh 2002-11-19 09:33:56.000000000 +0900 @@ -3,7 +3,7 @@ # Build the version.c file which contains all the version related info and # needs to be updated on a per-build basis. -VERSION=5.0.3 +VERSION=5.0.4 # Increment Services build number if [ -f version.c ] ; then