diff options
| author | Sascha Schumann <sas@php.net> | 2001-06-10 13:51:18 +0000 |
|---|---|---|
| committer | Sascha Schumann <sas@php.net> | 2001-06-10 13:51:18 +0000 |
| commit | 9a7c1f2ad6f8313d22129c3b08ce9fedb0beda2f (patch) | |
| tree | c18dfd496a691ce11a69394c15d610de3bc00dba | |
| parent | f96a2539a71da451470cc3da374fc943cb103809 (diff) | |
| download | php-git-9a7c1f2ad6f8313d22129c3b08ce9fedb0beda2f.tar.gz | |
Add some backwards-compatible macros to accomodate the renaming of
AC_ADD_* macros.
| -rw-r--r-- | acinclude.m4 | 5 | ||||
| -rw-r--r-- | build/build2.mk | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index b25a35bd98..e317bf4aa5 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1050,6 +1050,11 @@ int main(void) { fi ]) +AC_DEFUN(AC_ADD_LIBPATH, [indir([PHP_ADD_LIBPATH])]) +AC_DEFUN(AC_ADD_LIBRARY, [indir([PHP_ADD_LIBRARY])]) +AC_DEFUN(AC_ADD_LIBRARY_WITH_PATH, [indir([PHP_ADD_LIBRARY_WITH_PATH])]) +AC_DEFUN(AC_ADD_INCLUDE, [indir([PHP_ADD_INCLUDE])]) + AC_DEFUN(PHP_FOPENCOOKIE,[ AC_CHECK_FUNC(fopencookie, [ have_glibc_fopencookie=yes ]) diff --git a/build/build2.mk b/build/build2.mk index 9adac635ee..528f1de351 100644 --- a/build/build2.mk +++ b/build/build2.mk @@ -58,9 +58,9 @@ $(makefile_in_files): $(makefile_am_files) aclocal.m4 configure.in $(config_m4_f @for i in $(LT_TARGETS); do mv $$i.bak $$i; done aclocal.m4: configure.in acinclude.m4 dynlib.m4 - aclocal + aclocal 2>&1 | $(SUPPRESS_WARNINGS) -SUPPRESS_WARNINGS = (egrep -v '(warning: AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|.*AM_PROG_LEX.*)'||true) +SUPPRESS_WARNINGS = (egrep -v '(warning: AC_TRY_RUN called without default to allow cross compiling|AC_PROG_CXXCPP was called before AC_PROG_CXX|.*AM_PROG_LEX.*|defined in acinclude.m4 but never used)'||true) $(config_h_in): configure acconfig.h # explicitly remove target since autoheader does not seem to work |