diff options
Diffstat (limited to 'acinclude.m4')
| -rw-r--r-- | acinclude.m4 | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index adb9599ce4..aadf4c06ee 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2226,7 +2226,7 @@ AC_DEFUN([PHP_SETUP_ICU],[ AC_MSG_RESULT([$icu_install_prefix]) dnl Check ICU version - AC_MSG_CHECKING([for ICU 3.4 or greater]) + AC_MSG_CHECKING([for ICU 4.0 or greater]) icu_version_full=`$ICU_CONFIG --version` ac_IFS=$IFS IFS="." @@ -2235,8 +2235,8 @@ AC_DEFUN([PHP_SETUP_ICU],[ icu_version=`expr [$]1 \* 1000 + [$]2` AC_MSG_RESULT([found $icu_version_full]) - if test "$icu_version" -lt "3004"; then - AC_MSG_ERROR([ICU version 3.4 or later is required]) + if test "$icu_version" -lt "4000"; then + AC_MSG_ERROR([ICU version 4.0 or later is required]) fi ICU_VERSION=$icu_version @@ -2932,6 +2932,9 @@ dnl Add providerdesc.o into global objects when needed *solaris*) PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o" ;; + *linux*) + PHP_GLOBAL_OBJS="[$]PHP_GLOBAL_OBJS [$]ac_bdir[$]ac_provsrc.o" + ;; esac dnl DTrace objects @@ -2960,12 +2963,12 @@ dnl Generate Makefile.objects entries cat>>Makefile.objects<<EOF $ac_bdir[$]ac_hdrobj: $abs_srcdir/$ac_provsrc - dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@ + CFLAGS="\$(CFLAGS_CLEAN)" dtrace -h -C -s $ac_srcdir[$]ac_provsrc -o \$[]@ && \$(SED) -ibak 's,PHP_,DTRACE_,g' \$[]@ \$(PHP_DTRACE_OBJS): $ac_bdir[$]ac_hdrobj $ac_bdir[$]ac_provsrc.o: \$(PHP_DTRACE_OBJS) - dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs + CFLAGS="\$(CFLAGS_CLEAN)" dtrace -G -o \$[]@ -s $abs_srcdir/$ac_provsrc $dtrace_objs EOF ]) |