X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=adccd1a32d0834f74a89a5c89bfc0e4ab447b529;hb=cf1edabde5ccde390704f76d7a1bf9edfd964660;hp=e9c034a5d6b417d4ac5e1dfa611e6b7209452aa5;hpb=c2e0a887df6943d8c3cd59409337de36835983b1;p=lttv.git

diff --git a/configure.ac b/configure.ac
index e9c034a5..adccd1a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.57)
-AC_INIT([lttv], [0.12.17-01072009], [ltt-dev@lists.casi.polymtl.ca])
+AC_INIT([lttv], [0.12.32-05032010], [ltt-dev@lists.casi.polymtl.ca])
 AM_INIT_AUTOMAKE
 AM_CONFIG_HEADER(config.h)
 AM_PROG_LIBTOOL
@@ -64,12 +64,33 @@ AC_SYS_LARGEFILE
 AC_PROG_CC
 
 # Checks for libraries.
-AC_CHECK_LIB([popt], [poptGetNextOpt], POPT_LIBS="-lpopt",AC_MSG_ERROR([libpopt is required in order to compile LinuxTraceToolkit])  )
-#AC_CHECK_LIB([m], [round], M_LIBS="-lm",AC_MSG_ERROR([Mathematical libraries are missing.])  )
-
-AC_CHECK_LIB([util], [forkpty], UTIL_LIBS="-lutil", AC_MSG_ERROR([
-libutil is required in order to compile LinuxTraceToolkit]))
-
+AC_CHECK_LIB([popt], [poptGetNextOpt], POPT_LIBS="-lpopt",
+	AC_MSG_ERROR([libpopt is required in order to compile LinuxTraceToolkit]))
+AC_CHECK_LIB([m], [round], M_LIBS="-lm",
+	AC_MSG_ERROR([Mathematical libraries are missing.]))
+AC_CHECK_LIB([util], [forkpty], UTIL_LIBS="-lutil",
+	AC_MSG_ERROR([libutil is required in order to compile LinuxTraceToolkit]))
+
+AC_ARG_WITH([glpk],
+	[AS_HELP_STRING([--with-glpk@<:@=DIR@:>@],
+		[support trace synchronization accuracy calculation (needs glpk)
+			@<:@default=check@:>@])],
+	[],
+	[with_glpk=check])
+
+GLPK_LIBS=
+	AS_IF([test "x$with_glpk" != xno],
+		[if test "x$with_glpk" != xyes -a -d "$with_glpk"; then
+			LDFLAGS="$LDFLAGS -L$with_glpk"
+		fi
+		AC_CHECK_LIB([glpk], [glp_create_prob],
+			[AC_SUBST([GLPK_LIBS], ["-lglpk"])
+			AC_DEFINE([HAVE_LIBGLPK], [1], [Define if you have libglpk])],
+			[if test "x$with_glpk" != xcheck; then
+				AC_MSG_FAILURE(
+					[--with-glpk was given, but test for glpk failed])
+			fi],
+		-lm)])
 
 # pthread for gdb with dlopen().
 AC_CHECK_LIB(pthread, pthread_join, [], AC_MSG_ERROR([LinuxThreads is required in order to make sure gdb works fine with lttv-gui]))
@@ -135,7 +156,7 @@ fi
 pkg_modules="gobject-2.0 >= 2.0.0"
 PKG_CHECK_MODULES(GOBJECT, [$pkg_modules])
 
-LIBS="$LIBS $GTK_LIBS $GOBJECT_LIBS $GMODULE_LIBS"
+LIBS="$LIBS $M_LIBS $GTK_LIBS $GOBJECT_LIBS $GMODULE_LIBS"
 PACKAGE_CFLAGS="$GTK_CFLAGS $GOBJECT_CFLAGS $GMODULE_CFLAGS -Wall -Wformat"
 MODULE_CFLAGS="$PACKAGE_CFLAGS -fvisibility=hidden"
 MODULE_LDFLAGS="-module -avoid-version"
@@ -194,30 +215,31 @@ AC_SUBST(lttctlincludedir)
 		 #lttv/modules/gui/tutorial/Makefile
 		 #lttv/modules/gui/diskperformance/Makefile
 AC_CONFIG_FILES([Makefile
-		 lttv/Makefile
-		 lttv/lttv/Makefile
-		 lttv/modules/Makefile
-		 lttv/modules/text/Makefile
-		 lttv/modules/gui/Makefile
-		 lttv/modules/gui/lttvwindow/Makefile
-		 lttv/modules/gui/interrupts/Makefile
-		 lttv/modules/gui/lttvwindow/lttvwindow/Makefile
-		 lttv/modules/gui/lttvwindow/pixmaps/Makefile
-		 lttv/modules/gui/controlflow/Makefile
-		 lttv/modules/gui/detailedevents/Makefile
-		 lttv/modules/gui/statistics/Makefile
-     		 lttv/modules/gui/histogram/Makefile
-                 lttv/modules/gui/filter/Makefile
-                 lttv/modules/gui/tracecontrol/Makefile
-                 lttv/modules/gui/resourceview/Makefile
-		 ltt/Makefile
-     doc/Makefile
-     doc/developer/Makefile
-     doc/developer/developer_guide/Makefile
-     doc/developer/developer_guide/docbook/Makefile
-     doc/developer/developer_guide/html/Makefile
-     doc/user/Makefile
-     doc/user/user_guide/Makefile
-     doc/user/user_guide/docbook/Makefile
-     doc/user/user_guide/html/Makefile])
+	lttv/Makefile
+	lttv/lttv/Makefile
+	lttv/lttv/sync/Makefile
+	lttv/modules/Makefile
+	lttv/modules/text/Makefile
+	lttv/modules/gui/Makefile
+	lttv/modules/gui/lttvwindow/Makefile
+	lttv/modules/gui/interrupts/Makefile
+	lttv/modules/gui/lttvwindow/lttvwindow/Makefile
+	lttv/modules/gui/lttvwindow/pixmaps/Makefile
+	lttv/modules/gui/controlflow/Makefile
+	lttv/modules/gui/detailedevents/Makefile
+	lttv/modules/gui/statistics/Makefile
+	lttv/modules/gui/histogram/Makefile
+	lttv/modules/gui/filter/Makefile
+	lttv/modules/gui/tracecontrol/Makefile
+	lttv/modules/gui/resourceview/Makefile
+	ltt/Makefile
+	doc/Makefile
+	doc/developer/Makefile
+	doc/developer/developer_guide/Makefile
+	doc/developer/developer_guide/docbook/Makefile
+	doc/developer/developer_guide/html/Makefile
+	doc/user/Makefile
+	doc/user/user_guide/Makefile
+	doc/user/user_guide/docbook/Makefile
+	doc/user/user_guide/html/Makefile])
 AC_OUTPUT