Disconnect two signals --- forward port from 1.3.x.

[lyx.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index ec15c28aedaa7c973bb81d886546e8ae1f2e28f6..c1740d5928061cb617ddbd8fdf6d85b6e75cef16 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,7 +4,7 @@ ACLOCAL="aclocal -I ${PWD}/m4"
 AUTOHEADER="autoheader"
 AUTOMAKE="automake -a -c --foreign"
 AUTOCONF="autoconf"
-ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 aspell.m4 pspell.m4 cygwin.m4 pkg.m4"
+ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 xforms.m4 qt.m4 gtk--.m4 gnome--.m4 gnome.m4 spell.m4 cygwin.m4 pkg.m4"
 
 # Discover what version of automake we are using.
 automake_version=`$AUTOMAKE --version 2>/dev/null | head -n 1`
@@ -70,7 +70,7 @@ fi
 
 # Delete old cache directories.
 # automake will stop if their contents was created by an earlier version.
-rm -rf autom4te.cache lib/reLyX/autom4te.cache
+rm -rf autom4te.cache
 
 # Generate acinclude.m4
 echo -n "Generate acinclude.m4... "
@@ -81,7 +81,7 @@ echo "done."
 # Generate the Makefiles and configure files
 if ( $ACLOCAL --version ) < /dev/null > /dev/null 2>&1; then
        echo "Building macros..."
-       for dir in . lib/reLyX ; do
+       for dir in . ; do
            echo "        $dir"
            ( cd $dir ; $ACLOCAL )
        done
@@ -105,7 +105,7 @@ fi
 
 if ( $AUTOMAKE --version ) < /dev/null > /dev/null 2>&1; then
        echo "Building Makefile templates..."
-       for dir in . lib/reLyX ; do
+       for dir in . ; do
            echo "        $dir"
            ( cd $dir ; $AUTOMAKE )
        done
@@ -117,7 +117,7 @@ fi
 
 if ( $AUTOCONF --version ) < /dev/null > /dev/null 2>&1; then
        echo "Building configure..."
-       for dir in . lib/reLyX ; do
+       for dir in . ; do
            echo "       $dir"
            ( cd $dir ; $AUTOCONF )
        done