fixes

diff --git a/Makefile.in b/Makefile.in
index d8a42141190eae782361cd02e127cfb7367336f2..e3f62ef77ee78e68ad6fefec4430a38c86e4f04e 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -87,7 +87,7 @@ php: all-recursive $(OBJS) @REGEX_LIB@ @FHTTPD_LIB@ @TSRM_LIB@
        $(CC) $(CFLAGS) -o $(BINNAME) $(LDFLAGS) $(OBJS) $(LIBS)
 
 # Apache modules
-libphp4.a libmodphp4.a: all-recursive $(OBJS)
+libphp4.a libmodphp4.a: all-recursive $(OBJS) @REGEX_LIB@
        $(AR) $@.tmp $(OBJS)
        $(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a @TSRM_LIB@
        @rm -f $@.tmp

diff --git a/scripts/preconfig b/scripts/preconfig
index 60b7f970ace619eb808c5db82d4f14aea376e491..59b48fe54597f28a6249cfa9788a5a9da5d64cbc 100755 (executable)
--- 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`
+makefileams=`find ext -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