diff options
| -rw-r--r-- | Zend/Makefile.am | 55 | ||||
| -rw-r--r-- | Zend/Zend.m4 | 16 | ||||
| -rw-r--r-- | Zend/acinclude.m4 | 27 | ||||
| -rw-r--r-- | Zend/build.mk | 41 | ||||
| -rwxr-xr-x | Zend/buildconf | 32 | ||||
| -rw-r--r-- | Zend/configure.ac | 137 |
6 files changed, 0 insertions, 308 deletions
diff --git a/Zend/Makefile.am b/Zend/Makefile.am deleted file mode 100644 index 537deb26f9..0000000000 --- a/Zend/Makefile.am +++ /dev/null @@ -1,55 +0,0 @@ -## Process this file with automake to produce Makefile.in -*- makefile -*- - -#CLEANFILES = zend_language_parser.c zend_language_parser.h zend_language_scanner.c zend_language_parser.output zend_ini_parser.c zend_ini_parser.h zend_ini_scanner.c zend_ini_parser.output - -AUTOMAKE_OPTIONS=foreign -noinst_LTLIBRARIES=libZend.la - -libZend_la_SOURCES=\ - zend_language_parser.y zend_language_scanner.l \ - zend_ini_parser.y zend_ini_scanner.l \ - zend_alloc.c zend_compile.c zend_constants.c \ - zend_execute.c zend_execute_API.c zend_highlight.c zend_llist.c \ - zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \ - zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \ - zend_list.c zend_builtin_functions.c zend_sprintf.c \ - zend_ini.c zend_sort.c zend_objects.c zend_object_handlers.c \ - zend_objects_API.c zend_ts_hash.c zend_stream.c \ - zend_default_classes.c \ - zend_iterators.c zend_interfaces.c zend_exceptions.c \ - zend_strtod.c zend_closures.c zend_float.c zend_string.c zend_signal.c \ - zend_generators.c zend_virtual_cwd.c zend_ast.c zend_smart_str.c zend_cpuinfo.c - -libZend_la_CFLAGS = -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 -libZend_la_LDFLAGS = -libZend_la_LIBADD = @ZEND_EXTRA_LIBS@ - -# automake isn't too clever about "non-standard" use of lex and yacc - -$(libZend_la_OBJECTS): zend_language_parser.h - -zend_ini_scanner.lo: zend_ini_parser.h - -# Language parser/scanner rules - -zend_language_scanner.c: $(srcdir)/zend_language_scanner.l - $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt $(srcdir)/zend_language_scanner_defs.h -o$@ $(srcdir)/zend_language_scanner.l - -zend_language_parser.h: zend_language_parser.c -zend_language_parser.c: $(srcdir)/zend_language_parser.y - $(YACC) -p zend -v -d $(srcdir)/zend_language_parser.y -o zend_language_parser.c - -# INI parser/scanner rules - -zend_ini_parser.c: $(srcdir)/zend_ini_parser.y - $(YACC) -p ini_ -v -d $(srcdir)/zend_ini_parser.y -o zend_ini_parser.c - -zend_ini_scanner.c: $(srcdir)/zend_ini_scanner.l - $(RE2C) $(RE2C_FLAGS) --no-generation-date --case-inverted -cbdFt $(srcdir)/zend_ini_scanner_defs.h -o$@ $(srcdir)/zend_ini_scanner.l - -zend_ini_parser.h: zend_ini_parser.c - -depend: - -zend_execute.lo: $(srcdir)/zend_execute.c - $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(CPPFLAGS) $(INLINE_CFLAGS) -c $(srcdir)/zend_execute.c diff --git a/Zend/Zend.m4 b/Zend/Zend.m4 index 08afdf0832..eff255f7fb 100644 --- a/Zend/Zend.m4 +++ b/Zend/Zend.m4 @@ -54,11 +54,6 @@ dlfcn.h) AC_TYPE_SIZE_T -AC_DEFUN([LIBZEND_LIBDL_CHECKS],[ -AC_CHECK_LIB(dl, dlopen, [LIBS="-ldl $LIBS"]) -AC_CHECK_FUNC(dlopen,[AC_DEFINE(HAVE_LIBDL, 1,[ ])]) -]) - AC_DEFUN([LIBZEND_DLSYM_CHECK],[ dnl dnl Ugly hack to check if dlsym() requires a leading underscore in symbol name. @@ -127,17 +122,6 @@ int main() ]) -AC_DEFUN([LIBZEND_ENABLE_DEBUG],[ - -AC_ARG_ENABLE(debug, -[ --enable-debug Compile with debugging symbols],[ - ZEND_DEBUG=$enableval -],[ - ZEND_DEBUG=no -]) - -]) - AC_DEFUN([LIBZEND_OTHER_CHECKS],[ AC_ARG_ENABLE(maintainer-zts, diff --git a/Zend/acinclude.m4 b/Zend/acinclude.m4 index f45a7a7c13..549c2ea806 100644 --- a/Zend/acinclude.m4 +++ b/Zend/acinclude.m4 @@ -79,33 +79,6 @@ AC_DEFUN([AC_ZEND_BROKEN_SPRINTF],[ AC_DEFINE_UNQUOTED(ZEND_BROKEN_SPRINTF, $ac_result, [Whether sprintf is broken]) ]) -dnl -dnl AC_ZEND_C_BIGENDIAN -dnl Replacement macro for AC_C_BIGENDIAN -dnl -AC_DEFUN([AC_ZEND_C_BIGENDIAN], -[AC_CACHE_CHECK([whether byte ordering is bigendian], ac_cv_c_bigendian_php, - [ - ac_cv_c_bigendian_php=unknown - AC_RUN_IFELSE([AC_LANG_SOURCE([[ -int main(void) -{ - short one = 1; - char *cp = (char *)&one; - - if (*cp == 0) { - return(0); - } else { - return(1); - } -} - ]])], [ac_cv_c_bigendian_php=yes], [ac_cv_c_bigendian_php=no], [ac_cv_c_bigendian_php=unknown]) - ]) - if test $ac_cv_c_bigendian_php = yes; then - AC_DEFINE(WORDS_BIGENDIAN, 1, [Define if processor uses big-endian word]) - fi -]) - AC_DEFUN([AM_SET_LIBTOOL_VARIABLE],[ LIBTOOL='$(SHELL) $(top_builddir)/libtool $1' ]) diff --git a/Zend/build.mk b/Zend/build.mk deleted file mode 100644 index ef14b65e65..0000000000 --- a/Zend/build.mk +++ /dev/null @@ -1,41 +0,0 @@ -# Makefile to generate build tools -# -# Standard usage: -# make -f build.mk -# -# Written by Sascha Schumann - - -LT_TARGETS = ltmain.sh ltconfig - -config_h_in = zend_config.h.in - -makefile_am_files = Makefile.am -makefile_in_files = $(makefile_am_files:.am=.in) -makefile_files = $(makefile_am_files:e.am=e) - -targets = $(makefile_in_files) $(LT_TARGETS) configure $(config_h_in) - -all: $(targets) - -clean: - rm -f $(targets) - -$(LT_TARGETS): - rm -f $(LT_TARGETS) - libtoolize --automake $(AMFLAGS) -f - -$(makefile_in_files): $(makefile_am_files) - automake -a -i $(AMFLAGS) $(makefile_files) - -aclocal.m4: configure.ac acinclude.m4 - aclocal - -$(config_h_in): configure.ac -# explicitly remove target since autoheader does not seem to work -# correctly otherwise (timestamps are not updated) - @rm -f $@ - autoheader - -configure: aclocal.m4 configure.ac - autoconf diff --git a/Zend/buildconf b/Zend/buildconf deleted file mode 100755 index b2e0a2958c..0000000000 --- a/Zend/buildconf +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/sh - -case "$1" in ---copy) - automake_flags=--copy - shift -;; -esac - -libtoolize --force --automake $automake_flags - -mv aclocal.m4 aclocal.m4.old 2>/dev/null -aclocal -if cmp aclocal.m4.old aclocal.m4 > /dev/null 2>&1; then - echo "buildconf: keeping ${1}aclocal.m4" - mv aclocal.m4.old aclocal.m4 -else - echo "buildconf: created or modified ${1}aclocal.m4" -fi - -autoheader - -automake --add-missing --include-deps $automake_flags - -mv configure configure.old 2>/dev/null -autoconf -if cmp configure.old configure > /dev/null 2>&1; then - echo "buildconf: keeping ${1}configure" - mv configure.old configure -else - echo "buildconf: created or modified ${1}configure" -fi diff --git a/Zend/configure.ac b/Zend/configure.ac deleted file mode 100644 index 824a54f13d..0000000000 --- a/Zend/configure.ac +++ /dev/null @@ -1,137 +0,0 @@ -dnl Process this file with autoconf to produce a configure script. - -AC_INIT(zend.c) -AM_INIT_AUTOMAKE(zend, 0.80A, nodefine) -AM_CONFIG_HEADER(zend_config.h) -AM_SANITY_CHECK -AM_MAINTAINER_MODE -AC_PROG_CC -AM_PROG_CC_STDC -ZEND_VERSION=$VERSION -AC_ZEND_C_BIGENDIAN - -AH_TOP([ -#if defined(__GNUC__) && __GNUC__ >= 4 -# define ZEND_API __attribute__ ((visibility("default"))) -# define ZEND_DLEXPORT __attribute__ ((visibility("default"))) -#else -# define ZEND_API -# define ZEND_DLEXPORT -#endif - -#define ZEND_DLIMPORT - -#undef uint -#undef ulong -]) - -AH_BOTTOM([ -#ifndef ZEND_ACCONFIG_H_NO_C_PROTOS - -#include <stdlib.h> - -#ifdef HAVE_SYS_TYPES_H -# include <sys/types.h> -#endif - -#ifdef HAVE_SYS_SELECT_H -#include <sys/select.h> -#endif - -#ifdef HAVE_IEEEFP_H -# include <ieeefp.h> -#endif - -#include <string.h> - -#if ZEND_BROKEN_SPRINTF -int zend_sprintf(char *buffer, const char *format, ...); -#else -# define zend_sprintf sprintf -#endif - -#if defined(__cplusplus) && __cplusplus >= 201103L -extern "C++" { -#include <cmath> -#define zend_isnan std::isnan -#define zend_isinf std::isinf -#define zend_finite std::isfinite -} -#else -#include <math.h> - -#ifndef zend_isnan -#if HAVE_DECL_ISNAN -#define zend_isnan(a) isnan(a) -#elif defined(HAVE_FPCLASS) -#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) -#else -#define zend_isnan(a) ((a) != (a)) -#endif -#endif - -#if HAVE_DECL_ISINF -#define zend_isinf(a) isinf(a) -#elif defined(INFINITY) -/* Might not work, but is required by ISO C99 */ -#define zend_isinf(a) (((a)==INFINITY || (a)==-INFINITY)?1:0) -#elif defined(HAVE_FPCLASS) -#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) -#else -#define zend_isinf(a) 0 -#endif - -#if HAVE_DECL_ISFINITE -#define zend_finite(a) isfinite(a) -#elif defined(HAVE_FINITE) -#define zend_finite(a) finite(a) -#elif defined(fpclassify) -#define zend_finite(a) ((fpclassify((a))!=FP_INFINITE&&fpclassify((a))!=FP_NAN)?1:0) -#else -#define zend_finite(a) (zend_isnan(a) ? 0 : zend_isinf(a) ? 0 : 1) -#endif - -#endif - -#endif /* ifndef ZEND_ACCONFIG_H_NO_C_PROTOS */ - -]) - -dnl We want this one before the checks, so the checks can modify CFLAGS. -test -z "$CFLAGS" && auto_cflags=1 - -AC_CHECK_SIZEOF(long, 8) -AC_CHECK_SIZEOF(int, 4) - -sinclude(Zend.m4) - -LIBZEND_BASIC_CHECKS -LIBZEND_LIBDL_CHECKS -LIBZEND_DLSYM_CHECK - -AM_PROG_LIBTOOL -if test "$enable_debug" != "yes"; then - AM_SET_LIBTOOL_VARIABLE([--silent]) -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. -dnl -if test -d /usr/pkg/include -a -d /usr/pkg/lib ; then - CFLAGS="$CFLAGS -I/usr/pkg/include" - LDFLAGS="$LDFLAGS -L/usr/pkg/lib" -fi - -LIBZEND_ENABLE_DEBUG -LIBZEND_OTHER_CHECKS - -ZEND_EXTRA_LIBS="$LIBS" -LIBS="" -AC_SUBST(ZEND_EXTRA_LIBS) -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT - -# Local Variables: -# tab-width: 4 -# End: |