X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fautogen.sh;h=1b5ca0287aa5d02e3bb88ebc80e7e721f63504a1;hb=1852cb18d9e57d648253272b3414716e5b5d77d3;hp=02610d8f07fdc46089b148cd6d44330b6cb57323;hpb=7c9cb10c113d7f82350ce14dd0a51e1f0de5f3e1;p=lttv.git

diff --git a/ltt/branches/poly/autogen.sh b/ltt/branches/poly/autogen.sh
index 02610d8f..1b5ca028 100755
--- a/ltt/branches/poly/autogen.sh
+++ b/ltt/branches/poly/autogen.sh
@@ -67,7 +67,7 @@ fi
   }
 }
 
-(automake --version) < /dev/null > /dev/null 2>&1 || {
+(automake-1.7 --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: You must have \`automake' installed."
   echo "You can get it from: ftp://ftp.gnu.org/pub/gnu/"
@@ -77,7 +77,7 @@ fi
 
 
 # if no automake, don't bother testing for aclocal
-test -n "$NO_AUTOMAKE" || (aclocal --version) < /dev/null > /dev/null 2>&1 || {
+test -n "$NO_AUTOMAKE" || (aclocal-1.7 --version) < /dev/null > /dev/null 2>&1 || {
   echo
   echo "**Error**: Missing \`aclocal'.  The version of \`automake'"
   echo "installed doesn't appear recent enough."
@@ -140,8 +140,8 @@ do
 	echo "Running autoheader..."
 	autoheader
       fi
-      echo "Running automake --gnu $am_opt ..."
-      automake --add-missing --gnu $am_opt
+      echo "Running automake-1.7 --gnu $am_opt ..."
+      automake-1.7 --add-missing --gnu $am_opt
       echo "Running autoconf ..."
       autoconf
     )
@@ -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 "$@" ...