warn if glib.m4 or gettext.m4 are not found in aclocal's directory.

Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>

        * autogen.sh: warn if glib.m4 or gettext.m4 are not found
          in aclocal's directory.

diff --git a/ChangeLog b/ChangeLog
index d0d75a8a9ef912deb29c3e77ed3af6b7d76406f9..c719fec92e494ec9db83617ee7fac0b9ef6aa298 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * autogen.sh: warn if glib.m4 or gettext.m4 are not found 
+          in aclocal's directory.
+
 Tue Dec 15 21:36:14 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/testgtk.c (create_layout): Create buttons,

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index d0d75a8a9ef912deb29c3e77ed3af6b7d76406f9..c719fec92e494ec9db83617ee7fac0b9ef6aa298 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * autogen.sh: warn if glib.m4 or gettext.m4 are not found 
+          in aclocal's directory.
+
 Tue Dec 15 21:36:14 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/testgtk.c (create_layout): Create buttons,

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d0d75a8a9ef912deb29c3e77ed3af6b7d76406f9..c719fec92e494ec9db83617ee7fac0b9ef6aa298 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * autogen.sh: warn if glib.m4 or gettext.m4 are not found 
+          in aclocal's directory.
+
 Tue Dec 15 21:36:14 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/testgtk.c (create_layout): Create buttons,

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d0d75a8a9ef912deb29c3e77ed3af6b7d76406f9..c719fec92e494ec9db83617ee7fac0b9ef6aa298 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * autogen.sh: warn if glib.m4 or gettext.m4 are not found 
+          in aclocal's directory.
+
 Tue Dec 15 21:36:14 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/testgtk.c (create_layout): Create buttons,

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d0d75a8a9ef912deb29c3e77ed3af6b7d76406f9..c719fec92e494ec9db83617ee7fac0b9ef6aa298 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * autogen.sh: warn if glib.m4 or gettext.m4 are not found 
+          in aclocal's directory.
+
 Tue Dec 15 21:36:14 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/testgtk.c (create_layout): Create buttons,

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d0d75a8a9ef912deb29c3e77ed3af6b7d76406f9..c719fec92e494ec9db83617ee7fac0b9ef6aa298 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * autogen.sh: warn if glib.m4 or gettext.m4 are not found 
+          in aclocal's directory.
+
 Tue Dec 15 21:36:14 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/testgtk.c (create_layout): Create buttons,

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d0d75a8a9ef912deb29c3e77ed3af6b7d76406f9..c719fec92e494ec9db83617ee7fac0b9ef6aa298 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Dec 15 21:26:26 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * autogen.sh: warn if glib.m4 or gettext.m4 are not found 
+          in aclocal's directory.
+
 Tue Dec 15 21:36:14 1998  Owen Taylor  <otaylor@redhat.com>
 
        * gtk/testgtk.c (create_layout): Create buttons,

diff --git a/autogen.sh b/autogen.sh
index 2cb68864e7a657ecef3a0f817c7da2fad4a55088..35a16326407a1d859c06e72cbfe98c061be38e9b 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -54,6 +54,25 @@ case $CC in
 *xlc | *xlc\ * | *lcc | *lcc\ *) am_opt=--include-deps;;
 esac
 
+if test -z "$ACLOCAL_FLAGS"; then
+
+       acdir=`aclocal --print-ac-dir`
+        m4list="glib.m4 gettext.m4"
+
+       for file in $m4list
+       do
+               if [ ! -f "$acdir/$file" ]; then
+                       echo "WARNING: aclocal's directory is $acdir, but..."
+                       echo "         no file $acdir/$file"
+                       echo "         You may see fatal macro warnings below."
+                       echo "         If these files are installed in /some/dir, set the ACLOCAL_FLAGS "
+                       echo "         environment variable to \"-I /some/dir\", or install"
+                       echo "         $acdir/$file."
+                       echo ""
+               fi
+       done
+fi
+
 echo "Running gettextize...  Ignore non-fatal messages."
 # Hmm, we specify --force here, since otherwise things dont'
 # get added reliably, but we don't want to overwrite intl