merge the second portion of the cross-compile cleanup (CVS 3649)

FossilOrigin-Name: 309f2de62f34160fa24a5e1a3de0d653aabfb52b

diff --git a/configure b/configure
index 2165d1a9c0944483ecbdf026845e48952c96f9bd..ec3bd9fcecaf8834918ebfbf36475583abb2cd99 100755 (executable)
--- a/configure
+++ b/configure
@@ -1931,7 +1931,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 # The following RCS revision string applies to configure.in
-# $Revision: 1.41 $
+# $Revision: 1.42 $
 
 #########
 # Programs needed
@@ -19747,8 +19747,6 @@ fi
 # Figure out what C libraries are required to compile programs
 # that use "fdatasync()" function.
 #
-CC=$TARGET_CC
-LIBS=$TARGET_LIBS
 { echo "$as_me:$LINENO: checking for library containing fdatasync" >&5
 echo $ECHO_N "checking for library containing fdatasync... $ECHO_C" >&6; }
 if test "${ac_cv_search_fdatasync+set}" = set; then
@@ -19832,7 +19830,6 @@ if test "$ac_res" != no; then
 
 fi
 
-TARGET_LIBS="$LIBS"
 
 #########
 # check for debug enabled

diff --git a/configure.ac b/configure.ac
index 46b1a689b556743f190515f73c9e9042346e01f6..c260b8bcb32413796176abb6bf5008c0cb3e25cd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,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.28 $
+# $Revision: 1.29 $
 
 #########
 # Programs needed
@@ -549,10 +549,7 @@ AC_SUBST(TARGET_HAVE_READLINE)
 # Figure out what C libraries are required to compile programs
 # that use "fdatasync()" function.
 #
-CC=$TARGET_CC
-LIBS=$TARGET_LIBS
 AC_SEARCH_LIBS(fdatasync, [rt])
-TARGET_LIBS="$LIBS"
 
 #########
 # check for debug enabled

diff --git a/manifest b/manifest
index 2c342285d945d07010645e57e130e505dcf5fcb4..034f13801538caa2565f40f088894b5a5fc26715 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C regenerate\s(CVS\s3648)
-D 2007-02-17T14:46:31
+C merge\sthe\ssecond\sportion\sof\sthe\scross-compile\scleanup\s(CVS\s3649)
+D 2007-02-17T14:59:18
 F Makefile.in 1fe3d0b46e40fd684e1e61f8e8056cefed16de9f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -12,8 +12,8 @@ F art/SQLite.gif 1bbb94484963f1382e27e1c5e86dd0c1061eba2b
 F art/SQLiteLogo3.tiff b9e6bf022ae939bc986cddb8ab99583ca1b02cb3
 F config.guess dba2d1300ec8f8cd00c6fb44b9edde21c14e960c
 F config.sub 9a842e7c332ed65cef3f2c20354e06dc998b2796
-F configure 58a8bb1d3f66a4d1b9a79b17ec57d7fd367201be x
-F configure.ac 761416b9da483b7145148574a7b3135b5b6e8c48
+F configure ab703ac4004675e630857a92d1ef5bd40cf8fad0 x
+F configure.ac 95788619c4905e335a3e0f232f5e24348a61cf46
 F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
 F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
 F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
@@ -432,7 +432,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
 F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
 F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
-P 9817b433da36c78513ca278ae28e8ca8ce1cf00b
-R 3f444116bafd652ec832ed2ff115e219
+P 20ac0f364059feba5ad95dbe82db30a9aa86be78
+R 33a5f120e889adb0be5eff452bbd7b62
 U vapier
-Z 09028ff8b19b176f2951e7a09396bb32
+Z e798eb714e8ab7efa77096072c058760

diff --git a/manifest.uuid b/manifest.uuid
index ec2df08e33289c8cc036dd0c20e4185d5ecc02a7..e1321d8ee47de2d05b3ac67aa8b70ef46a5105e1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-20ac0f364059feba5ad95dbe82db30a9aa86be78
\ No newline at end of file
+309f2de62f34160fa24a5e1a3de0d653aabfb52b
\ No newline at end of file