X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=configure.ac;h=e995e441879970b38cba8d0789dbc16616662226;hb=989e97b62ba6be57ec9940b3eda0da09a20b3914;hp=e8966b8a747b3bc28907c936902d6d7b018a2c33;hpb=0c305c6ef8e4e896a963a71eb9eb44639ae203ea;p=babeltrace.git

diff --git a/configure.ac b/configure.ac
index e8966b8a..e995e441 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ([2.50])
 m4_define([bt_version_major], [2])
 m4_define([bt_version_minor], [0])
 m4_define([bt_version_patch], [0])
-m4_define([bt_version_extra], [-pre1])
+m4_define([bt_version_extra], [-pre3])
 m4_define([bt_version], bt_version_major[.]bt_version_minor[.]bt_version_patch[]bt_version_extra)
 AC_INIT([babeltrace],bt_version,[jeremie dot galarneau at efficios dot com])
 
@@ -10,7 +10,7 @@ AC_INIT([babeltrace],bt_version,[jeremie dot galarneau at efficios dot com])
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
 AC_SUBST([BABELTRACE_LIBRARY_VERSION], bt_version_major[:]bt_version_minor[:]bt_version_patch)
 
-AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_HEADERS([include/config.h])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
 
@@ -22,7 +22,7 @@ AC_DEFINE([BT_VERSION_EXTRA], ["]bt_version_extra["], [Babeltrace library extra
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc])
 AM_MAINTAINER_MODE([enable])
 
 # Enable silent rules if available (Introduced in AM 1.11)
@@ -50,9 +50,6 @@ AS_IF([test "x$ax_cv___attribute__" = "xyes"],
 	[AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
 
 AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
-LIBS="$PTHREAD_LIBS $LIBS"
-CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
-CC="$PTHREAD_CC"
 
 # Check linker option
 AX_APPEND_LINK_FLAGS([-Wl,--no-as-needed], [LD_NO_AS_NEEDED])
@@ -62,6 +59,7 @@ AC_HEADER_STDBOOL
 AC_CHECK_HEADERS([ \
 	fcntl.h \
 	float.h \
+	ftw.h \
 	libintl.h \
 	limits.h \
 	malloc.h \
@@ -94,7 +92,7 @@ if test ! -f "$srcdir/plugins/ctf/common/metadata/lexer.c"; then
 fi
 
 
-AM_PATH_GLIB_2_0(2.22.0, ,AC_MSG_ERROR([glib is required in order to compile BabelTrace - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
+AM_PATH_GLIB_2_0(2.22.0, ,AC_MSG_ERROR([glib is required in order to compile BabelTrace - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule-no-export)
 
 # Check what libraries are required on this platform to link sockets programs.
 AX_LIB_SOCKET_NSL
@@ -117,14 +115,11 @@ AC_TYPE_UINT8_T
 # Checks for library functions.
 AC_FUNC_ALLOCA
 AC_FUNC_FORK
-AC_FUNC_MALLOC
 AC_FUNC_MKTIME
 AC_FUNC_MMAP
-AC_FUNC_REALLOC
 AC_FUNC_STRERROR_R
 AC_CHECK_FUNCS([ \
 	atexit \
-	dirfd \
 	dup2 \
 	ftruncate \
 	gethostbyname \
@@ -151,6 +146,10 @@ AC_CHECK_FUNCS([ \
 	uname \
 ])
 
+# AC_FUNC_MALLOC causes problems when cross-compiling.
+#AC_FUNC_MALLOC
+#AC_FUNC_REALLOC
+
 MINGW32=no
 DEFAULT_ENABLE_DEBUG_INFO=yes
 LT_NO_UNDEFINED=""
@@ -159,6 +158,11 @@ AS_CASE([$host_os],
     [
 	DEFAULT_ENABLE_DEBUG_INFO=no
     ],
+  [cygwin*],
+    [
+	DEFAULT_ENABLE_DEBUG_INFO=no
+	LT_NO_UNDEFINED="-no-undefined"
+    ],
   [mingw*],
     [
 	MINGW32=yes
@@ -181,8 +185,6 @@ AC_CHECK_FUNCS([uuid_generate],
   # for libuuid, or uuid support in the C-library.
   PKG_CHECK_MODULES([UUID], [uuid],
   [
-    LIBS="${UUID_LIBS} ${LIBS}"
-    CFLAGS="${CFLAGS} ${UUID_CFLAGS}"
     AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_LIBUUID], 1, [Has libuuid support.])
     link_with_libuuid=yes
   ],
@@ -234,13 +236,6 @@ AC_CHECK_LIB([c], [posix_fallocate],
 ]
 )
 
-# Check for faccessat
-AC_CHECK_LIB([c], [faccessat],
-[
-	AC_DEFINE_UNQUOTED([BABELTRACE_HAVE_FACCESSAT], 1, [Has faccessat support.])
-]
-)
-
 AC_CHECK_LIB([popt], [poptGetContext], [],
         [AC_MSG_ERROR([Cannot find popt.])]
 )
@@ -406,7 +401,7 @@ AS_IF([test "x$BUILT_IN_PYTHON_PLUGIN_SUPPORT" != x], [
 ])
 AM_CONDITIONAL([BUILT_IN_PYTHON_PLUGIN_SUPPORT], [test "x$built_in_python_plugin_support" = "xyes"])
 
-PKG_CHECK_MODULES(GMODULE, [gmodule-2.0 >= 2.0.0])
+PKG_CHECK_MODULES(GMODULE, [gmodule-no-export-2.0 >= 2.0.0])
 
 # Logging
 AC_ARG_VAR([BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level for Babeltrace program, library, and plugins (VERBOSE, DEBUG, INFO, WARN, ERROR (default), FATAL, or NONE)])
@@ -416,12 +411,13 @@ AS_IF([test "$BABELTRACE_MINIMAL_LOG_LEVEL" != "VERBOSE" && test "$BABELTRACE_MI
 ])
 AC_DEFINE_UNQUOTED([BT_LOG_LEVEL], [BT_LOG_$BABELTRACE_MINIMAL_LOG_LEVEL], [Minimal log level])
 
-LIBS="$LIBS $GMODULE_LIBS"
-PACKAGE_CFLAGS="$GMODULE_CFLAGS -Wall -Wformat"
-AC_SUBST(PACKAGE_CFLAGS)
+AM_CFLAGS="-Wall -Wformat $PTHREAD_CFLAGS $GLIB_CFLAGS"
+AC_SUBST(AM_CFLAGS)
+
+AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -include config.h"
+AC_SUBST(AM_CPPFLAGS)
 
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/include -include config.h"
-AC_SUBST(DEFAULT_INCLUDES)
+LIBS="$GLIB_LIBS"
 
 babeltraceincludedir="${includedir}/babeltrace"
 AC_SUBST(babeltraceincludedir)
@@ -441,7 +437,7 @@ AC_SUBST(babeltracepluginincludedir)
 babeltracegraphincludedir="${includedir}/babeltrace/graph"
 AC_SUBST(babeltracegraphincludedir)
 
-program_transform_name="s&babeltrace\.bin&babeltrace&;$program_transform_name"
+program_transform_name="s&babeltrace\.bin&babeltrace&;s&babeltrace-log\.bin&babeltrace-log&;$program_transform_name"
 AC_SUBST(program_transform_name)
 
 # check for Doxygen
@@ -520,9 +516,11 @@ AC_CONFIG_FILES([
 	plugins/ctf/fs-sink/Makefile
 	plugins/ctf/lttng-live/Makefile
 	plugins/text/Makefile
+  plugins/text/dmesg/Makefile
 	plugins/text/pretty/Makefile
 	plugins/utils/Makefile
 	plugins/utils/dummy/Makefile
+	plugins/utils/counter/Makefile
 	plugins/utils/trimmer/Makefile
 	plugins/utils/muxer/Makefile
 	python-plugin-provider/Makefile