X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fconfigure.in;h=29a7a3f7e1d73a59fe26ff7bd1f0800dfc860910;hb=a1a2b6492b9e18506e9429b71a90fcfff9da7f99;hp=9c9e8dd1f11a7c04f0aa57a0f5374b0494eb5108;hpb=88feb618dc79481733516a77f285bb6514bb1d17;p=lttv.git

diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index 9c9e8dd1..29a7a3f7 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -1,3 +1,22 @@
+# This file is part of the Linux Trace Toolkit viewer
+# Copyright (C) 2003-2004 Mathieu Desnoyers
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License Version 2 as
+# published by the Free Software Foundation;
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, 
+# MA 02111-1307, USA.
+
+
+
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
@@ -16,7 +35,7 @@ AM_PATH_GTK_2_0(2.0.0, ,AC_MSG_ERROR([gtk is required in order to compile GUI -
 AC_PROG_CC
 
 # Checks for libraries.
-AC_CHECK_LIB([popt], [poptGetNextOpt], ,AC_MSG_ERROR([libpopt 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])  )
 
 # Checks for header files.
 AC_HEADER_STDC
@@ -48,49 +67,48 @@ AC_CHECK_FUNCS([select])
 
 #CPPFLAGS="$CPPFLAGS -I"
 
+AM_CONDITIONAL(LTTVSTATIC, test "$enable_lttvstatic" = yes)
 lttvlibdir="${libdir}/lttv"
-AC_SUBST(lttvlibdir)
-
 lttvplugindir="${lttvlibdir}/plugins"
-AC_SUBST(lttvplugindir)
-
 lttlibdir="${libdir}/ltt"
-AC_SUBST(lttlibdir)
-
-
-top_includedir="\$(top_srcdir)/include"
-AC_SUBST(top_includedir)
+top_lttvdir="\$(top_srcdir)/lttv"
+top_lttvwindowdir="\$(top_srcdir)/lttv/modules/gui/lttvwindow"
 
-DEFAULT_INCLUDES="-I\$(top_includedir) -I\$(top_srcdir)"
-AC_SUBST(DEFAULT_INCLUDES)
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_lttvdir) -I\$(top_lttvwindowdir)"
 
 #CPPFLAGS="${GLIB_CFLAGS}"
 #AC_SUBST(CPPFLAGS)
 
+lttincludedir="${includedir}/ltt"
 lttvincludedir="${includedir}/lttv"
-AC_SUBST(lttvincludedir)
+lttvwindowincludedir="${includedir}/lttvwindow"
 
-lttincludedir="${includedir}/ltt"
+
+AC_SUBST(POPT_LIBS)
+AC_SUBST(lttvlibdir)
+AC_SUBST(lttvplugindir)
+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_CONFIG_FILES([Makefile
 		 lttv/Makefile
-		 lttv/main/Makefile
+		 lttv/lttv/Makefile
 		 lttv/modules/Makefile
 		 lttv/modules/text/Makefile
 		 lttv/modules/gui/Makefile
-		 lttv/modules/gui/mainlib/Makefile
-		 lttv/modules/gui/main/Makefile
-		 lttv/modules/gui/main/src/Makefile
-		 lttv/modules/gui/main/pixmaps/Makefile
-		 lttv/modules/gui/icons/Makefile
+		 lttv/modules/gui/lttvwindow/Makefile
+		 lttv/modules/gui/lttvwindow/lttvwindow/Makefile
+		 lttv/modules/gui/lttvwindow/pixmaps/Makefile
+		 lttv/modules/gui/lttvwindow/glade/Makefile
 		 lttv/modules/gui/controlflow/Makefile
 		 lttv/modules/gui/detailedevents/Makefile
 		 lttv/modules/gui/statistics/Makefile
 		 lttd/Makefile
 		 ltt/Makefile
-		 include/Makefile
-		 include/ltt/Makefile
-		 ltt/convert/Makefile
-		 include/lttv/Makefile])
+		 ltt/convert/Makefile])
 AC_OUTPUT