Attachment #153653 for bug #212679

Lines 46-52 Link Here

(-)sapi/apache/config.m4 (-1 / +2 lines)
46	AC_MSG_ERROR([Aborting])	46	AC_MSG_ERROR([Aborting])
47	fi	47	fi
48		48
49	APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"	49	APXS_LIBS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
50	APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`	50	APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
51	APXS_CFLAGS=`$APXS -q CFLAGS`	51	APXS_CFLAGS=`$APXS -q CFLAGS`
52	APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`	52	APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
Lines 267-272 Link Here
267	PHP_SUBST(APACHE_TARGET)	268	PHP_SUBST(APACHE_TARGET)
268	PHP_SUBST(APXS)	269	PHP_SUBST(APXS)
269	PHP_SUBST(APXS_LDFLAGS)	270	PHP_SUBST(APXS_LDFLAGS)
		271	PHP_SUBST(APXS_LIBS)
270	PHP_SUBST(APACHE_INSTALL)	272	PHP_SUBST(APACHE_INSTALL)
271	PHP_SUBST(STRONGHOLD)	273	PHP_SUBST(STRONGHOLD)
272	fi	274	fi

Lines 47-53 Link Here

(-)sapi/apache_hooks/config.m4 (-1 / +2 lines)
47	AC_MSG_ERROR([Aborting])	47	AC_MSG_ERROR([Aborting])
48	fi	48	fi
49		49
50	APXS_LDFLAGS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"	50	APXS_LIBS="@SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@"
51	APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`	51	APXS_INCLUDEDIR=`$APXS -q INCLUDEDIR`
52	APXS_CFLAGS=`$APXS -q CFLAGS`	52	APXS_CFLAGS=`$APXS -q CFLAGS`
53	APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`	53	APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
Lines 269-274 Link Here
269	PHP_SUBST(APACHE_TARGET)	269	PHP_SUBST(APACHE_TARGET)
270	PHP_SUBST(APXS)	270	PHP_SUBST(APXS)
271	PHP_SUBST(APXS_LDFLAGS)	271	PHP_SUBST(APXS_LDFLAGS)
		272	PHP_SUBST(APXS_LIBS)
272	PHP_SUBST(APACHE_HOOKS_INSTALL)	273	PHP_SUBST(APACHE_HOOKS_INSTALL)
273	PHP_SUBST(STRONGHOLD)	274	PHP_SUBST(STRONGHOLD)
274	fi	275	fi

Lines 137-145 Link Here

(-)ext/pdo_odbc/config.m4 (-2 / +2 lines)
137	fi	137	fi
138		138
139	PDO_ODBC_INCLUDE="$pdo_odbc_def_cflags -I$PDO_ODBC_INCDIR -DPDO_ODBC_TYPE=\\\"$pdo_odbc_flavour\\\""	139	PDO_ODBC_INCLUDE="$pdo_odbc_def_cflags -I$PDO_ODBC_INCDIR -DPDO_ODBC_TYPE=\\\"$pdo_odbc_flavour\\\""
140	PDO_ODBC_LDFLAGS="$pdo_odbc_def_ldflags -L$PDO_ODBC_LIBDIR -l$pdo_odbc_def_lib"	140	PDO_ODBC_LIBS="$pdo_odbc_def_ldflags -L$PDO_ODBC_LIBDIR -l$pdo_odbc_def_lib"
141		141
142	PHP_EVAL_LIBLINE([$PDO_ODBC_LDFLAGS], [PDO_ODBC_SHARED_LIBADD])	142	PHP_EVAL_LIBLINE([$PDO_ODBC_LIBS], [PDO_ODBC_SHARED_LIBADD])
143		143
144	dnl Check first for an ODBC 1.0 function to assert that the libraries work	144	dnl Check first for an ODBC 1.0 function to assert that the libraries work
145	PHP_CHECK_LIBRARY($pdo_odbc_def_lib, SQLBindCol,	145	PHP_CHECK_LIBRARY($pdo_odbc_def_lib, SQLBindCol,





    if test -z "$iconv_impl_name"; then
      AC_MSG_CHECKING([if using GNU libiconv])
      php_iconv_old_ld="$LIBS"
      LIBS="-liconv $LIBS"
      AC_TRY_RUN([
#include <$PHP_ICONV_H_PATH>
int main() {

        iconv_impl_name="gnu_libiconv"
      ],[
        AC_MSG_RESULT(no)
        LIBS="$php_iconv_old_ld"
      ],[
        AC_MSG_RESULT(no, cross-compiling)
        LIBS="$php_iconv_old_ld"
      ])
    fi





dnl
AC_DEFUN([PHP_CHECK_LIBRARY], [
  save_old_LIBS=$LIBS
  ac_stuff="$5"
  
  save_ext_shared=$ext_shared
  ext_shared=yes
  PHP_EVAL_LIBLINE([$]ac_stuff, LIBS)
  AC_CHECK_LIB([$1],[$2],[
    LIBS=$save_old_LIBS
    ext_shared=$save_ext_shared
    $3
  ],[
    LIBS=$save_old_LIBS
    ext_shared=$save_ext_shared
    unset ac_cv_lib_$1[]_$2
    $4

Return to bug 212679

Lines 1741-1757 Link Here

(-)acinclude.m4.old (-4 / +4 lines)
1741	dnl	1741	dnl
1742	AC_DEFUN([PHP_CHECK_LIBRARY], [	1742	AC_DEFUN([PHP_CHECK_LIBRARY], [
1743	save_old_LDFLAGS=$LDFLAGS	1743	save_old_LIBS=$LIBS
1744	ac_stuff="$5"	1744	ac_stuff="$5"
1745		1745
1746	save_ext_shared=$ext_shared	1746	save_ext_shared=$ext_shared
1747	ext_shared=yes	1747	ext_shared=yes
1748	PHP_EVAL_LIBLINE([$]ac_stuff, LDFLAGS)	1748	PHP_EVAL_LIBLINE([$]ac_stuff, LIBS)
1749	AC_CHECK_LIB([$1],[$2],[	1749	AC_CHECK_LIB([$1],[$2],[
1750	LDFLAGS=$save_old_LDFLAGS	1750	LIBS=$save_old_LIBS
1751	ext_shared=$save_ext_shared	1751	ext_shared=$save_ext_shared
1752	$3	1752	$3
1753	],[	1753	],[
1754	LDFLAGS=$save_old_LDFLAGS	1754	LIBS=$save_old_LIBS
1755	ext_shared=$save_ext_shared	1755	ext_shared=$save_ext_shared
1756	unset ac_cv_lib_$1[]_$2	1756	unset ac_cv_lib_$1[]_$2
1757	$4	1757	$4

Lines 48-55 Link Here

(-)ext/iconv/config.m4 (-4 / +4 lines)
48		48
49	if test -z "$iconv_impl_name"; then	49	if test -z "$iconv_impl_name"; then
50	AC_MSG_CHECKING([if using GNU libiconv])	50	AC_MSG_CHECKING([if using GNU libiconv])
51	php_iconv_old_ld="$LDFLAGS"	51	php_iconv_old_ld="$LIBS"
52	LDFLAGS="-liconv $LDFLAGS"	52	LIBS="-liconv $LIBS"
53	AC_TRY_RUN([	53	AC_TRY_RUN([
54	#include <$PHP_ICONV_H_PATH>	54	#include <$PHP_ICONV_H_PATH>
55	int main() {	55	int main() {
Lines 61-70 Link Here
61	iconv_impl_name="gnu_libiconv"	61	iconv_impl_name="gnu_libiconv"
62	],[	62	],[
63	AC_MSG_RESULT(no)	63	AC_MSG_RESULT(no)
64	LDFLAGS="$php_iconv_old_ld"	64	LIBS="$php_iconv_old_ld"
65	],[	65	],[
66	AC_MSG_RESULT(no, cross-compiling)	66	AC_MSG_RESULT(no, cross-compiling)
67	LDFLAGS="$php_iconv_old_ld"	67	LIBS="$php_iconv_old_ld"
68	])	68	])
69	fi	69	fi
70		70