X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=247d070e77e83d880bc13d5abecaf8b772f9ab30;hb=0e92b177afbc4cf36028a91bb47ca6f2919aac84;hp=6bf686d51484aefe4ed16b4644c12c8b79b93839;hpb=841cbfd6991a5e0b813038ec2812ba903bc62f40;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index 6bf686d514..247d070e77 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,62 +4,93 @@ ACLOCAL=aclocal
 AUTOHEADER=autoheader
 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
+    *GNU*) ok=yes
+           GNUM4=$prog
+	   echo "found: $GNUM4"
+	   break ;;
+    *) ;;
+  esac
+done
+if test x$ok = xno ; then
+    echo "not found."
+fi
+
+# Generate acinclude.m4
+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 "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"
 	exit
 fi
 
 if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
-	echo "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"
 	exit
 fi
 
 if ( $AUTOMAKE --version ) </dev/null > /dev/null 2>&1; then
-	echo "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"
 	exit
 fi
 
 if ( $AUTOCONF --version ) </dev/null > /dev/null 2>&1; then
-	echo "Building configure"
-	$AUTOCONF ; ( cd lib/reLyX ; $AUTOCONF )
-	echo 'run "./configure ; make"'
+	echo "Building configure..."
+	for dir in . lib/reLyX sigc++ ; do
+	    echo "       $dir"
+	    ( cd $dir ; $AUTOCONF )
+	done
+	echo "done."
 else
 	echo "autoconf not found -- aborting"
 	exit
 fi
 
-echo "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"
-
-
-
-
+# Autogenerate lib/configure.m4.
+if test x$GNUM4 != x ; then
+    echo -n "Building lib/configure ... "
+    rm -f lib/configure
+    $GNUM4 lib/configure.m4 > lib/configure
+    chmod a+x lib/configure
+    echo "done."
+else
+    echo "No GNU m4. Impossible to build lib/configure -- aborting"
+    exit
+fi
 
+echo
+echo 'run "./configure ; make"'
+echo