Fix configure.ac and Makefile.in so that they generate pkgIndex.tcl correctly.

FossilOrigin-Name: 3deff25249c59b7fc1b6eb65dda39736955679c6

diff --git a/Makefile.in b/Makefile.in
index 4ac06938fd564607007a50c2ac1fe76869d601a2..2177488f9b033a5d70957128ac3b8ee2b0ccec44 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1059,7 +1059,7 @@ install:  sqlite3$(BEXE) lib_install sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_instal
        $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
 
 pkgIndex.tcl:
-       echo 'package ifneeded sqlite3 $(RELEASE) [list load $(TCLLIBDIR)/libtclsqlite3.so sqlite3]' > $@
+       echo 'package ifneeded sqlite3 $(RELEASE) [list load $(TCLLIBDIR)/libtclsqlite3$(SHLIB_SUFFIX) sqlite3]' > $@
 tcl_install:   lib_install libtclsqlite3.la pkgIndex.tcl
        $(INSTALL) -d $(DESTDIR)$(TCLLIBDIR)
        $(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)

diff --git a/configure b/configure
index 0c519e221628238511c4482557adff3390cd4778..d259324bddc61d8c054888a52116d281ebecc3ac 100755 (executable)
--- a/configure
+++ b/configure
@@ -884,6 +884,7 @@ TCL_LIB_SPEC
 TCL_STUB_LIB_FILE
 TCL_STUB_LIB_FLAG
 TCL_STUB_LIB_SPEC
+TCL_SHLIB_SUFFIX
 HAVE_TCL
 TARGET_READLINE_LIBS
 TARGET_READLINE_INC
@@ -3724,13 +3725,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:3727: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:3728: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:3730: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:3731: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:3733: output\"" >&5)
+  (eval echo "\"\$as_me:3734: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -4952,7 +4953,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4955 "configure"' > conftest.$ac_ext
+  echo '#line 4956 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6821,11 +6822,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:6824: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:6825: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:6828: \$? = $ac_status" >&5
+   echo "$as_me:6829: \$? = $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.
@@ -7160,11 +7161,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:7163: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7164: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7167: \$? = $ac_status" >&5
+   echo "$as_me:7168: \$? = $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.
@@ -7265,11 +7266,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:7268: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7269: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7272: \$? = $ac_status" >&5
+   echo "$as_me:7273: \$? = $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
@@ -7320,11 +7321,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:7323: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7324: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:7327: \$? = $ac_status" >&5
+   echo "$as_me:7328: \$? = $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
@@ -10133,7 +10134,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10136 "configure"
+#line 10137 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10229,7 +10230,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 10232 "configure"
+#line 10233 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12827,6 +12828,7 @@ $as_echo "file not found" >&6; }
 
 
 
+
   fi
 fi
 if test "${use_tcl}" = "no" ; then

diff --git a/configure.ac b/configure.ac
index 00ecf453af3a2fa72395bff8abe96b6761bf8150..6a1188842aba1eab63a36bc57f7e227d972a6dd0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -430,6 +430,7 @@ if test "${use_tcl}" = "yes" ; then
     AC_SUBST(TCL_STUB_LIB_FILE)
     AC_SUBST(TCL_STUB_LIB_FLAG)
     AC_SUBST(TCL_STUB_LIB_SPEC)
+    AC_SUBST(TCL_SHLIB_SUFFIX)
   fi
 fi
 if test "${use_tcl}" = "no" ; then

diff --git a/manifest b/manifest
index 78a4b7282125e46f0af9a2fbd633afff6c5e4b38..9e2a939d3b8d022eec856754e0d374efbc5b8140 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,7 +1,7 @@
-C Minor\stweaks\sto\sthe\sMSVC\sMakefile.
-D 2015-03-31T16:42:16.959
+C Fix\sconfigure.ac\sand\sMakefile.in\sso\sthat\sthey\sgenerate\spkgIndex.tcl\scorrectly.
+D 2015-03-31T17:01:52.572
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 88a3e6261286db378fdffa1124cad11b3c05f5bb
+F Makefile.in 00d12636df7a5b08af09116bcd6c7bfd49b8b3b4
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
 F Makefile.msc a8d817fa486d8c88dfbd19ae6a6567d9d350de39
 F Makefile.vxworks e1b65dea203f054e71653415bd8f96dcaed47858
@@ -38,8 +38,8 @@ F autoconf/tea/win/rules.vc c511f222b80064096b705dbeb97060ee1d6b6d63
 F config.guess 226d9a188c6196f3033ffc651cbc9dcee1a42977
 F config.h.in 42b71ad3fe21c9e88fa59e8458ca1a6bc72eb0c0
 F config.sub 9ebe4c3b3dab6431ece34f16828b594fb420da55
-F configure 613b220c2f2c7adcd50eb5ee4144ab581a150b47 x
-F configure.ac 6a8d145aea6d81f0b90013340780e43ed74fd5f4
+F configure 8b18c2378805a1d8aaca85d293671f450dd3c723 x
+F configure.ac 0b775d383c536bbaafc1e46dd3cbb81a7ea11aeb
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html 334dbf6621b8fb8790297ec1abf3cfa4621709d1
 F doc/pager-invariants.txt 27fed9a70ddad2088750c4a2b493b63853da2710
@@ -1248,7 +1248,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 586a94e85bc13700a2093734711c1367fa814b8c
-R dda30a84a02345c3ad5a29c2256cdbe0
-U mistachkin
-Z 140263b8fa48f28f6823c13e70219b7f
+P 7244ea59ede8aa2c7d1dc2c85268e12ddd452e27
+R 975c1f85d87faa80fd42aac5b24ed9ba
+U drh
+Z 016bf5cf61fe366d051895307d7b2ae3

diff --git a/manifest.uuid b/manifest.uuid
index 6d3dfcae53e1d3da9dcbe4cab9a712216232f123..d92c73c696ec16436a3542fedb4f1d21e22516f3 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-7244ea59ede8aa2c7d1dc2c85268e12ddd452e27
\ No newline at end of file
+3deff25249c59b7fc1b6eb65dda39736955679c6
\ No newline at end of file