From faa68dbb7d294d32070983acd008667d0542e466 Mon Sep 17 00:00:00 2001 From: vapier Date: Wed, 1 Apr 2009 07:38:31 +0000 Subject: [PATCH] add a sanity check to make sure the configure script and VERSION file are always in sync (CVS 6420) FossilOrigin-Name: 1b9da6d73f603e66d078463c3571dda86ceedfb3 --- configure | 43 ++++++++++++++++++++++++++++--------------- configure.ac | 11 ++++++++++- manifest | 14 +++++++------- manifest.uuid | 2 +- 4 files changed, 46 insertions(+), 24 deletions(-) diff --git a/configure b/configure index d86d03d2e3..36eea7f6cf 100755 --- a/configure +++ b/configure @@ -2053,8 +2053,21 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +sqlite_version_sanity_check=`cat VERSION | tr -d '\n'` +if test "$PACKAGE_VERSION" != "$sqlite_version_sanity_check" ; then +{ { $as_echo "$as_me:$LINENO: error: configure script is out of date: + configure \$PACKAGE_VERSION = $PACKAGE_VERSION + top level VERSION file = $sqlite_version_sanity_check +please regen with autoconf" >&5 +$as_echo "$as_me: error: configure script is out of date: + configure \$PACKAGE_VERSION = $PACKAGE_VERSION + top level VERSION file = $sqlite_version_sanity_check +please regen with autoconf" >&2;} + { (exit 1); exit 1; }; } +fi + # The following RCS revision string applies to configure.in -# $Revision: 1.69 $ +# $Revision: 1.70 $ ######### # Programs needed @@ -3725,13 +3738,13 @@ if test "${lt_cv_nm_interface+set}" = set; then else lt_cv_nm_interface="BSD nm" echo "int some_variable = 0;" > conftest.$ac_ext - (eval echo "\"\$as_me:3728: $ac_compile\"" >&5) + (eval echo "\"\$as_me:3741: $ac_compile\"" >&5) (eval "$ac_compile" 2>conftest.err) cat conftest.err >&5 - (eval echo "\"\$as_me:3731: $NM \\\"conftest.$ac_objext\\\"\"" >&5) + (eval echo "\"\$as_me:3744: $NM \\\"conftest.$ac_objext\\\"\"" >&5) (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) cat conftest.err >&5 - (eval echo "\"\$as_me:3734: output\"" >&5) + (eval echo "\"\$as_me:3747: output\"" >&5) cat conftest.out >&5 if $GREP 'External.*some_variable' conftest.out > /dev/null; then lt_cv_nm_interface="MS dumpbin" @@ -4937,7 +4950,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4940 "configure"' > conftest.$ac_ext + echo '#line 4953 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6790,11 +6803,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6793: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6806: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6797: \$? = $ac_status" >&5 + echo "$as_me:6810: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7129,11 +7142,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7132: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7145: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7136: \$? = $ac_status" >&5 + echo "$as_me:7149: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7234,11 +7247,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7237: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7250: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7241: \$? = $ac_status" >&5 + echo "$as_me:7254: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -7289,11 +7302,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7292: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7305: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7296: \$? = $ac_status" >&5 + echo "$as_me:7309: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -10102,7 +10115,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10105 "configure" +#line 10118 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -10198,7 +10211,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 10201 "configure" +#line 10214 "configure" #include "confdefs.h" #if HAVE_DLFCN_H diff --git a/configure.ac b/configure.ac index 3a437c9083..3a227f6d29 100644 --- a/configure.ac +++ b/configure.ac @@ -89,10 +89,19 @@ # AC_INIT(sqlite, m4_esyscmd([cat VERSION | tr -d '\n'])) +dnl Make sure the local VERSION file matches this configure script +sqlite_version_sanity_check=`cat VERSION | tr -d '\n'` +if test "$PACKAGE_VERSION" != "$sqlite_version_sanity_check" ; then +AC_MSG_ERROR([configure script is out of date: + configure \$PACKAGE_VERSION = $PACKAGE_VERSION + top level VERSION file = $sqlite_version_sanity_check +please regen with autoconf]) +fi + dnl Put the RCS revision string after AC_INIT so that it will also dnl show in in configure. # The following RCS revision string applies to configure.in -# $Revision: 1.54 $ +# $Revision: 1.55 $ ######### # Programs needed diff --git a/manifest b/manifest index 07ec72cac0..70811a6f76 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C update\sconfigure\sscript\sso\sit\shas\sproper\sVERSION\sin\sit\s(CVS\s6419) -D 2009-03-31T23:29:16 +C add\sa\ssanity\scheck\sto\smake\ssure\sthe\sconfigure\sscript\sand\sVERSION\sfile\sare\salways\sin\ssync\s(CVS\s6420) +D 2009-04-01T07:38:31 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 @@ -18,8 +18,8 @@ F art/powered_by_sqlite.gif 7fbcd7d3675391fd3d21672c14c05f5999eb60d1 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977 F config.h.in 868fdb48c028421a203470e15c69ada15b9ba673 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55 -F configure fa0de5d77b3bd03a4e1245f869dd02a9b80b7d98 x -F configure.ac 2c06a767c7be70560317754f3eea4c84887da9ca +F configure 005a4f8af148931f19dac00ab1e2d6cc81e817d8 x +F configure.ac 660b4e3e930cdd469e6ac5c1f3d9ba9cec2c8be0 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac @@ -713,7 +713,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e -P 0db862a23aa4aae949d5cd90ad395a7f073d7fb8 -R fe5d2d4d4f0fa031c218a53f0a73b50f +P ce683cbd329eab45abb6f97f677f560b0fd1cdb6 +R 2718bfb20c645bac2c120cb851c22c61 U vapier -Z 5290eb2237b7c6bbb06559f91e0eb5a1 +Z ee7f3525d69da1abde020f897f014028 diff --git a/manifest.uuid b/manifest.uuid index b6a031d3ba..a6a970bd41 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ce683cbd329eab45abb6f97f677f560b0fd1cdb6 \ No newline at end of file +1b9da6d73f603e66d078463c3571dda86ceedfb3 \ No newline at end of file -- 2.47.2