X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=247d070e77e83d880bc13d5abecaf8b772f9ab30;hb=567dfee6a02481d7e6ad74b90fa9d4939c9f4d5b;hp=aaadd35a5357b7d787e0a55ac094c739cfea361d;hpb=5458081c09b7637d0e8b20be93a1faee112cf633;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index aaadd35a53..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,25 +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/gnome/gtk.m4 config/gnome/aclocal-include.m4 config/gnome/gnome-print-check.m4 config/gnome/compiler-flags.m4 config/gnome/gnome-pthread-check.m4 config/gnome/curses.m4 config/gnome/gnome-support.m4 config/gnome/gnome-bonobo-check.m4 config/gnome/gnome-undelfs.m4 config/gnome/gnome-common.m4 config/gnome/gnome-vfs.m4 config/gnome/gnome-fileutils.m4 config/gnome/gnome-x-checks.m4 config/gnome/gnome-ghttp-check.m4 config/gnome/gnome-xml-check.m4 config/gnome/gnome-gnorba-check.m4 config/gnome/gnome.m4 config/gnome/gnome-guile-checks.m4 config/gnome/gperf-check.m4 config/gnome/gnome-libgtop-check.m4 config/gnome/linger.m4 config/gnome/gnome-objc-checks.m4 config/gnome/need-declaration.m4 config/gnome/gnome-orbit-check.m4 config/gnome/gtk--.m4 config/gnome/gnome--.m4 ; do
-    cat $fil >> acinclude.m4
-done
-touch sigc++/acinclude.m4
-for fil in config/libtool.m4 ; do
-    cat $fil >> sigc++/acinclude.m4
-done
-echo "done."
-
-# Generate the ext_l10n.h
-echo -n "Generate the ext_l10n file..."
-grep -i -E "submenu|item|optitem" < lib/ui/default.ui | cut -d '"' -f 2 | awk '{printf "_(\"%s\");\n", $0}' > src/ext_l10n.h
+(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"
@@ -49,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"
@@ -58,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"
@@ -67,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"
@@ -87,26 +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 -l -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