X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=autogen.sh;h=09e5ecdcff1f8d8fc44687289db93074b965af65;hp=3c10a55ec693b0c4e13dd3f45142d4ba1766e115;hb=2764532ea72200d0a27ad2d79e6e299c00c62404;hpb=f0101589959496593db672c6a35704ea5fb33238

diff --git a/autogen.sh b/autogen.sh
index 3c10a55e..09e5ecdc 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
-# Run this to generate all the initial makefiles, etc.
+# Run this to generate all the initial makefiles,
+# etc. just after a checkout.
 
 DIE=0
 
@@ -7,7 +8,7 @@ srcdir="`pwd`"
 
 (autoconf --version) < /dev/null > /dev/null 2>&1 || {
   echo
-  echo "**Error**: You must have \`autoconf' installed to compile Gnome."
+  echo "**Error**: You must have \`autoconf' installed to compile tinc."
   echo "Download the appropriate package for your distribution,"
   echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
   DIE=1
@@ -16,7 +17,7 @@ srcdir="`pwd`"
 (grep "^AM_PROG_LIBTOOL" $srcdir/configure.in >/dev/null) && {
   (libtool --version) < /dev/null > /dev/null 2>&1 || {
     echo
-    echo "**Error**: You must have \`libtool' installed to compile Gnome."
+    echo "**Error**: You must have \`libtool' installed to compile tinc."
     echo "Get ftp://ftp.gnu.org/pub/gnu/libtool-1.2d.tar.gz"
     echo "(or a newer version if it is available)"
     DIE=1
@@ -27,7 +28,7 @@ grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
   grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
   (gettext --version) < /dev/null > /dev/null 2>&1 || {
     echo
-    echo "**Error**: You must have \`gettext' installed to compile Gnome."
+    echo "**Error**: You must have \`gettext' installed to compile tinc."
     echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
     echo "(or a newer version if it is available)"
     DIE=1
@@ -38,7 +39,7 @@ grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && {
   grep "sed.*POTFILES" $srcdir/configure.in >/dev/null || \
   (gettext --version) < /dev/null > /dev/null 2>&1 || {
     echo
-    echo "**Error**: You must have \`gettext' installed to compile Gnome."
+    echo "**Error**: You must have \`gettext' installed to compile tinc."
     echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
     echo "(or a newer version if it is available)"
     DIE=1
@@ -47,7 +48,7 @@ grep "^AM_GNOME_GETTEXT" $srcdir/configure.in >/dev/null && {
 
 (automake --version) < /dev/null > /dev/null 2>&1 || {
   echo
-  echo "**Error**: You must have \`automake' installed to compile Gnome."
+  echo "**Error**: You must have \`automake' installed to compile tinc."
   echo "Get ftp://ftp.gnu.org/pub/gnu/automake-1.3.tar.gz"
   echo "(or a newer version if it is available)"
   DIE=1
@@ -93,11 +94,15 @@ do
       aclocalinclude="$ACLOCAL_FLAGS"
       for k in $macrodirs; do
   	if test -d $k; then
+	  if test -f $k/Makefile.am.in; then
+	    make -C $k -f Makefile.am.in Makefile.am
+	  fi
           aclocalinclude="$aclocalinclude -I $k"
   	##else 
 	##  echo "**Warning**: No such directory \`$k'.  Ignored."
         fi
       done
+      touch ChangeLog
       if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
 	if grep "sed.*POTFILES" configure.in >/dev/null; then
 	  : do nothing -- we still have an old unmodified configure.in