X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=da651095c2f0d37634daf87321e7b4ae06776937;hb=351c00cd687e9192fd529ef5fa697eb78df167e3;hp=f760d4ece50e6d8f7398022919086d7bb769d4dc;hpb=84be346be700f903998c0f1ec0130bdc9291761c;p=deliverable%2Fbabeltrace.git

diff --git a/configure.ac b/configure.ac
index f760d4ece..da651095c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -125,12 +125,18 @@ AC_CHECK_FUNCS([ \
 	uname \
 ])
 
-# Check for MinGW32.
 MINGW32=no
-case $host in
-  *-*-mingw*)
-	MINGW32=yes;;
-esac
+DEFAULT_ENABLE_DEBUGINFO=yes
+AS_CASE([$host_os],
+  [solaris*|darwin*],
+    [
+	DEFAULT_ENABLE_DEBUGINFO=no
+    ],
+  [mingw*],
+    [
+	MINGW32=yes
+    ]
+)
 
 AM_CONDITIONAL([BABELTRACE_BUILD_WITH_MINGW], [test "x$MINGW32" = "xyes"])
 
@@ -232,16 +238,19 @@ else
 fi
 
 # Optional debuginfo feature (enabled by default)
-AC_ARG_ENABLE([debuginfo], [AC_HELP_STRING([--disable-debuginfo], [disable the debuginfo feature])], [], [enable_debuginfo=yes])
+AS_IF([test "x$DEFAULT_ENABLE_DEBUGINFO" = xyes],
+    [AC_ARG_ENABLE([debug-info], [AC_HELP_STRING([--disable-debug-info], [disable the debug-info feature (default on OS X and Solaris)])], [], [enable_debuginfo=yes])],
+    [AC_ARG_ENABLE([debug-info], [AC_HELP_STRING([--enable-debug-info], [enable the debug-info feature (default on Linux)])], [], [enable_debuginfo=no])]
+)
 
 AM_CONDITIONAL([ENABLE_DEBUGINFO], [test "x$enable_debuginfo" = xyes])
 AS_IF([test "x$enable_debuginfo" = xyes], [
             AC_CHECK_LIB([elf], [elf_version], [], [])
             AC_CHECK_LIB([dw], [dwarf_begin], [], [])
             AS_IF([test "x$ac_cv_lib_elf_elf_version" = xno || test "x$ac_cv_lib_dw_dwarf_begin" = xno],
-                        [AC_MSG_ERROR(Missing library from elfutils required for debuginfo. You can disable this feature with --disable-debuginfo.)]
+                        [AC_MSG_ERROR(Missing library from elfutils required for debug-info. You can disable this feature with --disable-debuginfo.)]
             )
-            AC_DEFINE([ENABLE_DEBUGINFO], [1], [Define to 1 if you enable the 'debuginfo' feature])
+            AC_DEFINE([ENABLE_DEBUGINFO], [1], [Define to 1 if you enable the 'debug-info' feature])
 ], [])
 
 pkg_modules="gmodule-2.0 >= 2.0.0"
@@ -295,6 +304,11 @@ AC_CONFIG_FILES([
 	babeltrace.pc
 	babeltrace-ctf.pc
 ])
+
 AC_CONFIG_FILES([tests/lib/test_seek_big_trace], [chmod +x tests/lib/test_seek_big_trace])
 AC_CONFIG_FILES([tests/lib/test_seek_empty_packet], [chmod +x tests/lib/test_seek_empty_packet])
+AC_CONFIG_FILES([tests/bin/test_trace_read], [chmod +x tests/bin/test_trace_read])
+AC_CONFIG_FILES([tests/bin/test_intersection], [chmod +x tests/bin/test_intersection])
+AC_CONFIG_FILES([tests/bin/test_packet_seq_num], [chmod +x tests/bin/test_packet_seq_num])
+
 AC_OUTPUT