Headers cleanup from Angus

[lyx.git] / autogen.sh

diff --git a/autogen.sh b/autogen.sh
index 5ab1e78fc22e749a2c2db420364bbe3f1945a690..efce8d6b60656cac4f10dc13dad7c491e1c6eddd 100755 (executable)
--- 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,22 @@ 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
 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; 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 -n "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"
@@ -40,8 +44,8 @@ else
 fi
 
 if ( autoheader --version ) </dev/null > /dev/null 2>&1; then
-       echo -n "Building config header template..."
-       $AUTOHEADER
+       echo -n "Building config header template... "
+       $AUTOHEADER ; ( cd sigc++; $AUTOHEADER )
        echo "done."
 else
        echo "autoheader not found -- aborting"
@@ -49,8 +53,8 @@ else
 fi
 
 if ( $AUTOMAKE --version ) </dev/null > /dev/null 2>&1; then
-       echo -n "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"
@@ -58,10 +62,9 @@ else
 fi
 
 if ( $AUTOCONF --version ) </dev/null > /dev/null 2>&1; then
-       echo -n "Building configure..."
-       $AUTOCONF ; ( cd lib/reLyX ; $AUTOCONF )
+       echo -n "Building configure... "
+       $AUTOCONF ; ( cd lib/reLyX ; $AUTOCONF ) ; ( cd sigc++; $AUTOCONF )
        echo "done."
-       echo 'run "./configure ; make"'
 else
        echo "autoconf not found -- aborting"
        exit
@@ -69,7 +72,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,7 +82,7 @@ else
     exit
 fi
 
-echo -n "Creating POTFILES.in..."
+echo -n "Creating POTFILES.in... "
 cat <<EOF > tmppot
 #
 # This file is automatically generated by autogen.sh. This command was
@@ -98,3 +101,7 @@ 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