Changeset 2083

Timestamp:

Oct 20, 2009, 12:33:30 AM (13 years ago)

Author:

Peter

Message:

Let user override the -D* flags that are set in configure. User can,
e.g, issue ./configure -DGSL_RANGE_CHECK=1 if he wants range check in
gsl but doesn't want the whole package that comes with --enable-debug.

serial in yat_add_flag.m4 is not updated because no point updating
serial multiple times between releases.

Location:

trunk

Files:

• configure.ac (modified) (1 diff)
• m4/ax_c_ifdef.m4 (added)
• m4/yat_add_flag.m4 (modified) (1 diff)

trunk/configure.ac

@@ -170 +170 @@
   YAT_CXX_ADD_FLAG([INTERNAL_CXXFLAGS], [-g -O])
 else
-  YAT_CPP_ADD_FLAG([INTERNAL_CPPFLAGS], [-DGSL_RANGE_CHECK_OFF -DNDEBUG])
+  # avoid defining GSL_RANGE_CHECK_OFF if GSL_RANGE_CHECK is already defined
+  AX_C_IFDEF([GSL_RANGE_CHECK],[],
+             [YAT_CPP_ADD_FLAG([INTERNAL_CPPFLAGS], [-DGSL_RANGE_CHECK_OFF])
+  YAT_CPP_ADD_FLAG([INTERNAL_CPPFLAGS], [-DNDEBUG])
   YAT_CXX_ADD_FLAG([INTERNAL_CXXFLAGS], [-O3])
 fi

trunk/m4/yat_add_flag.m4

@@ -46 +46 @@
 AC_DEFUN([YAT_CPP_ADD_FLAG],
 [
+  AC_REQUIRE([AC_PROG_SED])
   for yat_flag in $2; do
     # ignore flag if
     # 1) it is -I/usr/include
     # 2) it is -I/usr/local/include and CXX is g++
-    AS_IF([test "x$yat_flag" = "x-I/usr/include"],,
-          [test "x$CXX" = "xg++" && 
-           test "x$yat_flag" = "x-I/usr/local/include"],,
+    # 3) it is -D* and * is already defined
+    ignore=no
+    AS_CASE([$yat_flag],
+            [-I/usr/include], [ignore=yes],
+            [-I/usr/local/include],[AS_IF([test "x$CXX" = "xg++"],[ignore=yes])],
+            [-D*], [yat_def=`AS_ECHO([$yat_flag]) | $SED 's,^-D,,;s,=.*,,'`;
+                    AX_C_IFDEF([$yat_def],[ignore=yes])])
+
+    AS_VAR_IF([ignore], [no], 
           [YAT_FIND_STR([$1], [$yat_flag], , 
                         [AX_CXXCPP_CHECK_FLAG([$yat_flag], ,,