Fossil SCM

Add some diagnostic messages to the 'auto.def' file.

mistachkin 2014-06-14 21:06 trunk
Commit 166fa7e7329dea9a241549989bb3eb4f2cb4755e
Parent 1c528d3bb9e0742…
1 file changed +8
~ auto.def
M auto.def
+8
--- auto.def
+++ auto.def
@@ -71,33 +71,38 @@
7171
 define-append EXTRA_CFLAGS -D_XOPEN_SOURCE=500
7272
 }
7373
7474
 if {[opt-bool fossil-debug]} {
7575
 define-append EXTRA_CFLAGS -DFOSSIL_DEBUG
76
+ msg-result "Debugging support enabled"
7677
 }
7778
7879
 if {[opt-bool json]} {
7980
 # Reminder/FIXME (stephan): FOSSIL_ENABLE_JSON
8081
 # is required in the CFLAGS because json*.c
8182
 # have #ifdef guards around the whole file without
8283
 # reading config.h first.
8384
 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON
8485
 define FOSSIL_ENABLE_JSON
86
+ msg-result "JSON support enabled"
8587
 }
8688
8789
 if {[opt-bool with-th1-hooks]} {
8890
 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_TH1_HOOKS
8991
 define FOSSIL_ENABLE_TH1_HOOKS
92
+ msg-result "TH1 hooks support enabled"
9093
 }
9194
9295
 #if {[opt-bool markdown]} {
9396
 # # no-op. Markdown is now enabled by default.
97
+# msg-result "Markdown support enabled"
9498
 #}
9599
96100
 if {[opt-bool static]} {
97101
 # XXX: This will not work on all systems.
98102
 define-append EXTRA_LDFLAGS -static
103
+ msg-result "Trying to link statically"
99104
 }
100105
101106
 set tclpath [opt-val with-tcl]
102107
 if {$tclpath ne ""} {
103108
 set tclprivatestubs [opt-bool with-tcl-private-stubs]
@@ -229,10 +234,11 @@
229234
 set zlibpath [opt-val with-zlib]
230235
 if {$zlibpath ne ""} {
231236
 cc-with [list -cflags "-I$zlibpath -L$zlibpath"]
232237
 define-append EXTRA_CFLAGS -I$zlibpath
233238
 define-append EXTRA_LDFLAGS -L$zlibpath
239
+ msg-result "Using zlib from $zlibpath"
234240
 }
235241
 if {![cc-check-includes zlib.h] || ![cc-check-function-in-lib inflateEnd z]} {
236242
 user-error "zlib not found please install it or specify the location with --with-zlib"
237243
 }
238244
@@ -259,10 +265,11 @@
259265
 cc-check-function-in-lib iconv iconv
260266
261267
 # Check for getloadavg(), and if it doesn't exist, define FOSSIL_OMIT_LOAD_AVERAGE
262268
 if {![cc-check-functions getloadavg]} {
263269
 define FOSSIL_OMIT_LOAD_AVERAGE 1
270
+ msg-result "Load average support unavailable"
264271
 }
265272
266273
 # Check for getpassphrase() for Solaris 10 where getpass() truncates to 10 chars
267274
 if {![cc-check-functions getpassphrase]} {
268275
 # Haiku needs this
@@ -273,10 +280,11 @@
273280
 # Check for the FuseFS library
274281
 if {[opt-bool fusefs]} {
275282
 if {[cc-check-function-in-lib fuse_mount fuse]} {
276283
 define FOSSIL_HAVE_FUSEFS 1
277284
 define-append LIBS -lfuse
285
+ msg-result "FuseFS support enabled"
278286
 }
279287
 }
280288
281289
 make-template Makefile.in
282290
 make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
283291
--- auto.def
+++ auto.def
@@ -71,33 +71,38 @@
71 define-append EXTRA_CFLAGS -D_XOPEN_SOURCE=500
72 }
73
74 if {[opt-bool fossil-debug]} {
75 define-append EXTRA_CFLAGS -DFOSSIL_DEBUG
 
76 }
77
78 if {[opt-bool json]} {
79 # Reminder/FIXME (stephan): FOSSIL_ENABLE_JSON
80 # is required in the CFLAGS because json*.c
81 # have #ifdef guards around the whole file without
82 # reading config.h first.
83 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON
84 define FOSSIL_ENABLE_JSON
 
85 }
86
87 if {[opt-bool with-th1-hooks]} {
88 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_TH1_HOOKS
89 define FOSSIL_ENABLE_TH1_HOOKS
 
90 }
91
92 #if {[opt-bool markdown]} {
93 # # no-op. Markdown is now enabled by default.
 
94 #}
95
96 if {[opt-bool static]} {
97 # XXX: This will not work on all systems.
98 define-append EXTRA_LDFLAGS -static
 
99 }
100
101 set tclpath [opt-val with-tcl]
102 if {$tclpath ne ""} {
103 set tclprivatestubs [opt-bool with-tcl-private-stubs]
@@ -229,10 +234,11 @@
229 set zlibpath [opt-val with-zlib]
230 if {$zlibpath ne ""} {
231 cc-with [list -cflags "-I$zlibpath -L$zlibpath"]
232 define-append EXTRA_CFLAGS -I$zlibpath
233 define-append EXTRA_LDFLAGS -L$zlibpath
 
234 }
235 if {![cc-check-includes zlib.h] || ![cc-check-function-in-lib inflateEnd z]} {
236 user-error "zlib not found please install it or specify the location with --with-zlib"
237 }
238
@@ -259,10 +265,11 @@
259 cc-check-function-in-lib iconv iconv
260
261 # Check for getloadavg(), and if it doesn't exist, define FOSSIL_OMIT_LOAD_AVERAGE
262 if {![cc-check-functions getloadavg]} {
263 define FOSSIL_OMIT_LOAD_AVERAGE 1
 
264 }
265
266 # Check for getpassphrase() for Solaris 10 where getpass() truncates to 10 chars
267 if {![cc-check-functions getpassphrase]} {
268 # Haiku needs this
@@ -273,10 +280,11 @@
273 # Check for the FuseFS library
274 if {[opt-bool fusefs]} {
275 if {[cc-check-function-in-lib fuse_mount fuse]} {
276 define FOSSIL_HAVE_FUSEFS 1
277 define-append LIBS -lfuse
 
278 }
279 }
280
281 make-template Makefile.in
282 make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
283
--- auto.def
+++ auto.def
@@ -71,33 +71,38 @@
71 define-append EXTRA_CFLAGS -D_XOPEN_SOURCE=500
72 }
73
74 if {[opt-bool fossil-debug]} {
75 define-append EXTRA_CFLAGS -DFOSSIL_DEBUG
76 msg-result "Debugging support enabled"
77 }
78
79 if {[opt-bool json]} {
80 # Reminder/FIXME (stephan): FOSSIL_ENABLE_JSON
81 # is required in the CFLAGS because json*.c
82 # have #ifdef guards around the whole file without
83 # reading config.h first.
84 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_JSON
85 define FOSSIL_ENABLE_JSON
86 msg-result "JSON support enabled"
87 }
88
89 if {[opt-bool with-th1-hooks]} {
90 define-append EXTRA_CFLAGS -DFOSSIL_ENABLE_TH1_HOOKS
91 define FOSSIL_ENABLE_TH1_HOOKS
92 msg-result "TH1 hooks support enabled"
93 }
94
95 #if {[opt-bool markdown]} {
96 # # no-op. Markdown is now enabled by default.
97 # msg-result "Markdown support enabled"
98 #}
99
100 if {[opt-bool static]} {
101 # XXX: This will not work on all systems.
102 define-append EXTRA_LDFLAGS -static
103 msg-result "Trying to link statically"
104 }
105
106 set tclpath [opt-val with-tcl]
107 if {$tclpath ne ""} {
108 set tclprivatestubs [opt-bool with-tcl-private-stubs]
@@ -229,10 +234,11 @@
234 set zlibpath [opt-val with-zlib]
235 if {$zlibpath ne ""} {
236 cc-with [list -cflags "-I$zlibpath -L$zlibpath"]
237 define-append EXTRA_CFLAGS -I$zlibpath
238 define-append EXTRA_LDFLAGS -L$zlibpath
239 msg-result "Using zlib from $zlibpath"
240 }
241 if {![cc-check-includes zlib.h] || ![cc-check-function-in-lib inflateEnd z]} {
242 user-error "zlib not found please install it or specify the location with --with-zlib"
243 }
244
@@ -259,10 +265,11 @@
265 cc-check-function-in-lib iconv iconv
266
267 # Check for getloadavg(), and if it doesn't exist, define FOSSIL_OMIT_LOAD_AVERAGE
268 if {![cc-check-functions getloadavg]} {
269 define FOSSIL_OMIT_LOAD_AVERAGE 1
270 msg-result "Load average support unavailable"
271 }
272
273 # Check for getpassphrase() for Solaris 10 where getpass() truncates to 10 chars
274 if {![cc-check-functions getpassphrase]} {
275 # Haiku needs this
@@ -273,10 +280,11 @@
280 # Check for the FuseFS library
281 if {[opt-bool fusefs]} {
282 if {[cc-check-function-in-lib fuse_mount fuse]} {
283 define FOSSIL_HAVE_FUSEFS 1
284 define-append LIBS -lfuse
285 msg-result "FuseFS support enabled"
286 }
287 }
288
289 make-template Makefile.in
290 make-config-header autoconfig.h -auto {USE_* FOSSIL_*}
291

Keyboard Shortcuts

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