From 28f79f7bda9a2cae9e81f961e2de06fe1ec57d78 Mon Sep 17 00:00:00 2001 From: xdong Date: Tue, 23 Sep 2003 00:35:21 +0000 Subject: [PATCH] regenerate configure to take -enalbe-releasemode as an option (CVS 1100) FossilOrigin-Name: b85847b8f28f8f4be9e7f3d8674ecf42e1c5db38 --- configure | 65 ++++++++++++++++++++++++++++++++++----------------- manifest | 12 +++++----- manifest.uuid | 2 +- 3 files changed, 51 insertions(+), 28 deletions(-) diff --git a/configure b/configure index f685a713f1..58d3630866 100755 --- a/configure +++ b/configure @@ -1008,6 +1008,7 @@ Optional Features: --disable-libtool-lock avoid locking (might break parallel builds) --enable-utf8 Use UTF-8 encodings --enable-incore-db Support incore database + --enable-releasemode Support libtool link to release mode --enable-tempdb-in-ram Use an in-ram database for temporary tables Optional Packages: @@ -1434,7 +1435,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # The following RCS revision string applies to configure.in -# $Revision: 1.17 $ +# $Revision: 1.18 $ ######### # Programs needed @@ -8037,11 +8038,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -# if test "$cross_compiling" = "yes"; then -# { { echo "$as_me:$LINENO: error: unable to find a compiler for building build tools" >&5 -#echo "$as_me: error: unable to find a compiler for building build tools" >&2;} -# { (exit 1); exit 1; }; } -# fi + if test "$cross_compiling" = "yes"; then + { { echo "$as_me:$LINENO: error: unable to find a compiler for building build tools" >&5 +echo "$as_me: error: unable to find a compiler for building build tools" >&2;} + { (exit 1); exit 1; }; } + fi BUILD_CC=$CC default_build_cflags=$CFLAGS else @@ -8266,6 +8267,27 @@ else echo "${ECHO_T}yes" >&6 fi +########## +# Do we want to support release +# +# Check whether --enable-releasemode or --disable-releasemode was given. +if test "${enable_releasemode+set}" = set; then + enableval="$enable_releasemode" + +else + enable_releasemode=no +fi; +echo "$as_me:$LINENO: checking whether to support shared library linked as release mode or not" >&5 +echo $ECHO_N "checking whether to support shared library linked as release mode or not... $ECHO_C" >&6 +if test "$enable_releasemode" = "no"; then + ALLOWRELEASE="" + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +else + ALLOWRELEASE="-release `cat VERSION`" + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +fi ########## # Do we want temporary databases in memory @@ -8801,11 +8823,11 @@ echo "$as_me:$LINENO: checking for $dir/include/tcl.h" >&5 echo $ECHO_N "checking for $dir/include/tcl.h... $ECHO_C" >&6 if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 -#else -# test "$cross_compiling" = yes && -# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} -# { (exit 1); exit 1; }; } +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$dir/include/tcl.h"; then eval "$as_ac_File=yes" else @@ -9170,11 +9192,11 @@ echo "$as_me:$LINENO: checking for $dir/include/readline.h" >&5 echo $ECHO_N "checking for $dir/include/readline.h... $ECHO_C" >&6 if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 -#else -# test "$cross_compiling" = yes && -# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} -# { (exit 1); exit 1; }; } +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$dir/include/readline.h"; then eval "$as_ac_File=yes" else @@ -9196,11 +9218,11 @@ echo "$as_me:$LINENO: checking for $dir/include/readline/readline.h" >&5 echo $ECHO_N "checking for $dir/include/readline/readline.h... $ECHO_C" >&6 if eval "test \"\${$as_ac_File+set}\" = set"; then echo $ECHO_N "(cached) $ECHO_C" >&6 -#else -# test "$cross_compiling" = yes && -# { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 -#echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} -# { (exit 1); exit 1; }; } +else + test "$cross_compiling" = yes && + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$dir/include/readline/readline.h"; then eval "$as_ac_File=yes" else @@ -9990,6 +10012,7 @@ s,@TARGET_RANLIB@,$TARGET_RANLIB,;t t s,@TARGET_AR@,$TARGET_AR,;t t s,@ENCODING@,$ENCODING,;t t s,@ALLOWATTACHMEM@,$ALLOWATTACHMEM,;t t +s,@ALLOWRELEASE@,$ALLOWRELEASE,;t t s,@INMEMORYDB@,$INMEMORYDB,;t t s,@TEMP_STORE@,$TEMP_STORE,;t t s,@BUILD_EXEEXT@,$BUILD_EXEEXT,;t t diff --git a/manifest b/manifest index 1fb67bff31..e287fd3f23 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C modify\sthe\sconfigure\sfile\sto\sallow\scross-compile\sto\swork\sat\sarm\sand\sxscale\s(CVS\s1099) -D 2003-09-18T21:59:46 +C regenerate\sconfigure\sto\stake\s-enalbe-releasemode\sas\san\soption\s(CVS\s1100) +D 2003-09-23T00:35:21 F Makefile.in 0cf2ffb6dc35694895e0dac488bc1259b6a4eb90 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd @@ -9,7 +9,7 @@ F art/SQLite.eps 9b43cc99cfd2be687d386faea6862ea68d6a72b2 F art/SQLite.gif 1bbb94484963f1382e27e1c5e86dd0c1061eba2b F config.guess 831db445a8ae31d1f773fce85e14c16c8677417d F config.sub 975368989965310238930ecf8e7f06a23061dbb1 -F configure e1c78a97ecdb165c9af751a00786fe7d6789c1cf x +F configure a79b01eab6acd5e45f08a84b187c435d7d76e256 x F configure.ac 3c199bb4d54c6aa8501dcc84facb50bebfefeaad F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac @@ -173,7 +173,7 @@ F www/speed.tcl 2f6b1155b99d39adb185f900456d1d592c4832b3 F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604 F www/tclsqlite.tcl b9271d44dcf147a93c98f8ecf28c927307abd6da F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1 -P 4fbca3ab09596c530da7c50657f3bc9140178dd5 -R a213f232fcfc16c27ebd04c79a47da28 +P 760f2fa2e5db102b970687f59b79bfb6f4d35b32 +R 9dcd523e3ea360fe30244e5007157ba8 U xdong -Z cb20f3238946fd4f33e2c88123f171ae +Z 0e700a84a79fd07ab1abefa3149913a2 diff --git a/manifest.uuid b/manifest.uuid index 5bc7246960..bd06f336bc 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -760f2fa2e5db102b970687f59b79bfb6f4d35b32 \ No newline at end of file +b85847b8f28f8f4be9e7f3d8674ecf42e1c5db38 \ No newline at end of file