From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Tue, 27 Jan 2004 21:54:13 +0000 (+0000)
Subject: configure in change
X-Git-Tag: v0.12.20~3074
X-Git-Url: https://git.lttng.org/?a=commitdiff_plain;h=0e9ba23995d88ec32aca48812a62094daf664314;hp=aab6c90a9ef966a4f5b9661d9b236628655face8;p=lttv.git

configure in change

git-svn-id: http://ltt.polymtl.ca/svn@415 04897980-b3bd-0310-b5e0-8ef037075253
---

diff --git a/ltt/branches/poly/autogen.sh b/ltt/branches/poly/autogen.sh
index 00006c1a..d1487f6d 100755
--- a/ltt/branches/poly/autogen.sh
+++ b/ltt/branches/poly/autogen.sh
@@ -128,18 +128,18 @@ do
         echo "Running xml-i18n-toolize..."
 	xml-i18n-toolize --copy --force --automake
       fi
-      echo "Running aclocal-1.7 $aclocalinclude ..."
-      aclocal-1.7 $aclocalinclude
-      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
-	echo "Running autoheader..."
-	autoheader
-      fi
       if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
 	if test -z "$NO_LIBTOOLIZE" ; then 
 	  echo "Running libtoolize..."
 	  libtoolize --force --copy
 	fi
       fi
+      echo "Running aclocal-1.7 $aclocalinclude ..."
+      aclocal-1.7 $aclocalinclude
+      if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
+	echo "Running autoheader..."
+	autoheader
+      fi
       echo "Running automake --gnu $am_opt ..."
       automake --add-missing --gnu $am_opt
       echo "Running autoconf ..."
diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in
index aac6c594..943d73a3 100644
--- a/ltt/branches/poly/configure.in
+++ b/ltt/branches/poly/configure.in
@@ -76,7 +76,7 @@ AC_SUBST(lttincludedir)
 AC_CONFIG_FILES([Makefile
 		 lttv/Makefile
 		 lttv/modules/Makefile
-		 lttv/modules/gui/text/Makefile
+		 lttv/modules/text/Makefile
 		 lttv/modules/gui/Makefile
 		 lttv/modules/gui/mainLib/Makefile
 		 lttv/modules/gui/main/Makefile
@@ -93,11 +93,3 @@ AC_CONFIG_FILES([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