punt custom handling of cross-compile logic and move towards the standard autotool...

FossilOrigin-Name: 9817b433da36c78513ca278ae28e8ca8ce1cf00b

diff --git a/configure.ac b/configure.ac
index 7573525f9e855a9e352a3b12031ab82852d84b4b..46b1a689b556743f190515f73c9e9042346e01f6 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -45,18 +45,6 @@
 #        The filename extension for executables on the build
 #        platform.  "" for Unix and ".exe" for Windows.
 #
-#    TARGET_CC
-#
-#        The name of a command that runs on the build platform
-#        and converts C source files into *.o files for the
-#        target platform.  In other words, the cross-compiler.
-#
-#    TARGET_CFLAGS
-#
-#        Switches that the target compiler needs to turn C source files
-#        into *.o files.  Do not include TARGET_TCL_INC in this list.
-#        Makefiles might add additional switches such as "-I.".
-#
 #    TCL_*
 #
 #        Lots of values are read in from the tclConfig.sh script,
@@ -76,18 +64,6 @@
 #        files for the readline library.  If the compiler is able 
 #        to find <readline.h> on its own, then this can be blank.
 #
-#    TARGET_LINK
-#
-#        The name of the linker that combines *.o files generated
-#        by TARGET_CC into executables for the target platform.
-#
-#    TARGET_LIBS
-#
-#        Additional libraries or other switch that the target linker needs
-#        to build an executable on the target.  Do not include
-#        on this list any libraries in TARGET_TCL_LIBS and
-#        TARGET_READLINE_LIBS, etc.
-#
 #    TARGET_EXEEXT
 #
 #        The filename extension for executables on the
@@ -116,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.27 $
+# $Revision: 1.28 $
 
 #########
 # Programs needed
@@ -184,96 +160,19 @@ fi
 # Locate a compiler for the build machine.  This compiler should
 # generate command-line programs that run on the build machine.
 #
-default_build_cflags="-g"
-if test "$config_BUILD_CC" = ""; then
-  AC_PROG_CC
-  if test "$cross_compiling" = "yes"; then
-    AC_MSG_ERROR([unable to find a compiler for building build tools])
-  fi
-  BUILD_CC=$CC
-  default_build_cflags=$CFLAGS
-else
-  BUILD_CC=$config_BUILD_CC
-  AC_MSG_CHECKING([host compiler])
-  CC=$BUILD_CC
-  AC_MSG_RESULT($BUILD_CC)
-fi
-AC_MSG_CHECKING([switches for the host compiler])
-if test "$config_BUILD_CFLAGS" != ""; then
-  CFLAGS=$config_BUILD_CFLAGS
-  BUILD_CFLAGS=$config_BUILD_CFLAGS
+if test x"$cross_compiling" = xno; then
+       BUILD_CC=$CC
+       BUILD_CFLAGS=$CFLAGS
 else
-  BUILD_CFLAGS=$default_build_cflags
-fi
-AC_MSG_RESULT($BUILD_CFLAGS)
-if test "$config_BUILD_LIBS" != ""; then
-  BUILD_LIBS=$config_BUILD_LIBS
+       if test "${BUILD_CC+set}" != set; then
+               AC_CHECK_PROGS(BUILD_CC, gcc cc cl)
+       fi
+       if test "${BUILD_CFLAGS+set}" != set; then
+               BUILD_CFLAGS="-g"
+       fi
 fi
 AC_SUBST(BUILD_CC)
 AC_SUBST(BUILD_CFLAGS)
-AC_SUBST(BUILD_LIBS)
-
-##########
-# Locate a compiler that converts C code into *.o files that run on
-# the target machine.
-#
-AC_MSG_CHECKING([target compiler])
-if test "$config_TARGET_CC" != ""; then
-  TARGET_CC=$config_TARGET_CC
-else
-  TARGET_CC=$BUILD_CC
-fi
-AC_MSG_RESULT($TARGET_CC)
-AC_MSG_CHECKING([switches on the target compiler])
-if test "$config_TARGET_CFLAGS" != ""; then
-  TARGET_CFLAGS=$config_TARGET_CFLAGS
-else
-  TARGET_CFLAGS=$BUILD_CFLAGS
-fi
-AC_MSG_RESULT($TARGET_CFLAGS)
-AC_MSG_CHECKING([target linker])
-if test "$config_TARGET_LINK" = ""; then
-  TARGET_LINK=$TARGET_CC
-else
-  TARGET_LINK=$config_TARGET_LINK
-fi
-AC_MSG_RESULT($TARGET_LINK)
-AC_MSG_CHECKING([switches on the target compiler])
-if test "$config_TARGET_TFLAGS" != ""; then
-  TARGET_TFLAGS=$config_TARGET_TFLAGS
-else
-  TARGET_TFLAGS=$BUILD_CFLAGS
-fi
-if test "$config_TARGET_RANLIB" != ""; then
-  TARGET_RANLIB=$config_TARGET_RANLIB
-else
-  AC_PROG_RANLIB
-  TARGET_RANLIB=$RANLIB
-fi
-if test "$config_TARGET_AR" != ""; then
-  TARGET_AR=$config_TARGET_AR
-else
-  TARGET_AR='ar cr'
-fi
-AC_MSG_RESULT($TARGET_TFLAGS)
-AC_SUBST(TARGET_CC)
-AC_SUBST(TARGET_CFLAGS)
-AC_SUBST(TARGET_LINK)
-AC_SUBST(TARGET_LFLAGS)
-AC_SUBST(TARGET_RANLIB)
-AC_SUBST(TARGET_AR)
-
-# Set the $cross variable if we are cross-compiling.  Make
-# it 0 if we are not.
-#
-AC_MSG_CHECKING([if host and target compilers are the same])
-if test "$BUILD_CC" = "$TARGET_CC"; then
-  cross=0
-  AC_MSG_RESULT(yes)
-else
-  cross=1
-  AC_MSG_RESULT(no)
-fi
 
 ##########
 # Do we want to support multithreaded use of sqlite
@@ -401,7 +300,7 @@ if test "$CYGWIN" = "yes"; then
 else
   BUILD_EXEEXT=$EXEEXT
 fi
-if test "$cross" = "0"; then
+if test x"$cross_compiling" = xno; then
   TARGET_EXEEXT=$BUILD_EXEEXT
 else
   TARGET_EXEEXT=$config_TARGET_EXEEXT
@@ -437,15 +336,6 @@ AC_SUBST(OS_WIN)
 AC_SUBST(OS_OS2)
 AC_SUBST(TARGET_EXEEXT)
 
-##########
-# Extract generic linker options from the environment.
-#
-if test "$config_TARGET_LIBS" != ""; then
-  TARGET_LIBS=$config_TARGET_LIBS
-else
-  TARGET_LIBS=""
-fi
-
 ##########
 # Figure out all the parameters needed to compile against Tcl.
 #
@@ -686,11 +576,6 @@ AC_CHECK_FUNC(usleep, [TARGET_CFLAGS="$TARGET_CFLAGS -DHAVE_USLEEP=1"])
 
 AC_CHECK_FUNC(fdatasync, [TARGET_CFLAGS="$TARGET_CFLAGS -DHAVE_FDATASYNC=1"])
 
-#########
-# Put out accumulated miscellaneous LIBRARIES
-#
-AC_SUBST(TARGET_LIBS)
-
 #########
 # Generate the output files.
 #

diff --git a/manifest b/manifest
index f354d8743720650b93aeadba0b714d85193c2953..cbe2e46ee297aa12e92e38ad4c0818934e8d2685 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C make\sthe\sreadline\schecks\smore\sflexible\sand\shandle\scross-compiling\slogic\s(CVS\s3646)
-D 2007-02-17T14:28:26
+C punt\scustom\shandling\sof\scross-compile\slogic\sand\smove\stowards\sthe\sstandard\sautotool\sway\sof\sthings\s(CVS\s3647)
+D 2007-02-17T14:31:55
 F Makefile.in 7fa74bf4359aa899da5586e394d17735f221315f
 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@@ -13,7 +13,7 @@ F art/SQLiteLogo3.tiff b9e6bf022ae939bc986cddb8ab99583ca1b02cb3
 F config.guess 2103e94b15dc57112d7b9ee152c6fac5288895b4
 F config.sub 9bf686ec001ae7bc53f5b3563c90c62d4c6d48be
 F configure 6be7b37dd811c43f59c119aa5a713f688a2184c4 x
-F configure.ac cd93d44498e1a81fdd4392a2ef6e8ffcf5f97497
+F configure.ac 761416b9da483b7145148574a7b3135b5b6e8c48
 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 50e86b0368ae0268e7f07e44a746e13ad86a3b8b
-R 71daed3249be50835edd41036f362c90
+P 4626c84bae1a11d3cdad4901b19caf44406bd62a
+R 9d68abc3d237b6c09be38b129898b045
 U vapier
-Z 1245fecfea91b4e94d0050f9d1849947
+Z 7ab6c01b5259613db4c4f0995145d059

diff --git a/manifest.uuid b/manifest.uuid
index f5f46a9761b2c1a5bb4d3e91907807a62139acee..1d56fd04d2fcf156056aa1916643a162e9c03e1a 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4626c84bae1a11d3cdad4901b19caf44406bd62a
\ No newline at end of file
+9817b433da36c78513ca278ae28e8ca8ce1cf00b
\ No newline at end of file