fix up the AC_CONFIG_MACRO_DIR check to work with sub-package

2004-10-28  James Henstridge  <james@jamesh.id.au>

	* gnome-autogen.sh (m4dir): fix up the AC_CONFIG_MACRO_DIR check
	to work with sub-package configure.in's.

svn path=/trunk/; revision=3479

diff --git a/macros2/ChangeLog b/macros2/ChangeLog
index b195cdf..ace54b8 100644 (file)
--- a/macros2/ChangeLog
+++ b/macros2/ChangeLog
@@ -1,3 +1,8 @@
+2004-10-28  James Henstridge  <james@jamesh.id.au>
+
+       * gnome-autogen.sh (m4dir): fix up the AC_CONFIG_MACRO_DIR check
+       to work with sub-package configure.in's.
+
 2004-10-27  James Henstridge  <james@jamesh.id.au>
 
        * gnome-autogen.sh (ACLOCAL): if AC_CONFIG_MACRO_DIR() is used in

diff --git a/macros2/gnome-autogen.sh b/macros2/gnome-autogen.sh
index c3173b2..4ad6b89 100644 (file)
--- a/macros2/gnome-autogen.sh
+++ b/macros2/gnome-autogen.sh
@@ -378,7 +378,7 @@ for configure_ac in $configure_files; do
 
        # if the AC_CONFIG_MACRO_DIR() macro is used, pass that
        # directory to aclocal.
-       m4dir=`cat "$configure_ac" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
+       m4dir=`cat "$basename" | grep '^AC_CONFIG_MACRO_DIR' | sed -n -e 's/AC_CONFIG_MACRO_DIR(\([^()]*\))/\1/p' | sed -e 's/^\[\(.*\)\]$/\1/' | sed -e 1q`
        if [ -n "$m4dir" ]; then
            m4dir="-I $m4dir"
        fi