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

diff --git a/autogen.sh b/autogen.sh
index 6bf686d514..efce8d6b60 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -4,42 +4,85 @@ ACLOCAL=aclocal
 AUTOHEADER=autoheader
 AUTOMAKE="automake -a -c --foreign"
 AUTOCONF=autoconf
+GNUM4=
+
+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
+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; 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 Makefiles and configure files
 if ( aclocal --version ) </dev/null > /dev/null 2>&1; then
-	echo "Building macros."
-	$ACLOCAL ; (cd lib/reLyX; $ACLOCAL )
+	echo -n "Building macros... "
+	$ACLOCAL ; ( cd lib/reLyX; $ACLOCAL ) ; ( cd sigc++; $ACLOCAL ) 
+	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 -n "Building config header template... "
+	$AUTOHEADER ; ( cd sigc++; $AUTOHEADER )
+	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 -n "Building Makefile templates... "
+	$AUTOMAKE ; ( cd lib/reLyX ; $AUTOMAKE ) ; ( cd sigc++; $AUTOMAKE )
+	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 -n "Building configure... "
+	$AUTOCONF ; ( cd lib/reLyX ; $AUTOCONF ) ; ( cd sigc++; $AUTOCONF )
+	echo "done."
 else
 	echo "autoconf not found -- aborting"
 	exit
 fi
 
-echo "Creating POTFILES.in..."
+# 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 -n "Creating POTFILES.in... "
 cat <<EOF > tmppot
 #
 # This file is automatically generated by autogen.sh. This command was
@@ -59,7 +102,6 @@ awk 'BEGIN {FS= ":"} {print $1}' | sort -f -d | uniq >> tmppot
 mv tmppot po/POTFILES.in
 echo "done"
 
-
-
-
-
+echo
+echo 'run "./configure ; make"'
+echo