Fix a problem with the configure script (CVS 148)

FossilOrigin-Name: 2aeb82db3ef6fc13eafa4fcf614e8f1dfd247abf

diff --git a/configure b/configure
index ec9364f834b84050238b15c56fd1dfe10e3705bf..03f26984e9db3a810b90966e0db962837f7fad87 100755 (executable)
--- a/configure
+++ b/configure
@@ -525,7 +525,7 @@ fi
 
 
 # The following RCS revision string applies to configure.in
-# $Revision: 1.7 $
+# $Revision: 1.8 $
 
 #########
 # Make sure we are not building in a subdirectory of the source tree.
@@ -1342,7 +1342,7 @@ fi
 
 fi
 if test "$found" = "no"; then
-  for dir in /usr/local /usr/X11* /usr/pkg /usr/contrib /usr; do
+  for dir in /usr/local /usr/X11 /usr/X11R6 /usr/pkg /usr/contrib /usr; do
     
 ac_safe=`echo "$dir/include/tcl.h" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $dir/include/tcl.h""... $ac_c" 1>&6

diff --git a/configure.in b/configure.in
index 50bc4bc52745a35c40d0254907a928297c21f95a..22a374d4d809029b81db395ffcb532ce94c71485 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -151,7 +151,7 @@ AC_INIT(src/sqlite.h.in)
 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.7 $
+# $Revision: 1.8 $
 
 #########
 # Make sure we are not building in a subdirectory of the source tree.
@@ -408,7 +408,7 @@ else
   AC_CHECK_HEADER(tcl.h, [found=yes])
 fi
 if test "$found" = "no"; then
-  for dir in /usr/local /usr/X11* /usr/pkg /usr/contrib /usr; do
+  for dir in /usr/local /usr/X11 /usr/X11R6 /usr/pkg /usr/contrib /usr; do
     AC_CHECK_FILE($dir/include/tcl.h, found=yes)
     if test "$found" = "yes"; then
       TARGET_TCL_INC="-I$dir/include"

diff --git a/manifest b/manifest
index 8d883b76cbce400f2be14ee6fdca5329627e9052..d430054b83ffb4db1cdd0045736103e9bd891577 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C :-)\s(CVS\s147)
-D 2000-09-29T13:30:54
+C Fix\sa\sproblem\swith\sthe\sconfigure\sscript\s(CVS\s148)
+D 2000-09-29T15:15:52
 F COPYRIGHT 74a8a6531a42e124df07ab5599aad63870fa0bd4
 F Makefile.in 39f684ee06a661157793f01cce98d43026fc2c06
 F README 51f6a4e7408b34afa5bc1c0485f61b6a4efb6958
 F VERSION c4ef5804e5824ee814fdd368026a5d21314bdbed
-F configure bc917320fcc6d8a1a5154737304763acb5f7f68c x
-F configure.in ae915ce37ff010e8aac34b90b9136d4a32659bdb
+F configure 3dc1edb9dcf60215e31ff72b447935ab62211442 x
+F configure.in d892ca33db7e88a055519ce2f36dcb11020e8fff
 F doc/lemon.html e233a3e97a779c7a87e1bc4528c664a58e49dd47
 F src/build.c 4d90e9e94750ca80249fc7958c617021d8bb7a50
 F src/dbbe.c 226daaf8c095ceb4aff48cad188dad90643f9867
@@ -72,7 +72,7 @@ F www/mingw.tcl fc5f4ba9d336b6e8c97347cc6496d6162461ef60
 F www/opcode.tcl cb3a1abf8b7b9be9f3a228d097d6bf8b742c2b6f
 F www/sqlite.tcl cb0d23d8f061a80543928755ec7775da6e4f362f
 F www/vdbe.tcl bcbfc33bcdd0ebad95eab31286adb9e1bc289520
-P 85a4254ef0998fac06ddc285decd79345968fee1
-R fad0a2ae1fae99e59e2510dbd713bcbd
+P e11f7527f9187e8902db84069baad0d3b7e17ad0
+R 374764ea3793b387c2fde1f92050f82f
 U drh
-Z 97f25b6b3274d7f182f155f5491676b3
+Z 3aff00aa74cc9d683b8bbe857e7c925e

diff --git a/manifest.uuid b/manifest.uuid
index b3ac248e9009a9b6a5e8a6bff3499889364ae979..d259c350b4e09ec2a1f57a4726496d3d5e9851cf 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e11f7527f9187e8902db84069baad0d3b7e17ad0
\ No newline at end of file
+2aeb82db3ef6fc13eafa4fcf614e8f1dfd247abf
\ No newline at end of file