X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fautogen.sh;h=00006c1a144ffab5bf397b0c1931ea2d70740c08;hb=aab6c90a9ef966a4f5b9661d9b236628655face8;hp=a9a6adaa8b29770416ca1be86df42435369de60e;hpb=3bea00b56f346f541aff67872fd9c100cc55eaa2;p=lttv.git

diff --git a/ltt/branches/poly/autogen.sh b/ltt/branches/poly/autogen.sh
index a9a6adaa..00006c1a 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
-      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
+      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 automake --gnu $am_opt ..."
       automake --add-missing --gnu $am_opt
       echo "Running autoconf ..."
@@ -151,20 +151,20 @@ done
 conf_flags="--enable-maintainer-mode"
 
 
-if [ -a "$srcdir/include" ]; then
-	echo -n Removing old system include behavior emulation... 
-	rm -rf $srcdir/include
-	echo done.
-fi
-echo -n Creating the system include behavior emulation... 
-mkdir $srcdir/include
-mkdir $srcdir/include/ltt
-ln -sf ../../LibLTT/ltt.h $srcdir/include/ltt/ltt.h
-mkdir $srcdir/include/lttv
-ln -sf ../../lttv/module.h $srcdir/include/lttv/module.h
-ln -sf ../../lttv/hook.h $srcdir/include/lttv/hook.h
-ln -sf ../../lttv/traceWindow.h $srcdir/include/lttv/traceWindow.h
-echo done.
+#if [ -a "$srcdir/include" ]; then
+#	echo -n Removing old system include behavior emulation... 
+#	rm -rf $srcdir/include
+#	echo done.
+#fi
+#echo -n Creating the system include behavior emulation... 
+#mkdir $srcdir/include
+#mkdir $srcdir/include/ltt
+#ln -sf ../../LibLTT/ltt.h $srcdir/include/ltt/ltt.h
+#mkdir $srcdir/include/lttv
+#ln -sf ../../lttv/module.h $srcdir/include/lttv/module.h
+#ln -sf ../../lttv/hook.h $srcdir/include/lttv/hook.h
+#ln -sf ../../lttv/traceWindow.h $srcdir/include/lttv/traceWindow.h
+#echo done.