- fixed aclocal rebuilds (no more unexpanded ACX_* macros in final configure scripts)

Changed files:
    gdb.spec -> 1.143

diff --git a/gdb.spec b/gdb.spec
index b262e73209df563a5ac4e0a9cac7c35589970f5c..e42eb0291b05b440d328d8f31bfc6da3915d75fa 100644 (file)
--- a/gdb.spec
+++ b/gdb.spec
@@ -432,12 +432,18 @@ EOF
 sed -i -e 's#_GCC_AUTOCONF_VERSION\], \[2\.64\]#_GCC_AUTOCONF_VERSION], [2.68]#g' config/override.m4
 
 %build
+# omit hand-written gdb/testsuite aclocal.m4
+for dir in gdb gdb/gdbserver ; do
+       olddir=$(pwd)
+       cd $dir
+       %{__rm} aclocal.m4
+       %{__aclocal} $(grep '^ACLOCAL_AMFLAGS' Makefile.in | sed -e 's/.*=//')
+       cd $olddir
+done
 for dir in $(find gdb -name 'configure.in' -o -name 'configure.ac'); do
        dir=$(dirname "$dir")
        olddir=$(pwd)
        cd $dir
-       rm -f aclocal.m4
-       %{__aclocal} `[ -d config ] && echo "-I config"` `[ -d m4 ] && echo "-I m4"` `[ -d gnulib/m4 ] && echo "-I gnulib/m4"`
        %{__autoconf}
        grep -q AC_CONFIG_HEADER configure.* && %{__autoheader}
        cd $olddir