X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=9891d07a9f37c9fffa8802491234f5c3a9e1915e;hb=c8faea224e77eddd8ed4d2c383424955fecbef02;hp=c0533a3f0a429b0ef40f86ef5d5a664a0ef498ff;hpb=c4167a5207b5c3ae5ac9b0ff9892d73f1a587d3b;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index c0533a3f..9891d07a 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -3,24 +3,35 @@
 
 AC_PREREQ(2.57)
 AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
-AM_INIT_AUTOMAKE(LinuxTraceToolkit,0.9.7-29052003)
+#AC_WITH_LTDL  # not needed ?
+AM_INIT_AUTOMAKE(LinuxTraceToolkit,0.9.7-06082003)
 AM_CONFIG_HEADER([config.h])
 AM_PROG_LIBTOOL
-AM_PATH_GLIB_2_0
+
+AM_PATH_GLIB_2_0(2.0.0, ,AC_MSG_ERROR([glib is required in order to compile LinuxTraceToolkit - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
+
+AM_PATH_GTK_2_0(2.0.0, ,AC_MSG_ERROR([gtk is required in order to compile GUI - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
 
 # Checks for programs.
 AC_PROG_CC
 
 # Checks for libraries.
-AC_CHECK_LIB([popt], [poptGetNextOpt])
-AC_CHECK_LIB([gmodule-2.0], [g_module_open])
-AC_CHECK_LIB([dl], [dlopen])
-AC_CHECK_LIB([glib-2.0], [g_malloc])
+AC_CHECK_LIB([popt], [poptGetNextOpt], ,AC_MSG_ERROR([libpopt is required in order to compile LinuxTraceToolkit])  )
 
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([fcntl.h stdlib.h string.h sys/time.h unistd.h])
 
+AC_ISC_POSIX
+AC_PROG_CC
+AM_PROG_CC_STDC
+AC_HEADER_STDC
+
+pkg_modules="gtk+-2.0 >= 2.0.0"
+PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
+AC_SUBST(PACKAGE_CFLAGS)
+AC_SUBST(PACKAGE_LIBS)
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_HEADER_STDBOOL
 AC_C_CONST
@@ -44,9 +55,15 @@ lttlibdir="${libdir}/ltt"
 AC_SUBST(lttlibdir)
 
 
-DEFAULT_INCLUDES="-I\$(top_srcdir)/include -I\$(includedir)/glib-2.0"
+top_includedir="\$(top_srcdir)/include"
+AC_SUBST(top_includedir)
+
+DEFAULT_INCLUDES="-I\$(top_includedir)"
 AC_SUBST(DEFAULT_INCLUDES)
 
+#CPPFLAGS="${GLIB_CFLAGS}"
+#AC_SUBST(CPPFLAGS)
+
 lttvincludedir="${includedir}/lttv"
 AC_SUBST(lttvincludedir)
 
@@ -54,15 +71,20 @@ lttincludedir="${includedir}/ltt"
 AC_SUBST(lttincludedir)
 
 AC_CONFIG_FILES([Makefile
-                 lttv/Makefile
+     lttv/Makefile
 		 lttv/modules/Makefile
-		 lttv/modules/gui/Makefile
-		 lttv/modules/text/Makefile
-                 lttv/plugins/Makefile
-		 lttv/plugins/examples/Makefile
 		 lttd/Makefile
 		 ltt/Makefile
 		 include/Makefile
 		 include/ltt/Makefile
+		 ltt/convert/Makefile
 		 include/lttv/Makefile])
 AC_OUTPUT
+#		 lttv/modules/examples/Makefile
+#		 include/ltt/convert/Makefile
+#		 lttv/modules/gui/API/Makefile
+#		 lttv/modules/gui/Makefile
+# 		 lttv/modules/text/Makefile
+#		 lttv/plugins/Makefile
+#		 lttv/plugins/examples/Makefile
+#		 lttv/modules/coreGUI/Makefile