convert to automake

8 files changed, 533 insertions, 629 deletions

diff --git a/Zend/Makefile.am b/Zend/Makefile.am
new file mode 100644
index 0000000000..fa9d547b92
--- /dev/null
+++ b/Zend/Makefile.am
@@ -0,0 +1,21 @@
+## Process this file with automake to produce Makefile.in -*- makefile -*-
+AUTOMAKE_OPTIONS=foreign
+noinst_LIBRARIES=libzend.a
+libzend_a_SOURCES=zend_alloc.c zend_compile.c zend_constants.c \
+	zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
+	zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
+	zend_variables.c zend-parser.c zend-scanner.c zend.c zend_API.c \
+	zend_extensions.c zend_hash.c zend_list.c zend_indent.c \
+	zend-parser.y zend-scanner.l
+
+# automake isn't too clever about "non-standard" use of lex and yacc
+
+zend-scanner.c: zend-scanner.l
+	$(LEX) -Pzend -ozend-scanner.c -i zend-scanner.l
+
+zend-parser.h: zend-parser.c
+zend-parser.c: zend-parser.y
+	$(YACC) -p zend -v -d zend-parser.y -o zend-parser.c
+
+clean:
+	-rm -f zend-parser.c zend-parser.h zend-scanner.c
diff --git a/Zend/Makefile.in b/Zend/Makefile.in
index 929c8194c8..35163c1e47 100644
--- a/Zend/Makefile.in
+++ b/Zend/Makefile.in
@@ -1,145 +1,378 @@
+# Makefile.in generated automatically by automake 1.3 from Makefile.am
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+
+SHELL = /bin/sh
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+
+DISTDIR =
+
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+
+top_builddir = .
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+transform = @program_transform_name@
+
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
 CC = @CC@
-AR = ar rc
-LIBNAME = libzend.a
-PROF_CFLAGS =
 CFLAGS_SHLIB = @CFLAGS_SHLIB@
+DEBUG_CFLAGS = @DEBUG_CFLAGS@
 LDFLAGS_SHLIB = @LDFLAGS_SHLIB@
 LDFLAGS_SHLIB_EXPORT = @LDFLAGS_SHLIB_EXPORT@
-CPPFLAGS = @CPPFLAGS@
-CFLAGS = @CFLAGS@ $(CFLAGS_SHLIB) $(CPPFLAGS) $(INCLUDE) @DEBUG_CFLAGS@ $(PROF_CFLAGS)
-LDFLAGS = @LDFLAGS@ $(LDFLAGS_SHLIB) $(LDFLAGS_SHLIB_EXPORT)
+LEX = @LEX@
+MAKEINFO = @MAKEINFO@
+PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
+VERSION = @VERSION@
 YACC = @YACC@
 
-SOURCE = zend_alloc.c zend_compile.c zend_constants.c zend_execute.c zend_execute_API.c \
-       zend_highlight.c zend_llist.c zend_opcode.c zend_operators.c zend_ptr_stack.c \
-       zend_stack.c zend_variables.c zend-parser.c zend-scanner.c zend.c zend_API.c zend_extensions.c \
-       zend_hash.c zend_list.c zend_indent.c
-       
-OBJS = zend_alloc.o zend_compile.o zend_constants.o zend_execute.o zend_execute_API.o \
-       zend_highlight.o zend_llist.o zend_opcode.o zend_operators.o zend_ptr_stack.o \
-       zend_stack.o zend_variables.o zend-parser.o zend-scanner.o zend.o zend_API.o zend_extensions.o \
-       zend_hash.o zend_list.o zend_indent.o
+AUTOMAKE_OPTIONS=foreign
+noinst_LIBRARIES=libzend.a
+libzend_a_SOURCES=zend_alloc.c zend_compile.c zend_constants.c \
+	zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \
+	zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
+	zend_variables.c zend-parser.c zend-scanner.c zend.c zend_API.c \
+	zend_extensions.c zend_hash.c zend_list.c zend_indent.c \
+	zend-parser.y zend-scanner.l
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = zend_config.h
+CONFIG_CLEAN_FILES = 
+LIBRARIES =  $(noinst_LIBRARIES)
 
+
+DEFS = @DEFS@ -I. -I$(srcdir) -I.
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
+libzend_a_LIBADD = 
+libzend_a_OBJECTS =  zend_alloc.o zend_compile.o zend_constants.o \
+zend_execute.o zend_execute_API.o zend_highlight.o zend_llist.o \
+zend_opcode.o zend_operators.o zend_ptr_stack.o zend_stack.o \
+zend_variables.o zend-parser.o zend-scanner.o zend.o zend_API.o \
+zend_extensions.o zend_hash.o zend_list.o zend_indent.o zend-parser.o \
+zend-scanner.o
+AR = ar
+LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
+LEXLIB = @LEXLIB@
+CFLAGS = @CFLAGS@
+COMPILE = $(CC) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
+LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
+DIST_COMMON =  COPYING INSTALL Makefile.am Makefile.in acconfig.h \
+acinclude.m4 aclocal.m4 configure configure.in install-sh missing \
+mkinstalldirs stamp-h.in zend-parser.c zend-scanner.c zend_config.h.in
+
+
+DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+
+TAR = tar
+GZIP = --best
+DEP_FILES =  .deps/zend-parser.P .deps/zend-scanner.P .deps/zend.P \
+.deps/zend_API.P .deps/zend_alloc.P .deps/zend_compile.P \
+.deps/zend_constants.P .deps/zend_execute.P .deps/zend_execute_API.P \
+.deps/zend_extensions.P .deps/zend_hash.P .deps/zend_highlight.P \
+.deps/zend_indent.P .deps/zend_list.P .deps/zend_llist.P \
+.deps/zend_opcode.P .deps/zend_operators.P .deps/zend_ptr_stack.P \
+.deps/zend_stack.P .deps/zend_variables.P
+SOURCES = $(libzend_a_SOURCES)
+OBJECTS = $(libzend_a_OBJECTS)
+
+all: Makefile $(LIBRARIES) zend_config.h
+
+.SUFFIXES:
+.SUFFIXES: .S .c .l .o .s .y
+$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile
+
+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
+	cd $(top_builddir) \
+	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+
+$(ACLOCAL_M4):  configure.in  acinclude.m4
+	cd $(srcdir) && $(ACLOCAL)
+
+config.status: $(srcdir)/configure
+	$(SHELL) ./config.status --recheck
+$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+	cd $(srcdir) && $(AUTOCONF)
+
+zend_config.h: stamp-h
+	@:
+stamp-h: $(srcdir)/zend_config.h.in $(top_builddir)/config.status
+	cd $(top_builddir) \
+	  && CONFIG_FILES= CONFIG_HEADERS=zend_config.h \
+	     $(SHELL) ./config.status
+	@echo timestamp > stamp-h
+$(srcdir)/zend_config.h.in: $(srcdir)/stamp-h.in
+$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
+	cd $(top_srcdir) && $(AUTOHEADER)
+	@echo timestamp > $(srcdir)/stamp-h.in
+
+mostlyclean-hdr:
+
+clean-hdr:
+
+distclean-hdr:
+	-rm -f zend_config.h
+
+maintainer-clean-hdr:
+
+mostlyclean-noinstLIBRARIES:
+
+clean-noinstLIBRARIES:
+	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
+
+distclean-noinstLIBRARIES:
+
+maintainer-clean-noinstLIBRARIES:
+
+.s.o:
+	$(COMPILE) -c $<
+
+.S.o:
+	$(COMPILE) -c $<
+
+mostlyclean-compile:
+	-rm -f *.o core *.core
+
+clean-compile:
+
+distclean-compile:
+	-rm -f *.tab.c
 
-all:	$(LIBNAME)
+maintainer-clean-compile:
 
-libzend.a: $(OBJS)
+libzend.a: $(libzend_a_OBJECTS) $(libzend_a_DEPENDENCIES)
 	-rm -f libzend.a
-	$(AR) libzend.a $(OBJS)
+	$(AR) cru libzend.a $(libzend_a_OBJECTS) $(libzend_a_LIBADD)
 	$(RANLIB) libzend.a
-	
-zend-parser.h zend-parser.c: zend-parser.y
-	bison -p zend -v -d zend-parser.y -o zend-parser.c
-
-zend-scanner.o:
-	$(CC) $(CFLAGS) -w -c zend-scanner.c
-
-zend-scanner.c:  zend-scanner.l
-	flex -Pzend -ozend-scanner.c -i zend-scanner.l
-
-clean:  
-	-rm -f libzend.a *.o
-
-distclean: clean
-	-rm -f *-scanner.c *-parser.[ch] *.output
-	-rm -f config.status config.cache config.log
-	-rm -f Makefile Makefile.depend config.h
-
-.c.o:
-	@rm -f $@
-	$(CC) $(CFLAGS) -c $< -o $@
-	@bn=`echo $@ | sed -e 's#functions/##'`; test -f $@ || \
-	  (test "$@" != "$$bn" && test -f "$$bn" && mv $$bn $@)
-
-parser-scanner: zend-parser.c zend-parser.h zend-scanner.c
-
-depend:	parser-scanner
-	$(CC) $(CFLAGS) -MM $(SOURCE) | perl -pe 's|regex/regex.h||;' > Makefile.depend
-
-
-zend_alloc.o: zend_alloc.c zend.h config.h config.unix.h zend_errors.h \
- zend_alloc.h zend_hash.h zend_llist.h zend_globals.h zend_stack.h \
- zend_ptr_stack.h zend_compile.h zend-parser.h zend_execute.h
-zend_compile.o: zend_compile.c zend.h config.h config.unix.h \
- zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_compile.h \
- zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
- zend_execute.h zend_API.h modules.h zend_list.h zend_variables.h \
- zend_operators.h
-zend_constants.o: zend_constants.c zend.h config.h config.unix.h \
- zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_constants.h \
- zend_variables.h zend_operators.h zend_globals.h zend_stack.h \
- zend_ptr_stack.h zend_compile.h zend-parser.h zend_execute.h
-zend_execute.o: zend_execute.c zend.h config.h config.unix.h \
- zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_compile.h \
- zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
- zend_execute.h zend_API.h modules.h zend_list.h zend_variables.h \
- zend_operators.h zend_constants.h zend_extensions.h
-zend_execute_API.o: zend_execute_API.c zend.h config.h config.unix.h \
- zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_compile.h \
- zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
- zend_execute.h zend_API.h modules.h zend_list.h zend_variables.h \
- zend_operators.h zend_constants.h zend_extensions.h
-zend_highlight.o: zend_highlight.c zend.h config.h config.unix.h \
- zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_compile.h \
- zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
- zend_execute.h zend_highlight.h
-zend_llist.o: zend_llist.c zend.h config.h config.unix.h zend_errors.h \
- zend_alloc.h zend_hash.h zend_llist.h
-zend_opcode.o: zend_opcode.c zend.h config.h config.unix.h \
- zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_compile.h \
- zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
- zend_execute.h zend_variables.h zend_operators.h zend_extensions.h \
- zend_API.h modules.h zend_list.h
-zend_operators.o: zend_operators.c zend.h config.h config.unix.h \
- zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_operators.h \
- zend_variables.h zend_globals.h zend_stack.h zend_ptr_stack.h \
- zend_compile.h zend-parser.h zend_execute.h
-zend_ptr_stack.o: zend_ptr_stack.c zend.h config.h config.unix.h \
- zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_ptr_stack.h
-zend_stack.o: zend_stack.c zend.h config.h config.unix.h zend_errors.h \
- zend_alloc.h zend_hash.h zend_llist.h zend_stack.h
-zend_variables.o: zend_variables.c zend.h config.h config.unix.h \
- zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_API.h \
- modules.h zend_list.h zend_globals.h zend_stack.h zend_ptr_stack.h \
- zend_compile.h zend-parser.h zend_execute.h zend_constants.h \
- zend_variables.h
-zend-parser.o: zend-parser.c zend_compile.h zend.h config.h \
- config.unix.h zend_errors.h zend_alloc.h zend_hash.h zend_llist.h \
- zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
- zend_execute.h zend_list.h zend_API.h modules.h zend_variables.h \
- zend_operators.h
-zend-scanner.o: zend-scanner.c zend.h config.h config.unix.h \
- zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_compile.h \
- zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
- zend_execute.h zend-scanner.h zend_highlight.h zend_constants.h \
- zend_variables.h zend_operators.h
-zend.o: zend.c zend.h config.h config.unix.h zend_errors.h \
- zend_alloc.h zend_hash.h zend_llist.h zend_operators.h \
- zend_variables.h zend_extensions.h zend_compile.h zend-parser.h \
- zend_globals.h zend_stack.h zend_ptr_stack.h zend_execute.h modules.h \
- zend_constants.h zend_list.h
-zend_API.o: zend_API.c zend.h config.h config.unix.h zend_errors.h \
- zend_alloc.h zend_hash.h zend_llist.h zend_variables.h zend_execute.h \
- zend_compile.h zend-parser.h zend_globals.h zend_stack.h \
- zend_ptr_stack.h zend_API.h modules.h zend_list.h zend_constants.h \
- zend_operators.h
-zend_extensions.o: zend_extensions.c zend_extensions.h zend_compile.h \
- zend.h config.h config.unix.h zend_errors.h zend_alloc.h zend_hash.h \
- zend_llist.h zend-parser.h zend_globals.h zend_stack.h \
- zend_ptr_stack.h zend_execute.h
-zend_hash.o: zend_hash.c zend.h config.h config.unix.h zend_errors.h \
- zend_alloc.h zend_hash.h zend_llist.h
-zend_list.o: zend_list.c zend.h config.h config.unix.h zend_errors.h \
- zend_alloc.h zend_hash.h zend_llist.h zend_list.h zend_API.h \
- modules.h zend_globals.h zend_stack.h zend_ptr_stack.h zend_compile.h \
- zend-parser.h zend_execute.h
-zend_indent.o: zend_indent.c zend.h config.h config.unix.h \
- zend_errors.h zend_alloc.h zend_hash.h zend_llist.h zend_compile.h \
- zend-parser.h zend_globals.h zend_stack.h zend_ptr_stack.h \
- zend_execute.h zend_indent.h
-
-# Local Variables:
-# tab-width: 4
-# End:
+.y.c:
+	$(YACC) $(YFLAGS) $< && mv y.tab.c $*.c
+	if test -f y.tab.h; then \
+	if cmp -s y.tab.h $*.h; then rm -f y.tab.h; else mv y.tab.h $*.h; fi; \
+	else :; fi
+zend-parser.h: zend-parser.c
+
+.l.c:
+	$(LEX) $(LFLAGS) $< && mv $(LEX_OUTPUT_ROOT).c $@
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP)
+	here=`pwd` && cd $(srcdir) \
+	  && mkid -f$$here/ID $(SOURCES) $(HEADERS) $(LISP)
+
+TAGS:  $(HEADERS) $(SOURCES) zend_config.h.in $(TAGS_DEPENDENCIES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)'; \
+	unique=`for i in $$list; do echo $$i; done | \
+	  awk '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)zend_config.h.in$$unique$(LISP)$$tags" \
+	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags zend_config.h.in $$unique $(LISP) -o $$here/TAGS)
+
+mostlyclean-tags:
+
+clean-tags:
+
+distclean-tags:
+	-rm -f TAGS ID
+
+maintainer-clean-tags:
+
+distdir = $(PACKAGE)-$(VERSION)
+top_distdir = $(distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	-rm -rf $(distdir)
+	GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	dc_install_base=`cd $(distdir)/=inst && pwd`; \
+	cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	  && $(MAKE) \
+	  && $(MAKE) dvi \
+	  && $(MAKE) check \
+	  && $(MAKE) install \
+	  && $(MAKE) installcheck \
+	  && $(MAKE) dist
+	-rm -rf $(distdir)
+	@echo "========================"; \
+	echo "$(distdir).tar.gz is ready for distribution"; \
+	echo "========================"
+dist: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+dist-all: distdir
+	-chmod -R a+r $(distdir)
+	GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)
+	-rm -rf $(distdir)
+distdir: $(DISTFILES)
+	-rm -rf $(distdir)
+	mkdir $(distdir)
+	-chmod 777 $(distdir)
+	here=`cd $(top_builddir) && pwd`; \
+	top_distdir=`cd $(distdir) && pwd`; \
+	distdir=`cd $(distdir) && pwd`; \
+	cd $(top_srcdir) \
+	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --foreign Makefile
+	@for file in $(DISTFILES); do \
+	  d=$(srcdir); \
+	  test -f $(distdir)/$$file \
+	  || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
+	  || cp -p $$d/$$file $(distdir)/$$file; \
+	done
+
+DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
+
+-include $(DEP_FILES)
+
+mostlyclean-depend:
+
+clean-depend:
+
+distclean-depend:
+
+maintainer-clean-depend:
+	-rm -rf .deps
+
+%.o: %.c
+	@echo '$(COMPILE) -c $<'; \
+	$(COMPILE) -Wp,-MD,.deps/$(*F).P -c $<
+
+%.lo: %.c
+	@echo '$(LTCOMPILE) -c $<'; \
+	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).p -c $<
+	@-sed -e 's/^\([^:]*\)\.o:/\1.lo \1.o:/' \
+	  < .deps/$(*F).p > .deps/$(*F).P
+	@-rm -f .deps/$(*F).p
+info:
+dvi:
+check: all
+	$(MAKE)
+installcheck:
+install-exec: 
+	@$(NORMAL_INSTALL)
+
+install-data: 
+	@$(NORMAL_INSTALL)
+
+install: install-exec install-data all
+	@:
+
+uninstall: 
+
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' INSTALL_SCRIPT='$(INSTALL_PROGRAM)' install
+installdirs:
+
+
+mostlyclean-generic:
+	-test -z "$(MOSTLYCLEANFILES)" || rm -f $(MOSTLYCLEANFILES)
+
+clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
+
+distclean-generic:
+	-rm -f Makefile $(DISTCLEANFILES)
+	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	-test -z "$(MAINTAINERCLEANFILES)" || rm -f $(MAINTAINERCLEANFILES)
+	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
+mostlyclean:  mostlyclean-hdr mostlyclean-noinstLIBRARIES \
+		mostlyclean-compile mostlyclean-tags mostlyclean-depend \
+		mostlyclean-generic
+
+clean:  clean-hdr clean-noinstLIBRARIES clean-compile clean-tags \
+		clean-depend clean-generic mostlyclean
+
+distclean:  distclean-hdr distclean-noinstLIBRARIES distclean-compile \
+		distclean-tags distclean-depend distclean-generic clean
+	-rm -f config.status
+
+maintainer-clean:  maintainer-clean-hdr maintainer-clean-noinstLIBRARIES \
+		maintainer-clean-compile maintainer-clean-tags \
+		maintainer-clean-depend maintainer-clean-generic \
+		distclean
+	@echo "This command is intended for maintainers to use;"
+	@echo "it deletes files that may require special tools to rebuild."
+	-rm -f config.status
+
+.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
+mostlyclean-noinstLIBRARIES distclean-noinstLIBRARIES \
+clean-noinstLIBRARIES maintainer-clean-noinstLIBRARIES \
+mostlyclean-compile distclean-compile clean-compile \
+maintainer-clean-compile tags mostlyclean-tags distclean-tags \
+clean-tags maintainer-clean-tags distdir mostlyclean-depend \
+distclean-depend clean-depend maintainer-clean-depend info dvi \
+installcheck install-exec install-data install uninstall all \
+installdirs mostlyclean-generic distclean-generic clean-generic \
+maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+
+
+# automake isn't too clever about "non-standard" use of lex and yacc
+
+zend-scanner.c: zend-scanner.l
+	$(LEX) -Pzend -ozend-scanner.c -i zend-scanner.l
+
+zend-parser.h: zend-parser.c
+zend-parser.c: zend-parser.y
+	$(YACC) -p zend -v -d zend-parser.y -o zend-parser.c
+
+clean:
+	-rm -f zend-parser.c zend-parser.h zend-scanner.c
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/Zend/acconfig.h b/Zend/acconfig.h
index b5a369dab8..6008a973e2 100644
--- a/Zend/acconfig.h
+++ b/Zend/acconfig.h
@@ -1,6 +1,10 @@
 /* This is the default configuration file to read */
 #define USE_CONFIG_FILE 1
 
+/* these are defined by automake */
+#undef PACKAGE
+#undef VERSION
+
 /* define uint by configure if it is missed (QNX and BSD derived) */
 #undef uint
 
@@ -10,15 +14,6 @@
 /* type check for in_addr_t */
 #undef in_addr_t
 
-/* Solaris YP check */
-#undef SOLARIS_YP
-
-/* Netscape LDAP SDK check */
-#undef HAVE_NSLDAP
-
-/* ImageMagick check */
-#undef HAVE_LIBMAGICK
-
 /* Define if you have dirent.h but opendir() resides in libc rather than in libdir */
 /* This will cause HAVE_DIRENT_H defined twice sometimes, but it should be problem */
 #define HAVE_DIRENT_H 0
@@ -29,213 +24,24 @@
 /* Define if you have the resolv library (-lresolv). */
 #define HAVE_LIBRESOLV 0
 
-/* Define if you have the gd library (-lgd). */
-#define HAVE_LIBGD 0
-
-/* Define if you have the GNU gettext library (-lintl). */
-#define HAVE_LIBINTL 0
-
-/* Define if you have the zlib library */
-#define HAVE_ZLIB 0
-
-/* Define if you have the gd version 1.3 library (-lgd). */
-#define HAVE_LIBGD13 0
-
 /* Undefine if you want stricter XML/SGML compliance by default */
 /* (this disables "<?expression?>" by default) */
 #define DEFAULT_SHORT_OPEN_TAG 1
 
-/* Define if you want the logging to go to ndbm/gdbm/flatfile */
-#define LOG_DBM 0
-#define LOG_DBM_DIR "."
-
-/* Define if you want the logging to go to a mysql database */
-#define LOG_MYSQL 0
-
-/* Define if you want the logging to go to a mysql database */
-#define LOG_MSQL 0
-
-/* Define these if you are using an SQL database for logging */
-#define LOG_SQL_HOST ""
-#define LOG_SQL_DB ""
-
-/* Define if you an ndbm compatible library (-ldbm).  */
-#define NDBM 0
-
-/* Define if you have the gdbm library (-lgdbm).  */
-#define GDBM 0
-
 /* Define both of these if you want the bundled REGEX library */
 #define REGEX 0
 #define HSREGEX 0
 
-/* Define if you want Solid database support */
-#define HAVE_SOLID 0
-
-/* Define if you want to use the supplied dbase library */
-#define DBASE 0
-
-/* Define if you want Hyperwave support */
-#define HYPERWAVE 0
-
-/* Define if you have the crypt() function */
-#define HAVE_CRYPT 1
-
-/* Define if you have the Oracle database client libraries */
-#define HAVE_ORACLE 0
-
-/* Define if you have the Oracle version 8 database client libraries */
-#define HAVE_OCI8 0
-
-/* Define if you want to use the iODBC database driver */
-#define HAVE_IODBC 0
-
-/* Define if you want to use the OpenLink ODBC database driver */
-#define HAVE_OPENLINK 0
-
-/* Define if you have the AdabasD client libraries */
-#define HAVE_ADABAS 0
-
-/* Define if you want the LDAP directory interface */
-#define HAVE_LDAP 0
-
-/* Define if you want the Cybercash MCK support */
-#define HAVE_MCK 0
-
-/* Define if you want the SNMP interface */
-#define HAVE_SNMP 0
-
-/* Define if you want the IMAP directory interface */
-#define HAVE_IMAP 0
-
-/* Define if you want the ASPELL interface */
-#define HAVE_ASPELL 0
-
-/* Define if you want to use a custom ODBC database driver */
-#define HAVE_CODBC 0
-
-/* Define to use the unified ODBC interface */
-#define HAVE_UODBC 0
-
 /* Define if you have libdl (used for dynamic linking) */
 #define HAVE_LIBDL 0
 
-/* Define if you have libdnet_stub (used for Sybase support) */
-#define HAVE_LIBDNET_STUB 0
-
-/* Define if you have and want to use libcrypt */
-#define HAVE_LIBCRYPT 0
-
-/* Define if you have and want to use libpam */
-#define HAVE_LIBPAM 0
-
-/* Define if you have the sendmail program available */
-#define HAVE_SENDMAIL 0
-
-/* Define if your Apache creates an ap_config.h header file (only 1.3b6 and later) */
-#define HAVE_AP_CONFIG_H 0
-
-/* Define if your Apache has src/include/compat.h */
-#define HAVE_OLD_COMPAT_H 0
-
-/* Define if your Apache has src/include/ap_compat.h */
-#define HAVE_AP_COMPAT_H 0
-
-#ifndef HAVE_EMPRESS
-#define HAVE_EMPRESS 0
-#endif
-
-#define HAVE_SYBASE 0
-#define HAVE_SYBASE_CT 0
-
-#ifndef HAVE_MYSQL
-#define HAVE_MYSQL 0
-#endif
-
-#ifndef HAVE_MSQL
-#define HAVE_MSQL 0
-#endif
-
-#ifndef HAVE_PGSQL
-#define HAVE_PGSQL 0
-#endif
-
-#ifndef HAVE_VELOCIS
-#define HAVE_VELOCIS 0
-#endif
-
-#ifndef HAVE_IFX
-#define HAVE_IFX 0
-#endif
-#ifndef HAVE_IFX_IUS
-#define HAVE_IFX_IUS 0
-#endif
-#ifndef IFX_VERSION
-#define IFX_VERSION 0
-#endif
-
-#ifndef HAVE_IBASE
-#define HAVE_IBASE 0
-#endif
-
-#ifndef HAVE_PQCMDTUPLES
-#define HAVE_PQCMDTUPLES 0
-#endif
-
 #undef ZEND_DEBUG
 
-/* Define if your system has the gettimeofday() call */
-#define HAVE_GETTIMEOFDAY 0
-
-/* Define if your system has the getrusage() call */
-#define HAVE_GETRUSAGE 0
-
-/* Define if your system has the putenv() library call */
-#define HAVE_PUTENV 0
-
 /* Define if you want to enable bc style precision math support */
 #define WITH_BCMATH 0
 
-/* Define if you want to prevent the CGI from working unless REDIRECT_STATUS is defined in the environment */
-#define FORCE_CGI_REDIRECT 0
-
-/* Define if you want to prevent the CGI from using path_info and path_translated */
-#define DISCARD_PATH 0
-
 /* Define if you want to enable memory limit support */
 #define MEMORY_LIMIT 0
 
-/* Define if you want System V semaphore support.
- */
-#define HAVE_SYSVSEM 0
-
-/* Define if you have union semun.
- */
-#define HAVE_SEMUN 0
-
-/* Define if you want System V shared memory support.  */
-#define HAVE_SYSVSHM 0
-
-/* Define if you want to enable displaying source support. */
-#define HAVE_DISPLAY_SOURCE 0
-
-/* Define if you have broken header files like SunOS 4 */
-#define MISSING_FCLOSE_DECL 0
-
 /* Define if you have broken sprintf function like SunOS 4 */
 #define BROKEN_SPRINTF 0
-
-/* Define if you have the expat (XML Parser Toolkit) library */
-#define HAVE_LIBEXPAT 0
-
-/* Define if you have the pdflib library */
-#define HAVE_PDFLIB 0
-
-/* Define if you have the fdftk library */
-#define HAVE_FDFLIB 0
-
-/* Define to compile with mod_dav support */
-#define HAVE_MOD_DAV 0
-
-/* Define to enable yp/nis support */
-#define HAVE_YP 0
diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4
new file mode 100644
index 0000000000..9b1421eb6e
--- /dev/null
+++ b/Zend/acinclude.m4
@@ -0,0 +1,20 @@
+dnl $Id$
+dnl
+dnl This file contains local autoconf functions.
+
+dnl
+dnl Check for broken sprintf()
+dnl
+AC_DEFUN(AC_BROKEN_SPRINTF,[
+  AC_MSG_CHECKING([for broken sprintf])
+  AC_TRY_RUN([main() { char buf[20]; exit (sprintf(buf,"testing 123")!=11); }],[
+    AC_DEFINE(BROKEN_SPRINTF,0)
+    AC_MSG_RESULT(ok)
+  ],[
+    AC_DEFINE(BROKEN_SPRINTF,1)
+    AC_MSG_RESULT(broken)
+  ],[
+    AC_DEFINE(BROKEN_SPRINTF,0)
+    AC_MSG_RESULT(cannot check, guessing ok)
+  ])
+])
diff --git a/Zend/aclocal.m4 b/Zend/aclocal.m4
index 3bea7217f9..474da03f38 100644
--- a/Zend/aclocal.m4
+++ b/Zend/aclocal.m4
@@ -1,3 +1,15 @@
+dnl aclocal.m4 generated automatically by aclocal 1.3
+
+dnl Copyright (C) 1994, 1995, 1996, 1997, 1998 Free Software Foundation, Inc.
+dnl This Makefile.in is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl This program is distributed in the hope that it will be useful,
+dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+dnl PARTICULAR PURPOSE.
+
 dnl $Id$
 dnl
 dnl This file contains local autoconf functions.
@@ -18,7 +30,49 @@ AC_DEFUN(AC_BROKEN_SPRINTF,[
     AC_MSG_RESULT(cannot check, guessing ok)
   ])
 ])
-# another one stolen from automake temporarily
+
+# Do all the work for Automake.  This macro actually does too much --
+# some checks are only needed if your package does certain things.
+# But this isn't really a big deal.
+
+# serial 1
+
+dnl Usage:
+dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+
+AC_DEFUN(AM_INIT_AUTOMAKE,
+[AC_REQUIRE([AM_PROG_INSTALL])
+PACKAGE=[$1]
+AC_SUBST(PACKAGE)
+VERSION=[$2]
+AC_SUBST(VERSION)
+dnl test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
+fi
+ifelse([$3],,
+AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE")
+AC_DEFINE_UNQUOTED(VERSION, "$VERSION"))
+AC_REQUIRE([AM_SANITY_CHECK])
+AC_REQUIRE([AC_ARG_PROGRAM])
+dnl FIXME This is truly gross.
+missing_dir=`cd $ac_aux_dir && pwd`
+AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
+AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
+AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
+AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
+AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
+AC_REQUIRE([AC_PROG_MAKE_SET])])
+
+
+# serial 1
+
+AC_DEFUN(AM_PROG_INSTALL,
+[AC_REQUIRE([AC_PROG_INSTALL])
+test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}'
+AC_SUBST(INSTALL_SCRIPT)dnl
+])
+
 #
 # Check to make sure that the build environment is sane.
 #
@@ -35,10 +89,21 @@ echo timestamp > conftestfile
 # directory).
 if (
    set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "$@" = "X"; then
+   if test "[$]*" = "X"; then
       # -L didn't work.
       set X `ls -t $srcdir/configure conftestfile`
    fi
+   if test "[$]*" != "X $srcdir/configure conftestfile" \
+      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+
+      # If neither matched, then we have a broken ls.  This can happen
+      # if, for instance, CONFIG_SHELL is bash and it inherits a
+      # broken ls alias from the environment.  This has actually
+      # happened.  Such a system could not be considered "sane".
+      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
+alias in your environment])
+   fi
+
    test "[$]2" = conftestfile
    )
 then
@@ -50,3 +115,52 @@ Check your system clock])
 fi
 rm -f conftest*
 AC_MSG_RESULT(yes)])
+
+dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
+dnl The program must properly implement --version.
+AC_DEFUN(AM_MISSING_PROG,
+[AC_MSG_CHECKING(for working $2)
+# Run test in a subshell; some versions of sh will print an error if
+# an executable is not found, even if stderr is redirected.
+# Redirect stdin to placate older versions of autoconf.  Sigh.
+if ($2 --version) < /dev/null > /dev/null 2>&1; then
+   $1=$2
+   AC_MSG_RESULT(found)
+else
+   $1="$3/missing $2"
+   AC_MSG_RESULT(missing)
+fi
+AC_SUBST($1)])
+
+# Like AC_CONFIG_HEADER, but automatically create stamp file.
+
+AC_DEFUN(AM_CONFIG_HEADER,
+[AC_PREREQ([2.12])
+AC_CONFIG_HEADER([$1])
+dnl When config.status generates a header, we must update the stamp-h file.
+dnl This file resides in the same directory as the config header
+dnl that is generated.  We must strip everything past the first ":",
+dnl and everything past the last "/".
+AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
+ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
+<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
+<<am_indx=1
+for am_file in <<$1>>; do
+  case " <<$>>CONFIG_HEADERS " in
+  *" <<$>>am_file "*<<)>>
+    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
+    ;;
+  esac
+  am_indx=`expr "<<$>>am_indx" + 1`
+done<<>>dnl>>)
+changequote([,]))])
+
+
+dnl AM_PROG_LEX
+dnl Look for flex, lex or missing, then run AC_PROG_LEX and AC_DECL_YYTEXT
+AC_DEFUN(AM_PROG_LEX,
+[missing_dir=ifelse([$1],,`cd $ac_aux_dir && pwd`,$1)
+AC_CHECK_PROGS(LEX, flex lex, "$missing_dir/missing flex")
+AC_PROG_LEX
+AC_DECL_YYTEXT])
+
diff --git a/Zend/config.h.in b/Zend/config.h.in
deleted file mode 100644
index 1791ba610b..0000000000
--- a/Zend/config.h.in
+++ /dev/null
@@ -1,262 +0,0 @@
-/* config.h.in.  Generated automatically from configure.in by autoheader.  */
-
-/* Define if using alloca.c.  */
-#undef C_ALLOCA
-
-/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems.
-   This function is required for alloca.c support on those systems.  */
-#undef CRAY_STACKSEG_END
-
-/* Define if you have alloca, as a function or macro.  */
-#undef HAVE_ALLOCA
-
-/* Define if you have <alloca.h> and it should be used (not on Ultrix).  */
-#undef HAVE_ALLOCA_H
-
-/* Define if you don't have vprintf but do have _doprnt.  */
-#undef HAVE_DOPRNT
-
-/* Define if utime(file, NULL) sets file's timestamp to the present.  */
-#undef HAVE_UTIME_NULL
-
-/* Define if you have the vprintf function.  */
-#undef HAVE_VPRINTF
-
-/* Define if your C compiler doesn't accept -c and -o together.  */
-#undef NO_MINUS_C_MINUS_O
-
-/* Define to `unsigned' if <sys/types.h> doesn't define.  */
-#undef size_t
-
-/* If using the C implementation of alloca, define if you know the
-   direction of stack growth for your system; otherwise it will be
-   automatically deduced at run-time.
- STACK_DIRECTION > 0 => grows toward higher addresses
- STACK_DIRECTION < 0 => grows toward lower addresses
- STACK_DIRECTION = 0 => direction of growth unknown
- */
-#undef STACK_DIRECTION
-
-/* Define if you have the ANSI C header files.  */
-#undef STDC_HEADERS
-
-/* define uint by configure if it is missed (QNX and BSD derived) */
-#undef uint
-
-/* define ulong by configure if it is missed (most probably is) */
-#undef ulong
-
-/* Define if you have libdl (used for dynamic linking) */
-#define HAVE_LIBDL 0
-
-#undef ZEND_DEBUG
-
-/* Define if you want to enable memory limit support */
-#define MEMORY_LIMIT 0
-
-/* Define if you have broken sprintf function like SunOS 4 */
-#define BROKEN_SPRINTF 0
-
-/* Define if you have the crypt function.  */
-#undef HAVE_CRYPT
-
-/* Define if you have the cuserid function.  */
-#undef HAVE_CUSERID
-
-/* Define if you have the flock function.  */
-#undef HAVE_FLOCK
-
-/* Define if you have the gcvt function.  */
-#undef HAVE_GCVT
-
-/* Define if you have the getlogin function.  */
-#undef HAVE_GETLOGIN
-
-/* Define if you have the getopt function.  */
-#undef HAVE_GETOPT
-
-/* Define if you have the gettimeofday function.  */
-#undef HAVE_GETTIMEOFDAY
-
-/* Define if you have the inet_aton function.  */
-#undef HAVE_INET_ATON
-
-/* Define if you have the link function.  */
-#undef HAVE_LINK
-
-/* Define if you have the lockf function.  */
-#undef HAVE_LOCKF
-
-/* Define if you have the lrand48 function.  */
-#undef HAVE_LRAND48
-
-/* Define if you have the memcpy function.  */
-#undef HAVE_MEMCPY
-
-/* Define if you have the memmove function.  */
-#undef HAVE_MEMMOVE
-
-/* Define if you have the putenv function.  */
-#undef HAVE_PUTENV
-
-/* Define if you have the random function.  */
-#undef HAVE_RANDOM
-
-/* Define if you have the regcomp function.  */
-#undef HAVE_REGCOMP
-
-/* Define if you have the rint function.  */
-#undef HAVE_RINT
-
-/* Define if you have the setitimer function.  */
-#undef HAVE_SETITIMER
-
-/* Define if you have the setlocale function.  */
-#undef HAVE_SETLOCALE
-
-/* Define if you have the setsockopt function.  */
-#undef HAVE_SETSOCKOPT
-
-/* Define if you have the setvbuf function.  */
-#undef HAVE_SETVBUF
-
-/* Define if you have the snprintf function.  */
-#undef HAVE_SNPRINTF
-
-/* Define if you have the srand48 function.  */
-#undef HAVE_SRAND48
-
-/* Define if you have the srandom function.  */
-#undef HAVE_SRANDOM
-
-/* Define if you have the statfs function.  */
-#undef HAVE_STATFS
-
-/* Define if you have the statvfs function.  */
-#undef HAVE_STATVFS
-
-/* Define if you have the strcasecmp function.  */
-#undef HAVE_STRCASECMP
-
-/* Define if you have the strdup function.  */
-#undef HAVE_STRDUP
-
-/* Define if you have the strerror function.  */
-#undef HAVE_STRERROR
-
-/* Define if you have the strftime function.  */
-#undef HAVE_STRFTIME
-
-/* Define if you have the strstr function.  */
-#undef HAVE_STRSTR
-
-/* Define if you have the symlink function.  */
-#undef HAVE_SYMLINK
-
-/* Define if you have the tempnam function.  */
-#undef HAVE_TEMPNAM
-
-/* Define if you have the tzset function.  */
-#undef HAVE_TZSET
-
-/* Define if you have the unsetenv function.  */
-#undef HAVE_UNSETENV
-
-/* Define if you have the usleep function.  */
-#undef HAVE_USLEEP
-
-/* Define if you have the utime function.  */
-#undef HAVE_UTIME
-
-/* Define if you have the vsnprintf function.  */
-#undef HAVE_VSNPRINTF
-
-/* Define if you have the <crypt.h> header file.  */
-#undef HAVE_CRYPT_H
-
-/* Define if you have the <db.h> header file.  */
-#undef HAVE_DB_H
-
-/* Define if you have the <dirent.h> header file.  */
-#undef HAVE_DIRENT_H
-
-/* Define if you have the <dlfcn.h> header file.  */
-#undef HAVE_DLFCN_H
-
-/* Define if you have the <fcntl.h> header file.  */
-#undef HAVE_FCNTL_H
-
-/* Define if you have the <grp.h> header file.  */
-#undef HAVE_GRP_H
-
-/* Define if you have the <limits.h> header file.  */
-#undef HAVE_LIMITS_H
-
-/* Define if you have the <memory.h> header file.  */
-#undef HAVE_MEMORY_H
-
-/* Define if you have the <ndbm.h> header file.  */
-#undef HAVE_NDBM_H
-
-/* Define if you have the <ndir.h> header file.  */
-#undef HAVE_NDIR_H
-
-/* Define if you have the <netinet/in.h> header file.  */
-#undef HAVE_NETINET_IN_H
-
-/* Define if you have the <pwd.h> header file.  */
-#undef HAVE_PWD_H
-
-/* Define if you have the <signal.h> header file.  */
-#undef HAVE_SIGNAL_H
-
-/* Define if you have the <stdarg.h> header file.  */
-#undef HAVE_STDARG_H
-
-/* Define if you have the <string.h> header file.  */
-#undef HAVE_STRING_H
-
-/* Define if you have the <sys/dir.h> header file.  */
-#undef HAVE_SYS_DIR_H
-
-/* Define if you have the <sys/file.h> header file.  */
-#undef HAVE_SYS_FILE_H
-
-/* Define if you have the <sys/ndir.h> header file.  */
-#undef HAVE_SYS_NDIR_H
-
-/* Define if you have the <sys/resource.h> header file.  */
-#undef HAVE_SYS_RESOURCE_H
-
-/* Define if you have the <sys/socket.h> header file.  */
-#undef HAVE_SYS_SOCKET_H
-
-/* Define if you have the <sys/statfs.h> header file.  */
-#undef HAVE_SYS_STATFS_H
-
-/* Define if you have the <sys/statvfs.h> header file.  */
-#undef HAVE_SYS_STATVFS_H
-
-/* Define if you have the <sys/time.h> header file.  */
-#undef HAVE_SYS_TIME_H
-
-/* Define if you have the <sys/types.h> header file.  */
-#undef HAVE_SYS_TYPES_H
-
-/* Define if you have the <sys/varargs.h> header file.  */
-#undef HAVE_SYS_VARARGS_H
-
-/* Define if you have the <sys/wait.h> header file.  */
-#undef HAVE_SYS_WAIT_H
-
-/* Define if you have the <syslog.h> header file.  */
-#undef HAVE_SYSLOG_H
-
-/* Define if you have the <unistd.h> header file.  */
-#undef HAVE_UNISTD_H
-
-/* Define if you have the <unix.h> header file.  */
-#undef HAVE_UNIX_H
-
-/* Define if you have the m library (-lm).  */
-#undef HAVE_LIBM
diff --git a/Zend/configure.in b/Zend/configure.in
index ff5bad8c9f..f839ef079a 100644
--- a/Zend/configure.in
+++ b/Zend/configure.in
@@ -2,9 +2,10 @@ dnl $Id$
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(zend.c)
-
-AC_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE(zend, 0.80A)
+AM_CONFIG_HEADER(zend_config.h)
 AM_SANITY_CHECK
+ZEND_VERSION=$VERSION
 
 dnl We want this one before the checks, so the checks can modify CFLAGS.
 test -z "$CFLAGS" && auto_cflags=1
@@ -12,19 +13,19 @@ test -z "$CFLAGS" && auto_cflags=1
 dnl Checks for programs.
 AC_PROG_YACC
 if test "$YACC" != "bison -y"; then
-    AC_MSG_WARN(You will need bison if you'd want to regenerate the PHP 3.0 parsers.)
+    AC_MSG_WARN(You will need bison if you want to regenerate the Zend parser.)
 else
     AC_MSG_CHECKING(bison version)
     set `bison --version| sed -e 's/^GNU Bison version //' -e 's/\./ /'`
     if test "$1" = "1" -a "$2" -lt "25"; then
-        AC_MSG_WARN(You will need bison 1.25 if you'd want to regenerate the PHP 3.0 parsers (found $1.$2).)
+        AC_MSG_WARN(You will need bison 1.25 if you want to regenerate the Zend parser (found $1.$2).)
     fi
     AC_MSG_RESULT($1.$2 (ok))
 fi
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_PROG_CC_C_O
-AC_PATH_PROG(PERL_PATH, perl)
+AM_PROG_LEX
 
 dnl Ugly hack to get around a problem with gcc on AIX.
 if test "$CC" = "gcc" -a "$ac_cv_prog_cc_g" = "yes" -a \
@@ -32,35 +33,6 @@ if test "$CC" = "gcc" -a "$ac_cv_prog_cc_g" = "yes" -a \
 	CFLAGS=`echo $CFLAGS | sed -e 's/-g//'`
 fi
 
-dnl check for -R, etc. switch
-AC_MSG_CHECKING(if compiler supports -R)
-AC_CACHE_VAL(php_cv_cc_dashr,[
-	SAVE_LIBS="${LIBS}"
-	LIBS="-R /usr/lib ${LIBS}"
-	AC_TRY_LINK([], [], php_cv_cc_dashr=yes, php_cv_cc_dashr=no)
-	LIBS="${SAVE_LIBS}"])
-AC_MSG_RESULT($php_cv_cc_dashr)
-if test $php_cv_cc_dashr = "yes"; then
-	ld_runpath_switch="-R"
-	apxs_runpath_switch="-Wl,-R'"
-else
-	AC_MSG_CHECKING([if compiler supports -Wl,-rpath,])
-	AC_CACHE_VAL(php_cv_cc_rpath,[
-		SAVE_LIBS="${LIBS}"
-		LIBS="-Wl,-rpath,/usr/lib ${LIBS}"
-		AC_TRY_LINK([], [], php_cv_cc_rpath=yes, php_cv_cc_rpath=no)
-		LIBS="${SAVE_LIBS}"])
-	AC_MSG_RESULT($php_cv_cc_rpath)
-	if test $php_cv_cc_rpath = "yes"; then
-		ld_runpath_switch="-Wl,-rpath,"
-		apxs_runpath_switch="-Wl,'-rpath "
-	else
-		dnl something innocuous
-		ld_runpath_switch="-L"
-		apxs_runpath_switch="-L'"
-	fi
-fi
-
 dnl
 dnl Check for /usr/pkg/{lib,include} which is where NetBSD puts binary
 dnl and source packages.  This should be harmless on other OSs.
diff --git a/Zend/zend.h b/Zend/zend.h
index 250455af4b..140dc65fed 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -28,7 +28,7 @@
 #if WINNT||WIN32
 #include "config.w32.h"
 #else
-#include "config.h"
+#include "zend_config.h"
 #include "config.unix.h"
 #endif