mirror of
https://github.com/sqlite/sqlite.git
synced 2025-08-05 15:55:57 +03:00
Makefile changes so that builds work on Solaris. Ticket #1604. (CVS 3009)
FossilOrigin-Name: 7addf70445d46cab148496ba2f27ab3764b70f66
This commit is contained in:
15
Makefile.in
15
Makefile.in
@@ -58,6 +58,9 @@ TCC += -DTHREADSAFE=@THREADSAFE@
|
|||||||
#
|
#
|
||||||
LIBPTHREAD=@TARGET_THREAD_LIB@
|
LIBPTHREAD=@TARGET_THREAD_LIB@
|
||||||
|
|
||||||
|
# The fdatasync library
|
||||||
|
TLIBS = @TARGET_LIBS@
|
||||||
|
|
||||||
# Flags controlling use of the in memory btree implementation
|
# Flags controlling use of the in memory btree implementation
|
||||||
#
|
#
|
||||||
# TEMP_STORE is 0 to force temporary tables to be in a file, 1 to
|
# TEMP_STORE is 0 to force temporary tables to be in a file, 1 to
|
||||||
@@ -104,6 +107,9 @@ LTCOMPILE = $(LIBTOOL) --mode=compile $(TCC)
|
|||||||
LTLINK = $(LIBTOOL) --mode=link $(TCC)
|
LTLINK = $(LIBTOOL) --mode=link $(TCC)
|
||||||
LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
|
LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
|
||||||
|
|
||||||
|
# nawk compatible awk.
|
||||||
|
NAWK = @AWK@
|
||||||
|
|
||||||
# You should not have to change anything below this line
|
# You should not have to change anything below this line
|
||||||
###############################################################################
|
###############################################################################
|
||||||
OPTS =
|
OPTS =
|
||||||
@@ -232,7 +238,7 @@ Makefile: $(TOP)/Makefile.in
|
|||||||
#
|
#
|
||||||
last_change: $(SRC)
|
last_change: $(SRC)
|
||||||
cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \
|
cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \
|
||||||
| awk '{print $$5,$$6}' >last_change
|
| $(NAWK) '{print $$5,$$6}' >last_change
|
||||||
|
|
||||||
libsqlite3.la: $(LIBOBJ)
|
libsqlite3.la: $(LIBOBJ)
|
||||||
$(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \
|
$(LTLINK) -o libsqlite3.la $(LIBOBJ) $(LIBPTHREAD) \
|
||||||
@@ -246,7 +252,8 @@ libtclsqlite3.la: tclsqlite.lo libsqlite3.la
|
|||||||
|
|
||||||
sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
|
sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
|
||||||
$(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \
|
$(LTLINK) $(READLINE_FLAGS) $(LIBPTHREAD) \
|
||||||
-o sqlite3 $(TOP)/src/shell.c libsqlite3.la $(LIBREADLINE)
|
-o sqlite3 $(TOP)/src/shell.c libsqlite3.la \
|
||||||
|
$(LIBREADLINE) $(TLIBS)
|
||||||
|
|
||||||
# This target creates a directory named "tsrc" and fills it with
|
# This target creates a directory named "tsrc" and fills it with
|
||||||
# copies of all of the C source code and header files needed to
|
# copies of all of the C source code and header files needed to
|
||||||
@@ -326,10 +333,10 @@ opcodes.lo: opcodes.c
|
|||||||
$(LTCOMPILE) -c opcodes.c
|
$(LTCOMPILE) -c opcodes.c
|
||||||
|
|
||||||
opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
|
opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
|
||||||
sort -n -b +2 opcodes.h | awk -f $(TOP)/mkopcodec.awk >opcodes.c
|
sort -n -b +2 opcodes.h | $(NAWK) -f $(TOP)/mkopcodec.awk >opcodes.c
|
||||||
|
|
||||||
opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
|
opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
|
||||||
cat parse.h $(TOP)/src/vdbe.c | awk -f $(TOP)/mkopcodeh.awk >opcodes.h
|
cat parse.h $(TOP)/src/vdbe.c | $(NAWK) -f $(TOP)/mkopcodeh.awk >opcodes.h
|
||||||
|
|
||||||
os.lo: $(TOP)/src/os.c $(HDR)
|
os.lo: $(TOP)/src/os.c $(HDR)
|
||||||
$(LTCOMPILE) -c $(TOP)/src/os.c
|
$(LTCOMPILE) -c $(TOP)/src/os.c
|
||||||
|
@@ -41,6 +41,11 @@ THREADSAFE = -DTHREADSAFE=0
|
|||||||
#THREADLIB = -lpthread
|
#THREADLIB = -lpthread
|
||||||
THREADLIB =
|
THREADLIB =
|
||||||
|
|
||||||
|
#### Specify any extra libraries needed to access required functions.
|
||||||
|
#
|
||||||
|
#TLIBS = -lrt # fdatasync on Solaris 8
|
||||||
|
TLIBS =
|
||||||
|
|
||||||
#### Leave SQLITE_DEBUG undefined for maximum speed. Use SQLITE_DEBUG=1
|
#### Leave SQLITE_DEBUG undefined for maximum speed. Use SQLITE_DEBUG=1
|
||||||
# to check for memory leaks. Use SQLITE_DEBUG=2 to print a log of all
|
# to check for memory leaks. Use SQLITE_DEBUG=2 to print a log of all
|
||||||
# malloc()s and free()s in order to track down memory leaks.
|
# malloc()s and free()s in order to track down memory leaks.
|
||||||
@@ -108,6 +113,12 @@ LIBREADLINE =
|
|||||||
# ENCODING = UTF8
|
# ENCODING = UTF8
|
||||||
ENCODING = ISO8859
|
ENCODING = ISO8859
|
||||||
|
|
||||||
|
|
||||||
|
#### Which "awk" program provides nawk compatibilty
|
||||||
|
#
|
||||||
|
# NAWK = nawk
|
||||||
|
NAWK = awk
|
||||||
|
|
||||||
# You should not have to change anything below this line
|
# You should not have to change anything below this line
|
||||||
###############################################################################
|
###############################################################################
|
||||||
include $(TOP)/main.mk
|
include $(TOP)/main.mk
|
||||||
|
187
configure
vendored
187
configure
vendored
@@ -463,7 +463,7 @@ ac_includes_default="\
|
|||||||
# include <unistd.h>
|
# include <unistd.h>
|
||||||
#endif"
|
#endif"
|
||||||
|
|
||||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA program_prefix VERSION RELEASE VERSION_NUMBER BUILD_CC BUILD_CFLAGS BUILD_LIBS TARGET_CC TARGET_CFLAGS TARGET_LINK TARGET_LFLAGS TARGET_RANLIB TARGET_AR THREADSAFE TARGET_THREAD_LIB XTHREADCONNECT ALLOWRELEASE TEMP_STORE BUILD_EXEEXT OS_UNIX OS_WIN TARGET_EXEEXT TARGET_LIBS TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIBS TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC HAVE_TCL TARGET_READLINE_LIBS TARGET_READLINE_INC TARGET_HAVE_READLINE TARGET_DEBUG LIBOBJS LTLIBOBJS'
|
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP CXX CXXFLAGS ac_ct_CXX CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK program_prefix VERSION RELEASE VERSION_NUMBER BUILD_CC BUILD_CFLAGS BUILD_LIBS TARGET_CC TARGET_CFLAGS TARGET_LINK TARGET_LFLAGS TARGET_RANLIB TARGET_AR THREADSAFE TARGET_THREAD_LIB XTHREADCONNECT ALLOWRELEASE TEMP_STORE BUILD_EXEEXT OS_UNIX OS_WIN TARGET_EXEEXT TCL_VERSION TCL_BIN_DIR TCL_SRC_DIR TCL_LIBS TCL_INCLUDE_SPEC TCL_LIB_FILE TCL_LIB_FLAG TCL_LIB_SPEC TCL_STUB_LIB_FILE TCL_STUB_LIB_FLAG TCL_STUB_LIB_SPEC HAVE_TCL TARGET_READLINE_LIBS TARGET_READLINE_INC TARGET_HAVE_READLINE TARGET_DEBUG TARGET_LIBS LIBOBJS LTLIBOBJS'
|
||||||
ac_subst_files=''
|
ac_subst_files=''
|
||||||
|
|
||||||
# Initialize some variables set by options.
|
# Initialize some variables set by options.
|
||||||
@@ -1497,7 +1497,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
|||||||
|
|
||||||
|
|
||||||
# The following RCS revision string applies to configure.in
|
# The following RCS revision string applies to configure.in
|
||||||
# $Revision: 1.35 $
|
# $Revision: 1.36 $
|
||||||
|
|
||||||
#########
|
#########
|
||||||
# Programs needed
|
# Programs needed
|
||||||
@@ -18415,6 +18415,46 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
|
|||||||
|
|
||||||
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||||
|
|
||||||
|
for ac_prog in gawk mawk nawk awk
|
||||||
|
do
|
||||||
|
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||||
|
set dummy $ac_prog; ac_word=$2
|
||||||
|
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||||
|
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||||
|
if test "${ac_cv_prog_AWK+set}" = set; then
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
if test -n "$AWK"; then
|
||||||
|
ac_cv_prog_AWK="$AWK" # Let the user override the test.
|
||||||
|
else
|
||||||
|
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||||
|
for as_dir in $PATH
|
||||||
|
do
|
||||||
|
IFS=$as_save_IFS
|
||||||
|
test -z "$as_dir" && as_dir=.
|
||||||
|
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||||
|
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||||
|
ac_cv_prog_AWK="$ac_prog"
|
||||||
|
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||||
|
break 2
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
AWK=$ac_cv_prog_AWK
|
||||||
|
if test -n "$AWK"; then
|
||||||
|
echo "$as_me:$LINENO: result: $AWK" >&5
|
||||||
|
echo "${ECHO_T}$AWK" >&6
|
||||||
|
else
|
||||||
|
echo "$as_me:$LINENO: result: no" >&5
|
||||||
|
echo "${ECHO_T}no" >&6
|
||||||
|
fi
|
||||||
|
|
||||||
|
test -n "$AWK" && break
|
||||||
|
done
|
||||||
|
|
||||||
|
|
||||||
#########
|
#########
|
||||||
# Set up an appropriate program prefix
|
# Set up an appropriate program prefix
|
||||||
@@ -19649,7 +19689,6 @@ else
|
|||||||
TARGET_LIBS=""
|
TARGET_LIBS=""
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
##########
|
##########
|
||||||
# Figure out all the parameters needed to compile against Tcl.
|
# Figure out all the parameters needed to compile against Tcl.
|
||||||
#
|
#
|
||||||
@@ -20030,6 +20069,140 @@ fi
|
|||||||
fi
|
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
|
||||||
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||||
|
else
|
||||||
|
ac_func_search_save_LIBS=$LIBS
|
||||||
|
ac_cv_search_fdatasync=no
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
/* confdefs.h. */
|
||||||
|
_ACEOF
|
||||||
|
cat confdefs.h >>conftest.$ac_ext
|
||||||
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
/* Override any gcc2 internal prototype to avoid an error. */
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
#endif
|
||||||
|
/* We use char because int might match the return type of a gcc2
|
||||||
|
builtin and then its argument prototype would still apply. */
|
||||||
|
char fdatasync ();
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
fdatasync ();
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||||
|
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||||
|
(eval $ac_link) 2>conftest.er1
|
||||||
|
ac_status=$?
|
||||||
|
grep -v '^ *+' conftest.er1 >conftest.err
|
||||||
|
rm -f conftest.er1
|
||||||
|
cat conftest.err >&5
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); } &&
|
||||||
|
{ ac_try='test -z "$ac_c_werror_flag"
|
||||||
|
|| test ! -s conftest.err'
|
||||||
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||||
|
(eval $ac_try) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); }; } &&
|
||||||
|
{ ac_try='test -s conftest$ac_exeext'
|
||||||
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||||
|
(eval $ac_try) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); }; }; then
|
||||||
|
ac_cv_search_fdatasync="none required"
|
||||||
|
else
|
||||||
|
echo "$as_me: failed program was:" >&5
|
||||||
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
|
fi
|
||||||
|
rm -f conftest.err conftest.$ac_objext \
|
||||||
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
if test "$ac_cv_search_fdatasync" = no; then
|
||||||
|
for ac_lib in rt; do
|
||||||
|
LIBS="-l$ac_lib $ac_func_search_save_LIBS"
|
||||||
|
cat >conftest.$ac_ext <<_ACEOF
|
||||||
|
/* confdefs.h. */
|
||||||
|
_ACEOF
|
||||||
|
cat confdefs.h >>conftest.$ac_ext
|
||||||
|
cat >>conftest.$ac_ext <<_ACEOF
|
||||||
|
/* end confdefs.h. */
|
||||||
|
|
||||||
|
/* Override any gcc2 internal prototype to avoid an error. */
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C"
|
||||||
|
#endif
|
||||||
|
/* We use char because int might match the return type of a gcc2
|
||||||
|
builtin and then its argument prototype would still apply. */
|
||||||
|
char fdatasync ();
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
fdatasync ();
|
||||||
|
;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
_ACEOF
|
||||||
|
rm -f conftest.$ac_objext conftest$ac_exeext
|
||||||
|
if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
|
||||||
|
(eval $ac_link) 2>conftest.er1
|
||||||
|
ac_status=$?
|
||||||
|
grep -v '^ *+' conftest.er1 >conftest.err
|
||||||
|
rm -f conftest.er1
|
||||||
|
cat conftest.err >&5
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); } &&
|
||||||
|
{ ac_try='test -z "$ac_c_werror_flag"
|
||||||
|
|| test ! -s conftest.err'
|
||||||
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||||
|
(eval $ac_try) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); }; } &&
|
||||||
|
{ ac_try='test -s conftest$ac_exeext'
|
||||||
|
{ (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
|
||||||
|
(eval $ac_try) 2>&5
|
||||||
|
ac_status=$?
|
||||||
|
echo "$as_me:$LINENO: \$? = $ac_status" >&5
|
||||||
|
(exit $ac_status); }; }; then
|
||||||
|
ac_cv_search_fdatasync="-l$ac_lib"
|
||||||
|
break
|
||||||
|
else
|
||||||
|
echo "$as_me: failed program was:" >&5
|
||||||
|
sed 's/^/| /' conftest.$ac_ext >&5
|
||||||
|
|
||||||
|
fi
|
||||||
|
rm -f conftest.err conftest.$ac_objext \
|
||||||
|
conftest$ac_exeext conftest.$ac_ext
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
LIBS=$ac_func_search_save_LIBS
|
||||||
|
fi
|
||||||
|
echo "$as_me:$LINENO: result: $ac_cv_search_fdatasync" >&5
|
||||||
|
echo "${ECHO_T}$ac_cv_search_fdatasync" >&6
|
||||||
|
if test "$ac_cv_search_fdatasync" != no; then
|
||||||
|
test "$ac_cv_search_fdatasync" = "none required" || LIBS="$ac_cv_search_fdatasync $LIBS"
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
TARGET_LIBS="$LIBS"
|
||||||
|
|
||||||
##########
|
##########
|
||||||
# Figure out where to get the READLINE header files.
|
# Figure out where to get the READLINE header files.
|
||||||
#
|
#
|
||||||
@@ -20470,6 +20643,11 @@ if test $ac_cv_func_fdatasync = yes; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
#########
|
||||||
|
# Put out accumulated miscellaneous LIBRARIES
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
#########
|
#########
|
||||||
# Generate the output files.
|
# Generate the output files.
|
||||||
#
|
#
|
||||||
@@ -21146,6 +21324,7 @@ s,@LIBTOOL@,$LIBTOOL,;t t
|
|||||||
s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
|
s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
|
||||||
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
|
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
|
||||||
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
|
s,@INSTALL_DATA@,$INSTALL_DATA,;t t
|
||||||
|
s,@AWK@,$AWK,;t t
|
||||||
s,@program_prefix@,$program_prefix,;t t
|
s,@program_prefix@,$program_prefix,;t t
|
||||||
s,@VERSION@,$VERSION,;t t
|
s,@VERSION@,$VERSION,;t t
|
||||||
s,@RELEASE@,$RELEASE,;t t
|
s,@RELEASE@,$RELEASE,;t t
|
||||||
@@ -21168,7 +21347,6 @@ s,@BUILD_EXEEXT@,$BUILD_EXEEXT,;t t
|
|||||||
s,@OS_UNIX@,$OS_UNIX,;t t
|
s,@OS_UNIX@,$OS_UNIX,;t t
|
||||||
s,@OS_WIN@,$OS_WIN,;t t
|
s,@OS_WIN@,$OS_WIN,;t t
|
||||||
s,@TARGET_EXEEXT@,$TARGET_EXEEXT,;t t
|
s,@TARGET_EXEEXT@,$TARGET_EXEEXT,;t t
|
||||||
s,@TARGET_LIBS@,$TARGET_LIBS,;t t
|
|
||||||
s,@TCL_VERSION@,$TCL_VERSION,;t t
|
s,@TCL_VERSION@,$TCL_VERSION,;t t
|
||||||
s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t
|
s,@TCL_BIN_DIR@,$TCL_BIN_DIR,;t t
|
||||||
s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t
|
s,@TCL_SRC_DIR@,$TCL_SRC_DIR,;t t
|
||||||
@@ -21185,6 +21363,7 @@ s,@TARGET_READLINE_LIBS@,$TARGET_READLINE_LIBS,;t t
|
|||||||
s,@TARGET_READLINE_INC@,$TARGET_READLINE_INC,;t t
|
s,@TARGET_READLINE_INC@,$TARGET_READLINE_INC,;t t
|
||||||
s,@TARGET_HAVE_READLINE@,$TARGET_HAVE_READLINE,;t t
|
s,@TARGET_HAVE_READLINE@,$TARGET_HAVE_READLINE,;t t
|
||||||
s,@TARGET_DEBUG@,$TARGET_DEBUG,;t t
|
s,@TARGET_DEBUG@,$TARGET_DEBUG,;t t
|
||||||
|
s,@TARGET_LIBS@,$TARGET_LIBS,;t t
|
||||||
s,@LIBOBJS@,$LIBOBJS,;t t
|
s,@LIBOBJS@,$LIBOBJS,;t t
|
||||||
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
|
||||||
CEOF
|
CEOF
|
||||||
|
18
configure.ac
18
configure.ac
@@ -116,13 +116,14 @@ AC_INIT(src/sqlite.h.in)
|
|||||||
dnl Put the RCS revision string after AC_INIT so that it will also
|
dnl Put the RCS revision string after AC_INIT so that it will also
|
||||||
dnl show in in configure.
|
dnl show in in configure.
|
||||||
# The following RCS revision string applies to configure.in
|
# The following RCS revision string applies to configure.in
|
||||||
# $Revision: 1.21 $
|
# $Revision: 1.22 $
|
||||||
|
|
||||||
#########
|
#########
|
||||||
# Programs needed
|
# Programs needed
|
||||||
#
|
#
|
||||||
AC_PROG_LIBTOOL
|
AC_PROG_LIBTOOL
|
||||||
AC_PROG_INSTALL
|
AC_PROG_INSTALL
|
||||||
|
AC_PROG_AWK
|
||||||
|
|
||||||
#########
|
#########
|
||||||
# Set up an appropriate program prefix
|
# Set up an appropriate program prefix
|
||||||
@@ -412,7 +413,6 @@ if test "$config_TARGET_LIBS" != ""; then
|
|||||||
else
|
else
|
||||||
TARGET_LIBS=""
|
TARGET_LIBS=""
|
||||||
fi
|
fi
|
||||||
AC_SUBST(TARGET_LIBS)
|
|
||||||
|
|
||||||
##########
|
##########
|
||||||
# Figure out all the parameters needed to compile against Tcl.
|
# Figure out all the parameters needed to compile against Tcl.
|
||||||
@@ -571,6 +571,15 @@ else
|
|||||||
fi
|
fi
|
||||||
AC_SUBST(TARGET_READLINE_LIBS)
|
AC_SUBST(TARGET_READLINE_LIBS)
|
||||||
|
|
||||||
|
##########
|
||||||
|
# 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"
|
||||||
|
|
||||||
##########
|
##########
|
||||||
# Figure out where to get the READLINE header files.
|
# Figure out where to get the READLINE header files.
|
||||||
#
|
#
|
||||||
@@ -634,6 +643,11 @@ AC_CHECK_FUNC(usleep, [TARGET_CFLAGS="$TARGET_CFLAGS -DHAVE_USLEEP=1"])
|
|||||||
|
|
||||||
AC_CHECK_FUNC(fdatasync, [TARGET_CFLAGS="$TARGET_CFLAGS -DHAVE_FDATASYNC=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.
|
# Generate the output files.
|
||||||
#
|
#
|
||||||
|
13
main.mk
13
main.mk
@@ -42,7 +42,8 @@
|
|||||||
# LIBREADLINE Linker options needed by programs using readline() must
|
# LIBREADLINE Linker options needed by programs using readline() must
|
||||||
# link against.
|
# link against.
|
||||||
#
|
#
|
||||||
# ENCODING "UTF8" or "ISO8859"
|
# NAWK Nawk compatible awk program. Older (obsolete?) solaris
|
||||||
|
# systems need this to avoid using the original AT&T AWK.
|
||||||
#
|
#
|
||||||
# Once the macros above are defined, the rest of this make script will
|
# Once the macros above are defined, the rest of this make script will
|
||||||
# build the SQLite library and testing tools.
|
# build the SQLite library and testing tools.
|
||||||
@@ -171,7 +172,7 @@ all: sqlite3.h libsqlite3.a sqlite3$(EXE)
|
|||||||
#
|
#
|
||||||
last_change: $(SRC)
|
last_change: $(SRC)
|
||||||
cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \
|
cat $(SRC) | grep '$$Id: ' | sort +4 | tail -1 \
|
||||||
| awk '{print $$5,$$6}' >last_change
|
| $(NAWK) '{print $$5,$$6}' >last_change
|
||||||
|
|
||||||
libsqlite3.a: $(LIBOBJ)
|
libsqlite3.a: $(LIBOBJ)
|
||||||
$(AR) libsqlite3.a $(LIBOBJ)
|
$(AR) libsqlite3.a $(LIBOBJ)
|
||||||
@@ -179,7 +180,7 @@ libsqlite3.a: $(LIBOBJ)
|
|||||||
|
|
||||||
sqlite3$(EXE): $(TOP)/src/shell.c libsqlite3.a sqlite3.h
|
sqlite3$(EXE): $(TOP)/src/shell.c libsqlite3.a sqlite3.h
|
||||||
$(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) $(TOP)/src/shell.c \
|
$(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) $(TOP)/src/shell.c \
|
||||||
libsqlite3.a $(LIBREADLINE) $(THREADLIB)
|
libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
|
||||||
|
|
||||||
objects: $(LIBOBJ_ORIG)
|
objects: $(LIBOBJ_ORIG)
|
||||||
|
|
||||||
@@ -260,10 +261,10 @@ opcodes.o: opcodes.c
|
|||||||
$(TCCX) -c opcodes.c
|
$(TCCX) -c opcodes.c
|
||||||
|
|
||||||
opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
|
opcodes.c: opcodes.h $(TOP)/mkopcodec.awk
|
||||||
sort -n -b +2 opcodes.h | awk -f $(TOP)/mkopcodec.awk >opcodes.c
|
sort -n -b +2 opcodes.h | $(NAWK) -f $(TOP)/mkopcodec.awk >opcodes.c
|
||||||
|
|
||||||
opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
|
opcodes.h: parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
|
||||||
cat parse.h $(TOP)/src/vdbe.c | awk -f $(TOP)/mkopcodeh.awk >opcodes.h
|
cat parse.h $(TOP)/src/vdbe.c | $(NAWK) -f $(TOP)/mkopcodeh.awk >opcodes.h
|
||||||
|
|
||||||
os.o: $(TOP)/src/os.c $(HDR)
|
os.o: $(TOP)/src/os.c $(HDR)
|
||||||
$(TCCX) -c $(TOP)/src/os.c
|
$(TCCX) -c $(TOP)/src/os.c
|
||||||
@@ -302,7 +303,7 @@ select.o: $(TOP)/src/select.c $(HDR)
|
|||||||
|
|
||||||
sqlite3.h: $(TOP)/src/sqlite.h.in
|
sqlite3.h: $(TOP)/src/sqlite.h.in
|
||||||
sed -e s/--VERS--/`cat ${TOP}/VERSION`/ \
|
sed -e s/--VERS--/`cat ${TOP}/VERSION`/ \
|
||||||
-e s/--VERSION-NUMBER--/`cat ${TOP}/VERSION | sed 's/[^0-9]/ /g' | awk '{printf "%d%03d%03d",$$1,$$2,$$3}'`/ \
|
-e s/--VERSION-NUMBER--/`cat ${TOP}/VERSION | sed 's/[^0-9]/ /g' | $(NAWK) '{printf "%d%03d%03d",$$1,$$2,$$3}'`/ \
|
||||||
$(TOP)/src/sqlite.h.in >sqlite3.h
|
$(TOP)/src/sqlite.h.in >sqlite3.h
|
||||||
|
|
||||||
table.o: $(TOP)/src/table.c $(HDR)
|
table.o: $(TOP)/src/table.c $(HDR)
|
||||||
|
20
manifest
20
manifest
@@ -1,7 +1,7 @@
|
|||||||
C Bug\sfix\sin\sthe\sROWID\sgeneration\slogic\sof\sthe\sVDBE.\s\sI\sthink\sthis\nis\sa\sbenign\sbug\s-\sit\snever\scauses\sa\sreal\sfault.\s\sBut\sI\sam\snot\scertain.\s(CVS\s3008)
|
C Makefile\schanges\sso\sthat\sbuilds\swork\son\sSolaris.\s\sTicket\s#1604.\s(CVS\s3009)
|
||||||
D 2006-01-23T17:43:53
|
D 2006-01-23T18:06:52
|
||||||
F Makefile.in ab3ffd8d469cef4477257169b82810030a6bb967
|
F Makefile.in 53841eb72e9eeb6030a8ce28c2595a92f440fd10
|
||||||
F Makefile.linux-gcc aee18d8a05546dcf1888bd4547e442008a49a092
|
F Makefile.linux-gcc 74ba0eadf88748a9ce3fd03d2a3ede2e6715baec
|
||||||
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
|
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
|
||||||
F VERSION dd67e1a7f1eae49ac8becb23f04d064c3cae6a5d
|
F VERSION dd67e1a7f1eae49ac8becb23f04d064c3cae6a5d
|
||||||
F aclocal.m4 7daea4c35e88de30d5a3f6f7a2ab99720e803bbd
|
F aclocal.m4 7daea4c35e88de30d5a3f6f7a2ab99720e803bbd
|
||||||
@@ -12,14 +12,14 @@ F art/SQLite.gif 1bbb94484963f1382e27e1c5e86dd0c1061eba2b
|
|||||||
F art/SQLiteLogo3.tiff b9e6bf022ae939bc986cddb8ab99583ca1b02cb3
|
F art/SQLiteLogo3.tiff b9e6bf022ae939bc986cddb8ab99583ca1b02cb3
|
||||||
F config.guess 2103e94b15dc57112d7b9ee152c6fac5288895b4
|
F config.guess 2103e94b15dc57112d7b9ee152c6fac5288895b4
|
||||||
F config.sub 9bf686ec001ae7bc53f5b3563c90c62d4c6d48be
|
F config.sub 9bf686ec001ae7bc53f5b3563c90c62d4c6d48be
|
||||||
F configure 18b8afcd5b4df4408f19aef75c4f3fc4f0e65623 x
|
F configure 630b53719ed71ab8eb0a0c183443379bac32da92 x
|
||||||
F configure.ac e067b3abb59b29bdb4d784a8c9abb56a797c8da5
|
F configure.ac 49e15376e486660044532154eb2ab458f8410da3
|
||||||
F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
|
F contrib/sqlitecon.tcl 210a913ad63f9f991070821e599d600bd913e0ad
|
||||||
F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
|
F doc/lemon.html f0f682f50210928c07e562621c3b7e8ab912a538
|
||||||
F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
|
F doc/report1.txt a031aaf37b185e4fa540223cb516d3bccec7eeac
|
||||||
F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
|
F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
|
||||||
F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826
|
F ltmain.sh f6b283068efa69f06eb8aa1fe4bddfdbdeb35826
|
||||||
F main.mk f397e2343efec5f89f6481c694439e0f50c30ee1
|
F main.mk ff2b29a41a3862d44075194203f96192a6013871
|
||||||
F mkdll.sh f80661ba5f9e23fb5d6e3da532433da766c917f5
|
F mkdll.sh f80661ba5f9e23fb5d6e3da532433da766c917f5
|
||||||
F mkopcodec.awk bd46ad001c98dfbab07b1713cb8e692fa0e5415d
|
F mkopcodec.awk bd46ad001c98dfbab07b1713cb8e692fa0e5415d
|
||||||
F mkopcodeh.awk 071dbba4eaf56c8d643baf4604a043af35683316
|
F mkopcodeh.awk 071dbba4eaf56c8d643baf4604a043af35683316
|
||||||
@@ -344,7 +344,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
|
|||||||
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
|
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
|
||||||
F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
|
F www/version3.tcl a99cf5f6d8bd4d5537584a2b342f0fb9fa601d8b
|
||||||
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
|
F www/whentouse.tcl 97e2b5cd296f7d8057e11f44427dea8a4c2db513
|
||||||
P 2ef8b85db7607eb0989c5ecf49cc554fa13d894f
|
P dfe282386896967832826d130323c3ff11532873
|
||||||
R a1d12c715f1827a332c0072cf3355030
|
R f92eb95c24a3788f463c36b42d884897
|
||||||
U drh
|
U drh
|
||||||
Z 50fc36d002d7ace468096808a4516c0d
|
Z 147ff440aaacf1366a5ab3a300aa4908
|
||||||
|
@@ -1 +1 @@
|
|||||||
dfe282386896967832826d130323c3ff11532873
|
7addf70445d46cab148496ba2f27ab3764b70f66
|
Reference in New Issue
Block a user