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

diff --git a/autogen.sh b/autogen.sh
index 247d070e77..e80bedb7fb 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,14 +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 sigc++.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4"
+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 ;;
     *) ;;
@@ -25,15 +25,14 @@ fi
 
 # Generate acinclude.m4
 echo -n "Generate acinclude.m4... "
-rm -f acinclude.m4 sigc++/acinclude.m4
+rm -f acinclude.m4
 (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
+if ( $ACLOCAL --version ) </dev/null > /dev/null 2>&1; then
 	echo "Building macros..."
-	for dir in . lib/reLyX sigc++ ; do
+	for dir in . lib/reLyX ; do
 	    echo "        $dir"
 	    ( cd $dir ; $ACLOCAL )
 	done
@@ -43,9 +42,9 @@ else
 	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++ ; do
+	for dir in . ; do
 	    echo "        $dir"
 	    ( cd $dir ; $AUTOHEADER )
 	done
@@ -57,7 +56,7 @@ fi
 
 if ( $AUTOMAKE --version ) </dev/null > /dev/null 2>&1; then
 	echo "Building Makefile templates..."
-	for dir in . lib/reLyX sigc++ ; do
+	for dir in . lib/reLyX ; do
 	    echo "        $dir"
 	    ( cd $dir ; $AUTOMAKE )
 	done
@@ -69,7 +68,7 @@ fi
 
 if ( $AUTOCONF --version ) </dev/null > /dev/null 2>&1; then
 	echo "Building configure..."
-	for dir in . lib/reLyX sigc++ ; do
+	for dir in . lib/reLyX ; do
 	    echo "       $dir"
 	    ( cd $dir ; $AUTOCONF )
 	done