Fossil SCM

Small changes to autosetup build system so that the --disable-internal-sqlite switch works and is compatible with BSD make.

dan 2011-07-14 10:24 trunk
Commit 734af429e34905a10fb497829c3fd83a3e4c0b58
Parent 35f80429f2653f7…
4 files changed +2 -2 +7 +9 -1 +9 -1
~ GNUmakefile.in ~ auto.def ~ src/main.mk ~ src/makemake.tcl
M GNUmakefile.in
+2 -2
--- GNUmakefile.in
+++ GNUmakefile.in
@@ -34,12 +34,12 @@
3434
 #
3535
 TCLSH = tclsh
3636
3737
 LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
3838
 TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
39
-INSTALLDIR := $(DESTDIR)@prefix@/bin
40
-USE_SYSTEM_SQLITE := @USE_SYSTEM_SQLITE@
39
+INSTALLDIR = $(DESTDIR)@prefix@/bin
40
+USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
4141
4242
 include $(SRCDIR)/main.mk
4343
4444
 distclean: clean
4545
 rm -f autoconfig.h config.log GNUmakefile
4646
--- GNUmakefile.in
+++ GNUmakefile.in
@@ -34,12 +34,12 @@
34 #
35 TCLSH = tclsh
36
37 LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
38 TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
39 INSTALLDIR := $(DESTDIR)@prefix@/bin
40 USE_SYSTEM_SQLITE := @USE_SYSTEM_SQLITE@
41
42 include $(SRCDIR)/main.mk
43
44 distclean: clean
45 rm -f autoconfig.h config.log GNUmakefile
46
--- GNUmakefile.in
+++ GNUmakefile.in
@@ -34,12 +34,12 @@
34 #
35 TCLSH = tclsh
36
37 LIB = @LDFLAGS@ @EXTRA_LDFLAGS@ @LIBS@
38 TCC += @EXTRA_CFLAGS@ @CPPFLAGS@ @CFLAGS@ -DHAVE_AUTOCONFIG_H
39 INSTALLDIR = $(DESTDIR)@prefix@/bin
40 USE_SYSTEM_SQLITE = @USE_SYSTEM_SQLITE@
41
42 include $(SRCDIR)/main.mk
43
44 distclean: clean
45 rm -f autoconfig.h config.log GNUmakefile
46
M auto.def
+7
--- auto.def
+++ auto.def
@@ -27,11 +27,18 @@
2727
 define EXTRA_LDFLAGS ""
2828
 define USE_SYSTEM_SQLITE ""
2929
3030
 if {![opt-bool internal-sqlite]} {
3131
 if {![cc-check-function-in-lib sqlite3_open sqlite3]} {
32
+ if {![cc-check-function-in-lib sqlite3_open sqlite3 {-ldl}]} {
3233
 user-error "system sqlite3 not found"
34
+ } else {
35
+ # On some systems (slackware), the libsqlite3.so file cannot be
36
+ # linked without also specifying -ldl. This is a bug in the
37
+ # distribution.
38
+ define-append EXTRA_LDFLAGS -ldl
39
+ }
3340
 }
3441
 define USE_SYSTEM_SQLITE 1
3542
 }
3643
3744
 if {[opt-bool fossil-debug]} {
3845
--- auto.def
+++ auto.def
@@ -27,11 +27,18 @@
27 define EXTRA_LDFLAGS ""
28 define USE_SYSTEM_SQLITE ""
29
30 if {![opt-bool internal-sqlite]} {
31 if {![cc-check-function-in-lib sqlite3_open sqlite3]} {
 
32 user-error "system sqlite3 not found"
 
 
 
 
 
 
33 }
34 define USE_SYSTEM_SQLITE 1
35 }
36
37 if {[opt-bool fossil-debug]} {
38
--- auto.def
+++ auto.def
@@ -27,11 +27,18 @@
27 define EXTRA_LDFLAGS ""
28 define USE_SYSTEM_SQLITE ""
29
30 if {![opt-bool internal-sqlite]} {
31 if {![cc-check-function-in-lib sqlite3_open sqlite3]} {
32 if {![cc-check-function-in-lib sqlite3_open sqlite3 {-ldl}]} {
33 user-error "system sqlite3 not found"
34 } else {
35 # On some systems (slackware), the libsqlite3.so file cannot be
36 # linked without also specifying -ldl. This is a bug in the
37 # distribution.
38 define-append EXTRA_LDFLAGS -ldl
39 }
40 }
41 define USE_SYSTEM_SQLITE 1
42 }
43
44 if {[opt-bool fossil-debug]} {
45
M src/main.mk
+9 -1
--- src/main.mk
+++ src/main.mk
@@ -293,11 +293,19 @@
293293
 $(TCLSH) test/tester.tcl $(APPNAME)
294294
295295
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
296296
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
297297
298
-EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
298
+# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
299
+# to 1. If it is set to 1, then there is no need to build or link
300
+# the sqlite3.o object. Instead, the system sqlite will be linked
301
+# using -lsqlite3.
302
+SQLITE3_OBJ.1 =
303
+SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
304
+SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
305
+
306
+EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
299307
300308
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
301309
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
302310
303311
 # This rule prevents make from using its default rules to try build
304312
--- src/main.mk
+++ src/main.mk
@@ -293,11 +293,19 @@
293 $(TCLSH) test/tester.tcl $(APPNAME)
294
295 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
296 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
297
298 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
 
 
 
 
 
 
 
 
299
300 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
301 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
302
303 # This rule prevents make from using its default rules to try build
304
--- src/main.mk
+++ src/main.mk
@@ -293,11 +293,19 @@
293 $(TCLSH) test/tester.tcl $(APPNAME)
294
295 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
296 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
297
298 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
299 # to 1. If it is set to 1, then there is no need to build or link
300 # the sqlite3.o object. Instead, the system sqlite will be linked
301 # using -lsqlite3.
302 SQLITE3_OBJ.1 =
303 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
304 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
305
306 EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
307
308 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
309 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB)
310
311 # This rule prevents make from using its default rules to try build
312
M src/makemake.tcl
+9 -1
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -190,12 +190,20 @@
190190
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
191191
 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
192192
 $(SRCDIR)/../manifest \
193193
 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
194194
195
+# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
196
+# to 1. If it is set to 1, then there is no need to build or link
197
+# the sqlite3.o object. Instead, the system sqlite will be linked
198
+# using -lsqlite3.
199
+SQLITE3_OBJ.1 =
200
+SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
201
+SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
202
+
195203
 EXTRAOBJ = \
196
- $(OBJDIR)/sqlite3.o \
204
+ $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
197205
 $(OBJDIR)/shell.o \
198206
 $(OBJDIR)/th.o \
199207
 $(OBJDIR)/th_lang.o
200208
201209
 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
202210
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -190,12 +190,20 @@
190 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
191 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
192 $(SRCDIR)/../manifest \
193 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
194
 
 
 
 
 
 
 
 
195 EXTRAOBJ = \
196 $(OBJDIR)/sqlite3.o \
197 $(OBJDIR)/shell.o \
198 $(OBJDIR)/th.o \
199 $(OBJDIR)/th_lang.o
200
201 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
202
--- src/makemake.tcl
+++ src/makemake.tcl
@@ -190,12 +190,20 @@
190 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion
191 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
192 $(SRCDIR)/../manifest \
193 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
194
195 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
196 # to 1. If it is set to 1, then there is no need to build or link
197 # the sqlite3.o object. Instead, the system sqlite will be linked
198 # using -lsqlite3.
199 SQLITE3_OBJ.1 =
200 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
201 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
202
203 EXTRAOBJ = \
204 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
205 $(OBJDIR)/shell.o \
206 $(OBJDIR)/th.o \
207 $(OBJDIR)/th_lang.o
208
209 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ)
210

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button