X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=e80bedb7fb8237fd2a957ede3bdfe4461c75b95a;hb=9d7f1f305b13d7fa9fd2a6aad50b0e7c336880d6;hp=2ac582734a84783bf499f6b1dbb6aff9798f671e;hpb=f6aaac088c411f6d03bab73695b14a5441ea85b1;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index 2ac582734a..e80bedb7fb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,11 +6,14 @@ 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 xforms.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4 pkg.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
     *GNU*) ok=yes
-           GNUM4=$prog
+	   GNUM4=$prog
 	   echo "found: $GNUM4"
 	   break ;;
     *) ;;
@@ -22,43 +25,29 @@ fi
 
 # Generate acinclude.m4
 echo -n "Generate acinclude.m4... "
-rm -f acinclude.m4 sigc++/acinclude.m4 boost/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
-touch boost/acinclude.m4
-for fil in config/boost.m4 ; do
-    cat $fil >> boost/acinclude.m4
-done
+rm -f acinclude.m4
+(cd config ; cat ${ACINCLUDE_FILES} >../acinclude.m4)
 echo "done."
 
 # Generate the Makefiles and configure files
-if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
+if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
 	echo "Building macros..."
-	for dir in . lib/reLyX sigc++ boost ; do
-	    echo -e "\t$dir"
+	for dir in . lib/reLyX ; do
+	    echo "        $dir"
 	    ( cd $dir ; $ACLOCAL )
 	done
-#	$ACLOCAL ; ( cd lib/reLyX; $ACLOCAL ) ; ( cd sigc++; $ACLOCAL ) 
-#	( cd boost; $ACLOCAL ) 
 	echo "done."
 else
 	echo "aclocal not found -- aborting"
 	exit
 fi
 
-if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
+if ( $AUTOHEADER --version ) </dev/null > /dev/null 2>&1; then
 	echo "Building config header template..."
-	for dir in . sigc++ boost ; do
-	    echo -e "\t$dir"
+	for dir in . ; do
+	    echo "        $dir"
 	    ( cd $dir ; $AUTOHEADER )
 	done
-#	$AUTOHEADER ; ( cd sigc++; $AUTOHEADER ) ; ( cd boost; $AUTOHEADER ) 
 	echo "done."
 else
 	echo "autoheader not found -- aborting"
@@ -67,12 +56,10 @@ fi
 
 if ( $AUTOMAKE --version ) </dev/null > /dev/null 2>&1; then
 	echo "Building Makefile templates..."
-	for dir in . lib/reLyX sigc++ boost ; do
-	    echo -e "\t$dir"
+	for dir in . lib/reLyX ; do
+	    echo "        $dir"
 	    ( cd $dir ; $AUTOMAKE )
 	done
-#	$AUTOMAKE ; ( cd lib/reLyX ; $AUTOMAKE ) ; ( cd sigc++; $AUTOMAKE ) 
-#	( cd boost; $AUTOMAKE )
 	echo "done."
 else
 	echo "automake not found -- aborting"
@@ -81,12 +68,10 @@ fi
 
 if ( $AUTOCONF --version ) </dev/null > /dev/null 2>&1; then
 	echo "Building configure..."
-	for dir in . lib/reLyX sigc++ boost ; do
-	    echo -e "\t$dir"
+	for dir in . lib/reLyX ; do
+	    echo "       $dir"
 	    ( cd $dir ; $AUTOCONF )
 	done
-#	$AUTOCONF ; ( cd lib/reLyX ; $AUTOCONF ) ; ( cd sigc++; $AUTOCONF )
-#	( cd boost; $AUTOCONF ) 
 	echo "done."
 else
 	echo "autoconf not found -- aborting"