* Added buildconf, runs all the scripts necessary to build configure (Stig - if there's any way

  to detect whether we need to run 'automake --add-missing', please add it...)
* Make vpath work again
* Minor UNIX bugfixes

4 files changed, 16 insertions, 8 deletions

diff --git a/Makefile.in b/Makefile.in
index 596380efbb..07f8078bea 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -34,7 +34,7 @@ VPATH = @srcdir@
 bindir = @bindir@
 
 ZEND_DIR = $(srcdir)/libzend
-SUBDIRS=libzend ext
+SUBDIRS=$(srcdir)/libzend ext
 
 CC = @CC@
 AR = ar rc
@@ -83,7 +83,7 @@ FUNCTIONS_SOURCE = functions/adabasd.c functions/apache.c functions/fhttpd.c \
        functions/sysvsem.c functions/sysvshm.c functions/dav.c
 
 FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o)
-PHPLIBS = -L@top_srcdir@/libzend -lzend -L@top_srcdir@/ext -lphpext
+PHPLIBS = -L@top_srcdir@/libzend -lzend -Lext -lphpext
 LIBS = $(PHPLIBS) $(EXTRA_LIBS) @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @LIBS@
 
 all: $(BINNAME)
@@ -103,7 +103,7 @@ php: all-recursive $(OBJS) $(FUNCTIONS) @REGEX_LIB@ @FHTTPD_LIB@ @DBASE_LIB@
 # Apache modules
 libphp3.a libmodphp3.a libmodphp3-so.a: all-recursive $(OBJS) $(FUNCTIONS)
 	$(AR) $@.tmp $(OBJS) $(FUNCTIONS) @DBASE_LIB@
-	scripts/armerge $@ $@.tmp ext/libphpext.a libzend/libzend.a
+	$(srcdir)/scripts/armerge $@ $@.tmp ext/libphpext.a $(srcdir)/libzend/libzend.a
 	@rm -f $@.tmp
 	$(RANLIB) $(BINNAME)
 
@@ -123,7 +123,7 @@ functions/ifx.c: functions/ifx.ec
 configuration-parser.h configuration-parser.c:	$(srcdir)/configuration-parser.y
 	bison -p cfg -v -d $(srcdir)/configuration-parser.y -o configuration-parser.c
 
-configuration-scanner.o:
+configuration-scanner.o:	configuration-scanner.c
 	$(CC) $(CFLAGS) -w$(WARNING_LEVEL) -c configuration-scanner.c
 
 configuration-scanner.c:	$(srcdir)/configuration-scanner.l
diff --git a/buildconf b/buildconf
new file mode 100755
index 0000000000..a2c3c1eb7f
--- /dev/null
+++ b/buildconf
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+./scripts/preconfig
+aclocal
+autoconf
diff --git a/configure.in.in b/configure.in.in
index 96bf30c5e4..46c9ef2abf 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -1,7 +1,10 @@
 dnl $Id$ -*- sh -*-
 dnl Process this file with autoconf to produce a configure script.
 
+
+
 divert(0)
+AC_INIT(main.c)
 recurse=yes
 for arg in $@; do
 	case $arg in
@@ -13,7 +16,7 @@ for arg in $@; do
 done
 
 if test "$recurse" = "yes"; then
-	(cwd=`pwd`;set -x;cd libzend;./configure --cache-file=$cwd/config.cache $@)
+	(cwd=`pwd`; set -x; cd $srcdir/libzend; ./configure --cache-file=$cwd/config.cache $@)
 fi
 
 dnl ## Diversion 1 is the initial checking of OS features, programs,
@@ -33,10 +36,11 @@ dnl ## Diversion 4 is the last one.  Here we generate files and clean up.
 
 divert(1)
 
-AC_INIT(main.c)
 dnl ## This is where the version number is changed from now on!
 AM_INIT_AUTOMAKE(php, 4.0pa1)
 
+
+
 PHP_VERSION=$VERSION
 echo "#define PHP_VERSION \"$PHP_VERSION\"" > php_version.h.new
 if ! cmp php_version.h.new php_version.h >/dev/null; then
diff --git a/scripts/mkextlib.in b/scripts/mkextlib.in
index 2370ae22a2..7acb214e18 100755
--- a/scripts/mkextlib.in
+++ b/scripts/mkextlib.in
@@ -13,5 +13,4 @@ for dir in $extensions; do
     ext_libs="$ext_libs $archive"
 done
 
-dir=`dirname $0`
-(set -x; $dir/armerge $outfile $ext_libs)
+(set -x; $top_srcdir/scripts/armerge $outfile $ext_libs)