X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fautogen.sh;h=87b034b3933b496f31cac2497a1e7b9aee010f5a;hb=67f729732d629426de5a04965a81f6f0848af053;hp=02610d8f07fdc46089b148cd6d44330b6cb57323;hpb=7c9cb10c113d7f82350ce14dd0a51e1f0de5f3e1;p=lttv.git

diff --git a/ltt/branches/poly/autogen.sh b/ltt/branches/poly/autogen.sh
index 02610d8f..87b034b3 100755
--- a/ltt/branches/poly/autogen.sh
+++ b/ltt/branches/poly/autogen.sh
@@ -134,8 +134,8 @@ do
 	  libtoolize --force --copy
 	fi
       fi
-      echo "Running aclocal-1.7 $aclocalinclude ..."
-      aclocal-1.7 $aclocalinclude
+      echo "Running aclocal $aclocalinclude ..."
+      aclocal $aclocalinclude
       if grep "^AM_CONFIG_HEADER" configure.in >/dev/null; then
 	echo "Running autoheader..."
 	autoheader
@@ -150,14 +150,23 @@ done
 
 conf_flags="--enable-maintainer-mode"
 
-echo -n Creating the system include behavior emulation... 
-mkdir $srcdir/include
-mkdir $srcdir/include/ltt
-ln -s ../../LibLTT/ltt.h $srcdir/include/ltt/ltt.h
-mkdir $srcdir/include/lttv
-ln -s ../../lttv/module.h $srcdir/include/lttv/module.h
-ln -s ../../lttv/hook.h $srcdir/include/lttv/hook.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.
+
+
 
 if test x$NOCONFIGURE = x; then
   echo Running $srcdir/configure $conf_flags "$@" ...