Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Make out-of-tree builds work as expected when using configure script (CVS 4893) |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
e2d05ea3c3e4a11bc1c0cc4c4403a445 |
User & Date: | mlcreech 2008-03-20 02:25:35.000 |
Context
2008-03-20
| ||
04:45 | Write the page-size into the first journal-header of each journal file. (CVS 4894) (check-in: 79f573cc7b user: danielk1977 tags: trunk) | |
02:25 | Make out-of-tree builds work as expected when using configure script (CVS 4893) (check-in: e2d05ea3c3 user: mlcreech tags: trunk) | |
00:32 | Fix the load-extension mechanism so that tests build with or without it. This check-in also includes prototypes for the new sqlite3_limit() interface, but no implementation. (CVS 4892) (check-in: bee38c2dda user: drh tags: trunk) | |
Changes
Changes to Makefile.in.
︙ | ︙ | |||
160 161 162 163 164 165 166 | $(TOP)/src/btmutex.c \ $(TOP)/src/btree.c \ $(TOP)/src/btree.h \ $(TOP)/src/btreeInt.h \ $(TOP)/src/build.c \ $(TOP)/src/callback.c \ $(TOP)/src/complete.c \ | < | 160 161 162 163 164 165 166 167 168 169 170 171 172 173 | $(TOP)/src/btmutex.c \ $(TOP)/src/btree.c \ $(TOP)/src/btree.h \ $(TOP)/src/btreeInt.h \ $(TOP)/src/build.c \ $(TOP)/src/callback.c \ $(TOP)/src/complete.c \ $(TOP)/src/date.c \ $(TOP)/src/delete.c \ $(TOP)/src/expr.c \ $(TOP)/src/fault.c \ $(TOP)/src/func.c \ $(TOP)/src/hash.c \ $(TOP)/src/hash.h \ |
︙ | ︙ | |||
230 231 232 233 234 235 236 237 238 239 240 241 242 243 | # SRC += \ keywordhash.h \ opcodes.c \ opcodes.h \ parse.c \ parse.h \ sqlite3.h # Source code for extensions # SRC += \ $(TOP)/ext/fts1/fts1.c \ $(TOP)/ext/fts1/fts1.h \ | > | 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 | # SRC += \ keywordhash.h \ opcodes.c \ opcodes.h \ parse.c \ parse.h \ config.h \ sqlite3.h # Source code for extensions # SRC += \ $(TOP)/ext/fts1/fts1.c \ $(TOP)/ext/fts1/fts1.h \ |
︙ | ︙ | |||
341 342 343 344 345 346 347 | $(TOP)/src/os.h \ $(TOP)/src/os_common.h \ $(TOP)/src/sqlite3ext.h \ $(TOP)/src/sqliteInt.h \ $(TOP)/src/vdbe.h \ $(TOP)/src/vdbeInt.h \ parse.h \ | | | 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 | $(TOP)/src/os.h \ $(TOP)/src/os_common.h \ $(TOP)/src/sqlite3ext.h \ $(TOP)/src/sqliteInt.h \ $(TOP)/src/vdbe.h \ $(TOP)/src/vdbeInt.h \ parse.h \ config.h # Header files used by extensions # HDR += \ $(TOP)/ext/fts1/fts1.h \ $(TOP)/ext/fts1/fts1_hash.h \ $(TOP)/ext/fts1/fts1_tokenizer.h |
︙ | ︙ |
Added config.h.
> > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | /* ** 2008 March 6 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** Default configuration header in case the 'configure' script is not used ** ** @(#) $Id: config.h,v 1.1 2008/03/20 02:25:35 mlcreech Exp $ */ #ifndef _CONFIG_H_ #define _CONFIG_H_ /* We do nothing here, since no assumptions are made by default */ #endif |
Added config.h.in.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | /* ** 2008 March 6 ** ** The author disclaims copyright to this source code. In place of ** a legal notice, here is a blessing: ** ** May you do good and not evil. ** May you find forgiveness for yourself and forgive others. ** May you share freely, never taking more than you give. ** ************************************************************************* ** Configuration header template to be filled in by 'configure' script ** ** @(#) $Id: config.h.in,v 1.1 2008/03/20 02:25:35 mlcreech Exp $ */ #ifndef _CONFIG_H_ #define _CONFIG_H_ /***************************** ** Data types *****************************/ /* Define as 1 if you have the int8_t type */ #undef HAVE_INT8_T /* Define as 1 if you have the int16_t type */ #undef HAVE_INT16_T /* Define as 1 if you have the int32_t type */ #undef HAVE_INT32_T /* Define as 1 if you have the int64_t type */ #undef HAVE_INT64_T /* Define as 1 if you have the intptr_t type */ #undef HAVE_INTPTR_T /* Define as 1 if you have the uint8_t type */ #undef HAVE_UINT8_T /* Define as 1 if you have the uint16_t type */ #undef HAVE_UINT16_T /* Define as 1 if you have the uint32_t type */ #undef HAVE_UINT32_T /* Define as 1 if you have the uint64_t type */ #undef HAVE_UINT64_T /* Define as 1 if you have the uintptr_t type */ #undef HAVE_UINTPTR_T /***************************** ** Header Files *****************************/ /* Define as 1 if you have the sys/types.h header */ #undef HAVE_SYS_TYPES_H /* Define as 1 if you have the stdlib.h header */ #undef HAVE_STDLIB_H /* Define as 1 if you have the stdint.h header */ #undef HAVE_STDINT_H /* Define as 1 if you have the inttypes.h header */ #undef HAVE_INTTYPES_H /***************************** ** Functions *****************************/ /* Define as 1 if you have the usleep() function */ #undef HAVE_USLEEP /* Define as 1 if you have the fdatasync() function */ #undef HAVE_FDATASYNC /* Define as 1 if you have the gmtime_r() function */ #undef HAVE_GMTIME_R /* Define as 1 if you have the localtime_r() function */ #undef HAVE_LOCALTIME_R /* End of header */ #endif |
Changes to configure.
︙ | ︙ | |||
1941 1942 1943 1944 1945 1946 1947 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu # The following RCS revision string applies to configure.in | | | 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 | ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu # The following RCS revision string applies to configure.in # $Revision: 1.56 $ ######### # Programs needed # # Check whether --enable-shared was given. if test "${enable_shared+set}" = set; then enableval=$enable_shared; p=${PACKAGE-default} |
︙ | ︙ | |||
20819 20820 20821 20822 20823 20824 20825 | LOADEXTENSION_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" fi ######### # Output the config header | | | 20819 20820 20821 20822 20823 20824 20825 20826 20827 20828 20829 20830 20831 20832 20833 | LOADEXTENSION_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" fi ######### # Output the config header ac_config_headers="$ac_config_headers config.h" ######### # Generate the output files. # ac_config_files="$ac_config_files Makefile sqlite3.pc" |
︙ | ︙ | |||
21381 21382 21383 21384 21385 21386 21387 | cat >>$CONFIG_STATUS <<\_ACEOF # Handling of arguments. for ac_config_target in $ac_config_targets do case $ac_config_target in | | | 21381 21382 21383 21384 21385 21386 21387 21388 21389 21390 21391 21392 21393 21394 21395 | cat >>$CONFIG_STATUS <<\_ACEOF # Handling of arguments. for ac_config_target in $ac_config_targets do case $ac_config_target in "config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;; "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; "sqlite3.pc") CONFIG_FILES="$CONFIG_FILES sqlite3.pc" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac |
︙ | ︙ |
Changes to configure.ac.
︙ | ︙ | |||
88 89 90 91 92 93 94 | # the corresponding code. # 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 | | | 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 | # the corresponding code. # 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.42 $ ######### # Programs needed # AC_PROG_LIBTOOL AC_PROG_INSTALL AC_PROG_AWK |
︙ | ︙ | |||
611 612 613 614 615 616 617 | LOADEXTENSION_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" fi AC_SUBST(LOADEXTENSION_FLAGS) ######### # Output the config header | | | 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 | LOADEXTENSION_FLAGS="-DSQLITE_OMIT_LOAD_EXTENSION=1" fi AC_SUBST(LOADEXTENSION_FLAGS) ######### # Output the config header AC_CONFIG_HEADERS(config.h) ######### # Generate the output files. # AC_SUBST(BUILD_CFLAGS) AC_OUTPUT([ Makefile sqlite3.pc ]) |
Changes to main.mk.
︙ | ︙ | |||
40 41 42 43 44 45 46 | # # Once the macros above are defined, the rest of this make script will # build the SQLite library and testing tools. ################################################################################ # This is how we compile # | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | # # Once the macros above are defined, the rest of this make script will # build the SQLite library and testing tools. ################################################################################ # This is how we compile # TCCX = $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP) # Object files for the SQLite library. # LIBOBJ+= alter.o analyze.o attach.o auth.o bitvec.o btmutex.o btree.o build.o \ callback.o complete.o date.o delete.o \ expr.o fault.o func.o hash.o insert.o journal.o loadext.o \ main.o malloc.o mem1.o mem2.o mem3.o mem4.o mem5.o \ |
︙ | ︙ | |||
89 90 91 92 93 94 95 | $(TOP)/src/btmutex.c \ $(TOP)/src/btree.c \ $(TOP)/src/btree.h \ $(TOP)/src/btreeInt.h \ $(TOP)/src/build.c \ $(TOP)/src/callback.c \ $(TOP)/src/complete.c \ | | | 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | $(TOP)/src/btmutex.c \ $(TOP)/src/btree.c \ $(TOP)/src/btree.h \ $(TOP)/src/btreeInt.h \ $(TOP)/src/build.c \ $(TOP)/src/callback.c \ $(TOP)/src/complete.c \ $(TOP)/config.h \ $(TOP)/src/date.c \ $(TOP)/src/delete.c \ $(TOP)/src/expr.c \ $(TOP)/src/fault.c \ $(TOP)/src/func.c \ $(TOP)/src/hash.c \ $(TOP)/src/hash.h \ |
︙ | ︙ | |||
255 256 257 258 259 260 261 | parse.h \ sqlite3.h \ $(TOP)/src/sqlite3ext.h \ $(TOP)/src/sqliteInt.h \ $(TOP)/src/sqliteLimit.h \ $(TOP)/src/vdbe.h \ $(TOP)/src/vdbeInt.h \ | | | 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 | parse.h \ sqlite3.h \ $(TOP)/src/sqlite3ext.h \ $(TOP)/src/sqliteInt.h \ $(TOP)/src/sqliteLimit.h \ $(TOP)/src/vdbe.h \ $(TOP)/src/vdbeInt.h \ $(TOP)/config.h # Header files used by extensions # EXTHDR += \ $(TOP)/ext/fts1/fts1.h \ $(TOP)/ext/fts1/fts1_hash.h \ $(TOP)/ext/fts1/fts1_tokenizer.h |
︙ | ︙ | |||
318 319 320 321 322 323 324 | # Rules to build the LEMON compiler generator # lemon: $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c $(BCC) -o lemon $(TOP)/tool/lemon.c cp $(TOP)/tool/lempar.c . | < < < < < > > > > > | 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 | # Rules to build the LEMON compiler generator # lemon: $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c $(BCC) -o lemon $(TOP)/tool/lemon.c cp $(TOP)/tool/lempar.c . # Rules to build individual *.o files from generated *.c files. This # applies to: # # parse.o # opcodes.o # %.o: %.c $(HDR) $(TCCX) -c $< # Rules to build individual *.o files from files in the src directory. # %.o: $(TOP)/src/%.c $(HDR) $(TCCX) -c $< tclsqlite.o: $(TOP)/src/tclsqlite.c $(HDR) $(TCCX) $(TCL_FLAGS) -c $(TOP)/src/tclsqlite.c |
︙ | ︙ |
Deleted src/config.h.
|
| < < < < < < < < < < < < < < < < < < < < < |
Deleted src/config.h.in.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |