X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=autogen.sh;h=247d070e77e83d880bc13d5abecaf8b772f9ab30;hb=dab43e77955e5b21fa556f53143d42e09e439f40;hp=5ab1e78fc22e749a2c2db420364bbe3f1945a690;hpb=53b464c5e95ed708e9464db0499826894be450fd;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index 5ab1e78fc2..247d070e77 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,11 +6,14 @@ AUTOMAKE="automake -a -c --foreign"
 AUTOCONF=autoconf
 GNUM4=
 
-echo -n "Locating GNU m4..."
+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
     *GNU*) ok=yes
-           GNUM4=`type -path $prog`
+           GNUM4=$prog
 	   echo "found: $GNUM4"
 	   break ;;
     *) ;;
@@ -21,18 +24,19 @@ if test x$ok = xno ; then
 fi
 
 # Generate acinclude.m4
-echo -n "Generate acinclude.m4..."
-rm -rf acinclude.m4
-touch acinclude.m4
-for fil in config/lyxinclude.m4 config/libtool.m4 config/gettext.m4 config/lcmessage.m4 config/progtest.m4 ; do
-    cat $fil >> acinclude.m4
-done
+echo -n "Generate acinclude.m4... "
+rm -f acinclude.m4 sigc++/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
-	echo -n "Building macros..."
-	$ACLOCAL ; (cd lib/reLyX; $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"
@@ -40,8 +44,11 @@ else
 fi
 
 if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
-	echo -n "Building config header template..."
-	$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"
@@ -49,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 )
+	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"
@@ -58,10 +68,12 @@ else
 fi
 
 if ( $AUTOCONF --version ) </dev/null > /dev/null 2>&1; then
-	echo -n "Building configure..."
-	$AUTOCONF ; ( cd lib/reLyX ; $AUTOCONF )
+	echo "Building configure..."
+	for dir in . lib/reLyX sigc++ ; do
+	    echo "       $dir"
+	    ( cd $dir ; $AUTOCONF )
+	done
 	echo "done."
-	echo 'run "./configure ; make"'
 else
 	echo "autoconf not found -- aborting"
 	exit
@@ -69,7 +81,7 @@ fi
 
 # Autogenerate lib/configure.m4.
 if test x$GNUM4 != x ; then
-    echo -n "Building lib/configure ..."
+    echo -n "Building lib/configure ... "
     rm -f lib/configure
     $GNUM4 lib/configure.m4 > lib/configure
     chmod a+x lib/configure
@@ -79,22 +91,6 @@ else
     exit
 fi
 
-echo -n "Creating POTFILES.in..."
-cat <<EOF > tmppot
-#
-# This file is automatically generated by autogen.sh. This command was
-# used to extract the files from the sources:
-#
-# grep -E "_\(\".*\"\)" \`find src -name \*.[hHC]\` | \\
-# awk 'BEGIN {FS= ":"} {print $1}' | sort | uniq
-#
-# This must be done when standing in lyx/
-#
-# This is all the files that contains internationalization strings.
-
-EOF
-
-grep -E "_\(\".*\"\)" `find src -name \*.[hHC]` | \
-awk 'BEGIN {FS= ":"} {print $1}' | sort -f -d | uniq >> tmppot
-mv tmppot po/POTFILES.in
-echo "done"
+echo
+echo 'run "./configure ; make"'
+echo