X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.in;h=67da0ca478ca02e28f91993b01e966cc88af7a3f;hb=7d3dcbe0d57bd780a3c392a9aa555eb1d52c6cca;hp=c48c3aa830b0c2c347d382e0574771c9a974f19c;hpb=f61f4dca50e13aa52b1ca3941c8f420848f4353f;p=lttv.git

diff --git a/configure.in b/configure.in
index c48c3aa8..67da0ca4 100644
--- a/configure.in
+++ b/configure.in
@@ -42,12 +42,11 @@ AC_PROG_CC
 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([util], [forkpty], UTIL_LIBS="-lutil", AC_MSG_ERROR([libutil is required in order to compile LinuxTraceToolkit]))
 
 
 # pthread for gdb with dlopen().
-AC_CHECK_LIB(pthread, pthread_join,[THREAD_LIBS="-lpthread"], AC_MSG_ERROR([LinuxThreads is required in order to make sure gdb works fine with lttv-gui]))
+AC_CHECK_LIB(pthread, pthread_join, [], AC_MSG_ERROR([LinuxThreads is required in order to make sure gdb works fine with lttv-gui]))
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -59,10 +58,18 @@ AM_PROG_CC_STDC
 AC_HEADER_STDC
 
 pkg_modules="gtk+-2.0 >= 2.0.0"
-PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
-PACKAGE_CFLAGS="-Wall -Wformat"
-AC_SUBST(PACKAGE_CFLAGS)
-AC_SUBST(PACKAGE_LIBS)
+PKG_CHECK_MODULES(GTK, [$pkg_modules])
+
+pkg_modules="gobject-2.0 >= 2.0.0"
+PKG_CHECK_MODULES(GOBJECT, [$pkg_modules])
+
+LIBS="$LIBS $GTK_LIBS $GOBJECT_LIBS"
+PACKAGE_CFLAGS="$GTK_CFLAGS $GOBJECT_CFLAGS -Wall -Wformat"
+MODULE_CFLAGS="$PACKAGE_CFLAGS -fvisibility=hidden"
+MODULE_LDFLAGS="-module -avoid-version"
+AC_SUBST([PACKAGE_CFLAGS])
+AC_SUBST([MODULE_CFLAGS])
+AC_SUBST([MODULE_LDFLAGS])
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
@@ -80,7 +87,12 @@ AC_CHECK_FUNCS([select])
 
 #CPPFLAGS="$CPPFLAGS -I"
 
-AM_CONDITIONAL(LTTVSTATIC, test "$enable_lttvstatic" = yes)
+AC_ARG_ENABLE(lttvstatic,
+	AC_HELP_STRING( [--enable-lttvstatic],
+		[Build a statically linked executable @<:@default=no@:>@]),
+		[with_lttvstatic="yes"],
+		[with_lttvstatic="no"])
+AM_CONDITIONAL(LTTVSTATIC, test "x$with_lttvstatic" = "xyes")
 lttvlibdir="${libdir}/lttv"
 lttvplugindir="${lttvlibdir}/plugins"
 #lttlibdir="${libdir}/ltt"
@@ -89,17 +101,13 @@ top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow"
 
 DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)"
 
-#CPPFLAGS="${GLIB_CFLAGS}"
-#AC_SUBST(CPPFLAGS)
-
 lttincludedir="${includedir}/ltt"
 lttvincludedir="${includedir}/lttv"
 lttvwindowincludedir="${includedir}/lttvwindow"
 lttctlincludedir="${includedir}/liblttctl"
 
-AC_SUBST(POPT_LIBS)
-AC_SUBST(UTIL_LIBS)
-AC_SUBST(THREAD_LIBS)
+AC_SUBST([POPT_LIBS])
+AC_SUBST([UTIL_LIBS])
 AC_SUBST(lttvlibdir)
 AC_SUBST(lttvplugindir)
 #AC_SUBST(lttlibdir)