embedaddon/php/acinclude.m4 - diff

Return to acinclude.m4 CVS log

Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / php

Diff for /embedaddon/php/acinclude.m4 between versions 1.1.1.2.2.1 and 1.1.1.3

version 1.1.1.2.2.1, 2013/07/22 01:44:13	version 1.1.1.3, 2013/07/22 01:31:35
Line 1832 AC_TRY_COMPILE([	Line 1832 AC_TRY_COMPILE([
])	])

dnl -------------------------------------------------------------------------	dnl -------------------------------------------------------------------------
dnl Library/function existance and build sanity checks	dnl Library/function existence and build sanity checks
dnl -------------------------------------------------------------------------	dnl -------------------------------------------------------------------------

dnl	dnl
Line 2342 AC_DEFUN([PHP_SETUP_OPENSSL],[	Line 2342 AC_DEFUN([PHP_SETUP_OPENSSL],[
AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])	AC_MSG_ERROR([OpenSSL version 0.9.6 or greater required.])
fi	fi

if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then	if test -n "$OPENSSL_LIBS"; then
PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)	PHP_EVAL_LIBLINE($OPENSSL_LIBS, $1)
	fi
	if test -n "$OPENSSL_INCS"; then
PHP_EVAL_INCLINE($OPENSSL_INCS)	PHP_EVAL_INCLINE($OPENSSL_INCS)
fi	fi
fi	fi
Line 2449 AC_DEFUN([PHP_SETUP_ICONV], [	Line 2451 AC_DEFUN([PHP_SETUP_ICONV], [
dnl	dnl
dnl Check libc first if no path is provided in --with-iconv	dnl Check libc first if no path is provided in --with-iconv
dnl	dnl

if test "$PHP_ICONV" = "yes"; then	if test "$PHP_ICONV" = "yes"; then
	dnl Reset LIBS temporarily as it may have already been included
	dnl -liconv in.
	LIBS_save="$LIBS"
	LIBS=
AC_CHECK_FUNC(iconv, [	AC_CHECK_FUNC(iconv, [
found_iconv=yes	found_iconv=yes
],[	],[
Line 2459 AC_DEFUN([PHP_SETUP_ICONV], [	Line 2466 AC_DEFUN([PHP_SETUP_ICONV], [
found_iconv=yes	found_iconv=yes
])	])
])	])
	LIBS="$LIBS_save"
fi	fi

dnl	dnl

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>

Removed from v.1.1.1.2.2.1
changed lines
	Added in v.1.1.1.3