mirror of https://github.com/sqlite/sqlite
Actually use TARGET_CFLAGS on autoconf-driven builds (CVS 4826)
FossilOrigin-Name: dda3d658998b00748f0e7693b3756d45400e8c8a
This commit is contained in:
mlcreech
parent
d7f59456ce
commit
df59c7c7d1
|
|
@ -26,7 +26,7 @@ BCC = @BUILD_CC@ @BUILD_CFLAGS@
|
|||
# will run on the target platform. (BCC and TCC are usually the
|
||||
# same unless your are cross-compiling.)
|
||||
#
|
||||
TCC = @CC@ @CFLAGS@ -I. -I${TOP}/src
|
||||
TCC = @CC@ @CFLAGS@ @TARGET_CFLAGS@ -I. -I${TOP}/src
|
||||
|
||||
# Define -DNDEBUG to compile without debugging (i.e., for production usage)
|
||||
# Omitting the define will cause extra debugging code to be inserted and
|
||||
|
|
|
|||
|
|
@ -873,6 +873,7 @@ TARGET_HAVE_READLINE
|
|||
TARGET_DEBUG
|
||||
USE_AMALGAMATION
|
||||
LOADEXTENSION_FLAGS
|
||||
TARGET_CFLAGS
|
||||
LIBOBJS
|
||||
LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
|
@ -1946,7 +1947,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||
|
||||
|
||||
# The following RCS revision string applies to configure.in
|
||||
# $Revision: 1.48 $
|
||||
# $Revision: 1.49 $
|
||||
|
||||
#########
|
||||
# Programs needed
|
||||
|
|
@ -3697,7 +3698,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 3700 "configure"' > conftest.$ac_ext
|
||||
echo '#line 3701 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -6376,11 +6377,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:6379: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6380: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:6383: \$? = $ac_status" >&5
|
||||
echo "$as_me:6384: \$? = $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.
|
||||
|
|
@ -6644,11 +6645,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:6647: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6648: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:6651: \$? = $ac_status" >&5
|
||||
echo "$as_me:6652: \$? = $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.
|
||||
|
|
@ -6748,11 +6749,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:6751: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6752: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:6755: \$? = $ac_status" >&5
|
||||
echo "$as_me:6756: \$? = $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
|
||||
|
|
@ -9093,7 +9094,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9096 "configure"
|
||||
#line 9097 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -9193,7 +9194,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9196 "configure"
|
||||
#line 9197 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -11529,11 +11530,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:11532: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11533: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:11536: \$? = $ac_status" >&5
|
||||
echo "$as_me:11537: \$? = $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.
|
||||
|
|
@ -11633,11 +11634,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:11636: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11637: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:11640: \$? = $ac_status" >&5
|
||||
echo "$as_me:11641: \$? = $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
|
||||
|
|
@ -13240,11 +13241,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:13243: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13244: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13247: \$? = $ac_status" >&5
|
||||
echo "$as_me:13248: \$? = $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.
|
||||
|
|
@ -13344,11 +13345,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:13347: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13348: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13351: \$? = $ac_status" >&5
|
||||
echo "$as_me:13352: \$? = $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
|
||||
|
|
@ -15579,11 +15580,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:15582: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15583: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15586: \$? = $ac_status" >&5
|
||||
echo "$as_me:15587: \$? = $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.
|
||||
|
|
@ -15847,11 +15848,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:15850: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15851: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15854: \$? = $ac_status" >&5
|
||||
echo "$as_me:15855: \$? = $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.
|
||||
|
|
@ -15951,11 +15952,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:15954: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15955: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:15958: \$? = $ac_status" >&5
|
||||
echo "$as_me:15959: \$? = $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
|
||||
|
|
@ -20758,6 +20759,7 @@ ac_config_headers="$ac_config_headers src/config.h"
|
|||
#########
|
||||
# Generate the output files.
|
||||
#
|
||||
|
||||
ac_config_files="$ac_config_files Makefile sqlite3.pc"
|
||||
|
||||
cat >confcache <<\_ACEOF
|
||||
|
|
@ -21525,11 +21527,12 @@ TARGET_HAVE_READLINE!$TARGET_HAVE_READLINE$ac_delim
|
|||
TARGET_DEBUG!$TARGET_DEBUG$ac_delim
|
||||
USE_AMALGAMATION!$USE_AMALGAMATION$ac_delim
|
||||
LOADEXTENSION_FLAGS!$LOADEXTENSION_FLAGS$ac_delim
|
||||
TARGET_CFLAGS!$TARGET_CFLAGS$ac_delim
|
||||
LIBOBJS!$LIBOBJS$ac_delim
|
||||
LTLIBOBJS!$LTLIBOBJS$ac_delim
|
||||
_ACEOF
|
||||
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 12; then
|
||||
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then
|
||||
break
|
||||
elif $ac_last_try; then
|
||||
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
|
||||
|
|
|
|||
|
|
@ -92,7 +92,7 @@ AC_INIT(sqlite, m4_esyscmd([cat VERSION | tr -d '\n']))
|
|||
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.34 $
|
||||
# $Revision: 1.35 $
|
||||
|
||||
#########
|
||||
# Programs needed
|
||||
|
|
@ -613,6 +613,7 @@ AC_CONFIG_HEADERS(src/config.h)
|
|||
#########
|
||||
# Generate the output files.
|
||||
#
|
||||
AC_SUBST(TARGET_CFLAGS)
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
sqlite3.pc
|
||||
|
|
|
|||
16
manifest
16
manifest
|
|
@ -1,7 +1,7 @@
|
|||
C Add\sheaders\sfor\suse\swith\sautoconf\s(missing\sfrom\sprevious\scheckin)\s(CVS\s4825)
|
||||
D 2008-03-06T07:36:18
|
||||
C Actually\suse\sTARGET_CFLAGS\son\sautoconf-driven\sbuilds\s(CVS\s4826)
|
||||
D 2008-03-06T07:51:15
|
||||
F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
|
||||
F Makefile.in 5a9dd0d69099728e0fca1a9cf2823226d276969a
|
||||
F Makefile.in 4ddc37cce8d315ea0f4567296312161a1f100498
|
||||
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
|
||||
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
|
||||
F VERSION 2e206fc9458bf10a8c3ba2d13bf521a04ef441c6
|
||||
|
|
@ -16,8 +16,8 @@ F art/nocopy.gif 716aa07d4bb7250d4e75756073bf8ef9f56bec8f
|
|||
F art/powered_by_sqlite.gif 7fbcd7d3675391fd3d21672c14c05f5999eb60d1
|
||||
F config.guess dba2d1300ec8f8cd00c6fb44b9edde21c14e960c
|
||||
F config.sub 9a842e7c332ed65cef3f2c20354e06dc998b2796
|
||||
F configure a908a0ed1fb4e6cf153e719ce9ba528fcf372c29 x
|
||||
F configure.ac fd362b92973b63d8afa07bda4892eacc23255aff
|
||||
F configure 2fc632fb3eaafd1328d90a940b362dfca1336483 x
|
||||
F configure.ac 156b3bf36819565a1c30f06a3a0154b99ea30868
|
||||
F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
|
||||
F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
|
||||
F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
|
||||
|
|
@ -624,7 +624,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
|
|||
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
|
||||
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
|
||||
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
|
||||
P 54839a84e6ce080ea8a0f6ce32acaa053d20f311
|
||||
R ba6f603fbcf69a52cea4b01ecdf772c7
|
||||
P 4513a5f493bb612134d04685c0d6777e0d5c65bc
|
||||
R e603c6bf696a8215ab3d4d3d0e7281bd
|
||||
U mlcreech
|
||||
Z 267ef6d6906a66247cc6933cc3edc0d5
|
||||
Z 81b6bfce66b43213aed86854f5b611c4
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
4513a5f493bb612134d04685c0d6777e0d5c65bc
|
||||
dda3d658998b00748f0e7693b3756d45400e8c8a
|
||||
Loading…
Reference in New Issue