X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=247d070e77e83d880bc13d5abecaf8b772f9ab30;hb=dab43e77955e5b21fa556f53143d42e09e439f40;hp=ff42367219a54e3fe94fc4f7ff5e114e8c3d73e8;hpb=72efbf28ac2e8d8cef29ff21dcc2fb3f2baf09ae;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index ff42367219..247d070e77 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,6 +6,9 @@ AUTOMAKE="automake -a -c --foreign"
 AUTOCONF=autoconf
 GNUM4=
 
+ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 sigc++.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4"
+SIGCPP_ACINCLUDE_FILES="libtool.m4"
+
 echo -n "Locating GNU m4... "
 for prog in $M4 gm4 gnum4 m4 ; do
   case `$prog --version 2>&1` in
@@ -23,20 +26,17 @@ fi
 # Generate acinclude.m4
 echo -n "Generate acinclude.m4... "
 rm -f acinclude.m4 sigc++/acinclude.m4
-touch acinclude.m4
-for fil in config/lyxinclude.m4 config/libtool.m4 config/gettext.m4 config/lcmessage.m4 config/progtest.m4 config/sigc++.m4 config/kde.m4 config/qt2.m4 config/gtk--.m4 config/gnome--.m4 config/gnome.m4 config/pspell.m4; do
-    cat $fil >> acinclude.m4
-done
-touch sigc++/acinclude.m4
-for fil in config/libtool.m4 ; do
-    cat $fil >> sigc++/acinclude.m4
-done
+(cd config ; cat ${ACINCLUDE_FILES} >../acinclude.m4)
+(cd config ; cat ${SIGCPP_ACINCLUDE_FILES} >../sigc++/acinclude.m4)
 echo "done."
 
 # Generate the Makefiles and configure files
 if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
-	echo -n "Building macros... "
-	$ACLOCAL ; ( cd lib/reLyX; $ACLOCAL ) ; ( cd sigc++; $ACLOCAL ) 
+	echo "Building macros..."
+	for dir in . lib/reLyX sigc++ ; do
+	    echo "        $dir"
+	    ( cd $dir ; $ACLOCAL )
+	done
 	echo "done."
 else
 	echo "aclocal not found -- aborting"
@@ -44,8 +44,11 @@ else
 fi
 
 if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
-	echo -n "Building config header template... "
-	$AUTOHEADER ; ( cd sigc++; $AUTOHEADER )
+	echo "Building config header template..."
+	for dir in . sigc++ ; do
+	    echo "        $dir"
+	    ( cd $dir ; $AUTOHEADER )
+	done
 	echo "done."
 else
 	echo "autoheader not found -- aborting"
@@ -53,8 +56,11 @@ else
 fi
 
 if ( $AUTOMAKE --version ) </dev/null > /dev/null 2>&1; then
-	echo -n "Building Makefile templates... "
-	$AUTOMAKE ; ( cd lib/reLyX ; $AUTOMAKE ) ; ( cd sigc++; $AUTOMAKE )
+	echo "Building Makefile templates..."
+	for dir in . lib/reLyX sigc++ ; do
+	    echo "        $dir"
+	    ( cd $dir ; $AUTOMAKE )
+	done
 	echo "done."
 else
 	echo "automake not found -- aborting"
@@ -62,8 +68,11 @@ else
 fi
 
 if ( $AUTOCONF --version ) </dev/null > /dev/null 2>&1; then
-	echo -n "Building configure... "
-	$AUTOCONF ; ( cd lib/reLyX ; $AUTOCONF ) ; ( cd sigc++; $AUTOCONF )
+	echo "Building configure..."
+	for dir in . lib/reLyX sigc++ ; do
+	    echo "       $dir"
+	    ( cd $dir ; $AUTOCONF )
+	done
 	echo "done."
 else
 	echo "autoconf not found -- aborting"