X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Fautogen.sh;h=1b5ca0287aa5d02e3bb88ebc80e7e721f63504a1;hb=7cf3c9f35381eb30e1142c2f1b22773303c308f9;hp=8fe1de8a10a3ae1e49f0e14a371bb1e7a6306d2c;hpb=5f13cda07ffb4649ee135da103fcd811c554b1e8;p=lttv.git

diff --git a/ltt/branches/poly/autogen.sh b/ltt/branches/poly/autogen.sh
index 8fe1de8a..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."
@@ -134,14 +134,14 @@ do
 	  libtoolize --force --copy
 	fi
       fi
-      echo "Running aclocal $aclocalinclude ..."
-      aclocal $aclocalinclude
+      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 automake-1.7 --gnu $am_opt ..."
+      automake-1.7 --add-missing --gnu $am_opt
       echo "Running autoconf ..."
       autoconf
     )
@@ -150,6 +150,24 @@ 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 test x$NOCONFIGURE = x; then
   echo Running $srcdir/configure $conf_flags "$@" ...
   $srcdir/configure $conf_flags "$@" \