X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=autogen.sh;h=e07b3560e1be086e080d2744b28ab703a894853a;hb=6b41425a9462f172d3473054fa662650d9ebea6f;hp=5ab1e78fc22e749a2c2db420364bbe3f1945a690;hpb=53b464c5e95ed708e9464db0499826894be450fd;p=lyx.git

diff --git a/autogen.sh b/autogen.sh
index 5ab1e78fc2..e07b3560e1 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,11 +6,11 @@ AUTOMAKE="automake -a -c --foreign"
 AUTOCONF=autoconf
 GNUM4=
 
-echo -n "Locating GNU 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 +21,31 @@ if test x$ok = xno ; then
 fi
 
 # Generate acinclude.m4
-echo -n "Generate acinclude.m4..."
-rm -rf acinclude.m4
+echo -n "Generate acinclude.m4... "
+rm -f acinclude.m4 sigc++/acinclude.m4 boost/acinclude.m4
 touch acinclude.m4
-for fil in config/lyxinclude.m4 config/libtool.m4 config/gettext.m4 config/lcmessage.m4 config/progtest.m4 ; do
+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/qt2.m4 config/gtk--.m4 config/gnome--.m4 config/gnome.m4 config/pspell.m4; do
     cat $fil >> acinclude.m4
 done
+touch sigc++/acinclude.m4
+for fil in config/libtool.m4 ; do
+    cat $fil >> sigc++/acinclude.m4
+done
+touch boost/acinclude.m4
+for fil in config/boost.m4 config/libtool.m4 ; do
+    cat $fil >> boost/acinclude.m4
+done
 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++ boost ; do
+	    echo "        $dir"
+	    ( cd $dir ; $ACLOCAL )
+	done
+#	$ACLOCAL ; ( cd lib/reLyX; $ACLOCAL ) ; ( cd sigc++; $ACLOCAL ) 
+#	( cd boost; $ACLOCAL ) 
 	echo "done."
 else
 	echo "aclocal not found -- aborting"
@@ -40,8 +53,12 @@ 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++ boost ; do
+	    echo "        $dir"
+	    ( cd $dir ; $AUTOHEADER )
+	done
+#	$AUTOHEADER ; ( cd sigc++; $AUTOHEADER ) ; ( cd boost; $AUTOHEADER ) 
 	echo "done."
 else
 	echo "autoheader not found -- aborting"
@@ -49,8 +66,13 @@ 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++ boost ; do
+	    echo "        $dir"
+	    ( cd $dir ; $AUTOMAKE )
+	done
+#	$AUTOMAKE ; ( cd lib/reLyX ; $AUTOMAKE ) ; ( cd sigc++; $AUTOMAKE ) 
+#	( cd boost; $AUTOMAKE )
 	echo "done."
 else
 	echo "automake not found -- aborting"
@@ -58,10 +80,14 @@ 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++ boost ; do
+	    echo "       $dir"
+	    ( cd $dir ; $AUTOCONF )
+	done
+#	$AUTOCONF ; ( cd lib/reLyX ; $AUTOCONF ) ; ( cd sigc++; $AUTOCONF )
+#	( cd boost; $AUTOCONF ) 
 	echo "done."
-	echo 'run "./configure ; make"'
 else
 	echo "autoconf not found -- aborting"
 	exit
@@ -69,7 +95,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 +105,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