X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=configure.ac;h=b161828ab55f16c42a1ce3109e0c227da7587e9e;hp=f760d4ece50e6d8f7398022919086d7bb769d4dc;hb=d1ab320a342f31d729f7f943ddac8adabef2ab21;hpb=84be346be700f903998c0f1ec0130bdc9291761c

diff --git a/configure.ac b/configure.ac
index f760d4ec..b161828a 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,20 +238,21 @@ 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_DEFINE([ENABLE_DEBUGINFO], [1], [Define to 1 if you enable the 'debuginfo' feature])
+	    # Check if libelf and libdw are present
+	    AC_CHECK_LIB([elf], [elf_version], [], [AC_MSG_ERROR(Missing libdw (from elfutils >= 0.154) which is required by debug-info. You can disable this feature using --disable-debuginfo.)])
+	    AC_CHECK_LIB([dw], [dwarf_begin], [], [AC_MSG_ERROR(Missing libelf (from elfutils >= 0.154) which is required by debug-info. You can disable this feature using --disable-debuginfo.)])
+	    AX_LIB_ELFUTILS([0], [154], [], [AC_MSG_ERROR(elfutils >= 0.154 is required to use the debug-info feature. You can disable this feature using --disable-debuginfo.)])
+            AC_DEFINE([ENABLE_DEBUGINFO], [1], [Define to 1 if you enable the 'debug-info' feature])
 ], [])
 
-pkg_modules="gmodule-2.0 >= 2.0.0"
-PKG_CHECK_MODULES(GMODULE, [$pkg_modules])
+PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0])
 AC_SUBST(PACKAGE_LIBS)
 
 LIBS="$LIBS $GMODULE_LIBS"
@@ -295,6 +302,60 @@ 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
+
+#
+# Mini-report on what will be built.
+#
+
+PPRINT_INIT
+PPRINT_SET_INDENT(1)
+PPRINT_SET_TS(38)
+
+AS_ECHO
+AS_ECHO("${PPRINT_COLOR_BLDBLU}Babeltrace $PACKAGE_VERSION$PPRINT_COLOR_RST")
+AS_ECHO
+
+PPRINT_SUBTITLE([Features])
+
+# Target architecture we're building for.
+target_arch=$host_cpu
+[
+for f in $CFLAGS; do
+	if test $f = "-m32"; then
+		target_arch="32-bit"
+	elif test $f = "-m64"; then
+		target_arch="64-bit"
+	fi
+done
+]
+PPRINT_PROP_STRING([Target architecture], $target_arch)
+
+# python bindings enabled/disabled
+test "x$enable_python" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([Python bindings], $value)
+
+# python bindings doc enabled/disabled
+test "x$enable_python_bindings_doc" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([Python bindings doc], $value)
+
+# debug-info enabled/disabled
+test "x$enable_debuginfo" = "xyes" && value=1 || value=0
+PPRINT_PROP_BOOL([Debug information output], $value)
+
+
+report_bindir="`eval eval echo $bindir`"
+report_libdir="`eval eval echo $libdir`"
+
+# Print the bindir and libdir this `make install' will install into.
+AS_ECHO
+PPRINT_SUBTITLE([Install directories])
+PPRINT_PROP_STRING([Binaries], [$report_bindir])
+PPRINT_PROP_STRING([Libraries], [$report_libdir])