X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=4fbefc4acbd2fbac22120af0007aba34285ea433;hb=25fba83632ff8e52e801b57189379803d70a228b;hp=62db1a533105582faabbcdda60aaecd23a264cca;hpb=86a65fdbbfe799d8a31d1fcfa6774ce9366054d4;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 62db1a53..4fbefc4a 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -23,7 +23,7 @@
 AC_PREREQ(2.57)
 AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
 #AC_WITH_LTDL  # not needed ?
-AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.4-02022005)
+AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.6.3-20092005)
 AM_CONFIG_HEADER(config.h)
 AM_PROG_LIBTOOL
 
@@ -31,6 +31,8 @@ AM_PATH_GLIB_2_0(2.4.0, ,AC_MSG_ERROR([glib is required in order to compile Linu
 
 AM_PATH_GTK_2_0(2.4.0, ,AC_MSG_ERROR([gtk is required in order to compile GUI - download it from ftp://ftp.gtk.org/pub/gtk]) , gmodule)
 
+AC_PATH_PROGS(BASH, bash)
+
 AC_SYS_LARGEFILE
 
 # Checks for programs.
@@ -77,7 +79,7 @@ AC_CHECK_FUNCS([select])
 AM_CONDITIONAL(LTTVSTATIC, test "$enable_lttvstatic" = yes)
 lttvlibdir="${libdir}/lttv"
 lttvplugindir="${lttvlibdir}/plugins"
-lttlibdir="${libdir}/ltt"
+#lttlibdir="${libdir}/ltt"
 top_lttvdir="\$(top_srcdir)/lttv"
 top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow"
 
@@ -89,22 +91,23 @@ DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)"
 lttincludedir="${includedir}/ltt"
 lttvincludedir="${includedir}/lttv"
 lttvwindowincludedir="${includedir}/lttvwindow"
-
+lttctlincludedir="${includedir}/liblttctl"
 
 AC_SUBST(POPT_LIBS)
 AC_SUBST(UTIL_LIBS)
 AC_SUBST(lttvlibdir)
 AC_SUBST(lttvplugindir)
-AC_SUBST(lttlibdir)
+#AC_SUBST(lttlibdir)
 AC_SUBST(top_lttvdir)
 AC_SUBST(top_lttvwindowdir)
 AC_SUBST(DEFAULT_INCLUDES)
 AC_SUBST(lttincludedir)
 AC_SUBST(lttvincludedir)
 AC_SUBST(lttvwindowincludedir)
+AC_SUBST(lttctlincludedir)
 
 AC_CONFIG_FILES([Makefile
-     libltt/Makefile
+     liblttctl/Makefile
      lttctl/Makefile
 		 lttv/Makefile
 		 lttv/lttv/Makefile
@@ -121,7 +124,6 @@ AC_CONFIG_FILES([Makefile
      lttv/modules/gui/tracecontrol/Makefile
 		 lttd/Makefile
 		 ltt/Makefile
-		 ltt/convert/Makefile
      doc/Makefile
      doc/developer/Makefile
      doc/developer/developer_guide/Makefile