You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rivet-dev@tcl.apache.org by da...@apache.org on 2003/12/13 15:58:50 UTC
cvs commit: tcl-rivet/src configure.in.tcl
davidw 2003/12/13 06:58:50
Modified: . ChangeLog
src configure.in.tcl
Log:
* src/configure.in.tcl: Merge apxs and Tcl CFLAGS in order to include
what we need from both. Hopefully there won't be any conflicts.
Revision Changes Path
1.147 +6 -0 tcl-rivet/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /home/cvs/tcl-rivet/ChangeLog,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -r1.146 -r1.147
--- ChangeLog 27 Nov 2003 09:57:55 -0000 1.146
+++ ChangeLog 13 Dec 2003 14:58:50 -0000 1.147
@@ -1,3 +1,9 @@
+2003-12-13 David N. Welton <da...@dedasys.com>
+
+ * src/configure.in.tcl: Merge apxs and Tcl CFLAGS in order to
+ include what we need from both. Hopefully there won't be any
+ conflicts.
+
2003-11-27 David N. Welton <da...@dedasys.com>
* doc/rivet.xml: Added information about debugging Apache/Rivet.
1.7 +21 -6 tcl-rivet/src/configure.in.tcl
Index: configure.in.tcl
===================================================================
RCS file: /home/cvs/tcl-rivet/src/configure.in.tcl,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- configure.in.tcl 26 Aug 2003 10:34:32 -0000 1.6
+++ configure.in.tcl 13 Dec 2003 14:58:50 -0000 1.7
@@ -24,6 +24,25 @@
findapxs::FindAPXS
}
+# Merge apxs and Tcl CFLAGS.
+configure::test CFLAGS {
+ set apachecflags [exec $APXS -q CFLAGS]
+ if { $DEBUGSYMBOLS } {
+ set tclcflags [concat $TCL_CFLAGS_OPTIMIZE $TCL_CFLAGS_WARNING \
+ $TCL_EXTRA_CFLAGS]
+ } else {
+ set tclcflags [concat $TCL_CFLAGS_DEBUG $TCL_CFLAGS_OPTIMIZE \
+ $TCL_CFLAGS_WARNING $TCL_EXTRA_CFLAGS]
+ }
+ set res $apachecflags
+ foreach f $tclcflags {
+ if { [lsearch $apachecflags $f] == -1 } {
+ lappend res $f
+ }
+ }
+ set res
+}
+
configure::test TCL_THREADED {
set tmp "-DTCL_THREADED=[info exists tcl_platform(threaded)]"
}
@@ -45,11 +64,7 @@
}
configure::test COMPILE {
- if { $DEBUGSYMBOLS } {
- set tmp "$TCL_CC $TCL_CFLAGS_DEBUG $TCL_CFLAGS_OPTIMIZE $TCL_CFLAGS_WARNING $TCL_SHLIB_CFLAGS $INC $TCL_EXTRA_CFLAGS $TCL_THREADED -c"
- } else {
- set tmp "$TCL_CC $TCL_CFLAGS_OPTIMIZE $TCL_CFLAGS_WARNING $TCL_SHLIB_CFLAGS $INC $TCL_EXTRA_CFLAGS $TCL_THREADED -c"
- }
+ set tmp "$TCL_CC $CFLAGS $TCL_SHLIB_CFLAGS $INC $TCL_EXTRA_CFLAGS $TCL_THREADED -c"
}
configure::test CRYPT_LIB {
---------------------------------------------------------------------
To unsubscribe, e-mail: rivet-cvs-unsubscribe@tcl.apache.org
For additional commands, e-mail: rivet-cvs-help@tcl.apache.org