X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=5d4ce8e9dc079efcc8337fbd7f08478976eabb25;hb=b445142a71748192520cfd645b4963e23070a486;hp=cd36993b173e7c432bfe3bcf7ed27d42072ae93d;hpb=9adb47dd305dfe3b0464f747b43b2ba0263e567d;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index cd36993b..5d4ce8e9 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_CONFIG_HEADER([config.h])
-AC_PROG_LIBTOOL
+#AC_WITH_LTDL  # not needed ?
+AM_INIT_AUTOMAKE(LinuxTraceToolkit,0.9.7-30092003)
+AM_CONFIG_HEADER(config.h)
 AM_PROG_LIBTOOL
 
+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
@@ -37,11 +48,24 @@ AC_CHECK_FUNCS([select])
 
 #CPPFLAGS="$CPPFLAGS -I"
 
-lttvplugindir="${libdir}/lttv/plugins"
+lttvlibdir="${libdir}/lttv"
+AC_SUBST(lttvlibdir)
+
+lttvplugindir="${lttvlibdir}/plugins"
 AC_SUBST(lttvplugindir)
 
-#DEFAULT_INCLUDES="-I\$(top_srcdir)/include"
-#AC_SUBST(DEFAULT_INCLUDES)
+lttlibdir="${libdir}/ltt"
+AC_SUBST(lttlibdir)
+
+
+top_includedir="\$(top_srcdir)/include"
+AC_SUBST(top_includedir)
+
+DEFAULT_INCLUDES="-I\$(top_includedir) -I\$(top_srcdir)"
+AC_SUBST(DEFAULT_INCLUDES)
+
+#CPPFLAGS="${GLIB_CFLAGS}"
+#AC_SUBST(CPPFLAGS)
 
 lttvincludedir="${includedir}/lttv"
 AC_SUBST(lttvincludedir)
@@ -50,9 +74,27 @@ lttincludedir="${includedir}/ltt"
 AC_SUBST(lttincludedir)
 
 AC_CONFIG_FILES([Makefile
-                 lttv/Makefile
-                 lttv/plugins/Makefile
-		 lttv/plugins/exemples/Makefile
+		 lttv/Makefile
+		 lttv/modules/Makefile
+		 lttv/modules/gui/Makefile
+		 lttv/modules/gui/mainWin/Makefile
+		 lttv/modules/gui/mainWin/src/Makefile
+		 lttv/modules/gui/mainWin/pixmaps/Makefile
+		 lttv/modules/gui/API/Makefile
+		 lttv/modules/guiControlFlow/Makefile
+		 lttv/modules/icons/Makefile
 		 lttd/Makefile
-		 ltt/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