summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/config-stubs3
-rwxr-xr-xscripts/preconfig8
2 files changed, 9 insertions, 2 deletions
diff --git a/scripts/config-stubs b/scripts/config-stubs
index 9985066648..7c774f8407 100755
--- a/scripts/config-stubs
+++ b/scripts/config-stubs
@@ -2,6 +2,7 @@
#
# $Id$
-for stubfile in ext/*/config.m4; do
+dir=$1; shift
+for stubfile in $dir/*/config.m4; do
echo "sinclude($stubfile)"
done
diff --git a/scripts/preconfig b/scripts/preconfig
index 59b48fe545..4813fb2687 100755
--- a/scripts/preconfig
+++ b/scripts/preconfig
@@ -10,7 +10,7 @@ if test -w configure.in.new || test -w acconfig.h.new ; then
exit 1
fi
-makefileams=`find ext -name Makefile.am -print | sort`
+makefileams=`find ext sapi -name Makefile.am -print | sort`
makefiles=`echo $makefileams | sed -e 's/\.am//g'`
echo "dnl $disclaimer" > configure.in.new
sed -e "s#@@EXT_MAKEFILES@@#$makefiles#" configure.in.in >> configure.in.new
@@ -29,6 +29,12 @@ if test "$confighfiles" != "ext/*/config.h.stub"; then
cat $file >> acconfig.h.new
done
fi
+confighfiles=`echo sapi/*/config.h.stub`
+if test "$confighfiles" != "sapi/*/config.h.stub"; then
+ for file in $confighfiles; do
+ cat $file >> acconfig.h.new
+ done
+fi
cmp acconfig.h acconfig.h.new > /dev/null 2>&1
if test $? -ne 0 ; then
mv acconfig.h.new acconfig.h