--- php-4.4.0.orig/acinclude.m4 2005-04-30 11:31:09.000000000 +0200 +++ php-4.4.0.orig/acinclude.m4 2005-09-10 02:18:48.000000000 +0200 @@ -194,7 +194,7 @@ unset ac_new_flags for i in [$]$1; do case [$]i in - -L/usr/lib|-L/usr/lib/[)] ;; + -L/usr/lib|-L/usr/lib/|-L/usr/lib64|-L/usr/lib64/[)] ;; *[)] ac_new_flags="[$]ac_new_flags [$]i" ;; esac done @@ -856,7 +856,9 @@ dnl add a library to linkpath/runpath dnl AC_DEFUN([PHP_ADD_LIBPATH],[ - if test "$1" != "/usr/lib"; then + case x$1 in + x/usr/lib|x/usr/lib64) ;; + *) PHP_EXPAND_PATH($1, ai_p) ifelse([$2],,[ _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) @@ -866,8 +868,8 @@ else _PHP_ADD_LIBPATH_GLOBAL([$ai_p]) fi - ]) - fi + ]) ;; + esac ]) dnl @@ -1651,15 +1653,20 @@ fi for i in $PHP_KERBEROS; do - if test -f $i/lib/libkrb5.a || test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then + if test -f $i/lib/libkrb5.a -o -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then PHP_KERBEROS_DIR=$i + PHP_KERBEROS_LIBDIR=$i/lib + break + elif test -f $i/lib64/libkrb5.a -o -f $i/lib64/libkrb5.$SHLIB_SUFFIX_NAME; then + PHP_KERBEROS_DIR=$i + PHP_KERBEROS_LIBDIR=$i/lib64 break fi done if test "$PHP_KERBEROS_DIR"; then found_kerberos=yes - PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, $1) + PHP_ADD_LIBPATH($PHP_KERBEROS_LIBDIR, $1) PHP_ADD_LIBRARY(gssapi_krb5, 1, $1) PHP_ADD_LIBRARY(krb5, 1, $1) PHP_ADD_LIBRARY(k5crypto, 1, $1) @@ -1731,6 +1738,9 @@ if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then OPENSSL_LIBDIR=$i/lib fi + if test -r $i/lib64/libssl.a -o -r $i/lib64/libssl.$SHLIB_SUFFIX_NAME; then + OPENSSL_LIBDIR=$i/lib64 + fi test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break done @@ -1851,7 +1861,9 @@ fi if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a || - test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME + test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME || + test -f $ICONV_DIR/lib64/lib$iconv_lib_name.a || + test -f $ICONV_DIR/lib64/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME then PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [ found_iconv=yes --- php-4.4.0.orig/ext/dba/config.m4 2005-01-22 02:37:12.000000000 +0100 +++ php-4.4.0.orig/ext/dba/config.m4 2005-09-10 01:42:57.000000000 +0200 @@ -135,25 +135,28 @@ dnl parameters(version, library list, function) AC_DEFUN([PHP_DBA_DB_CHECK],[ for LIB in $2; do - if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then - PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[ - AC_TRY_LINK([ + for LIBDIR in lib64 lib; do + if test -f $THIS_PREFIX/$LIBDIR/lib$LIB.a -o -f $THIS_PREFIX/$LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then + PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$LIBDIR, -l$LIB,[ + AC_TRY_LINK([ #include "$THIS_INCLUDE" - ],[ - $3; - ],[ - AC_EGREP_CPP(yes,[ + ],[ + $3; + ],[ + AC_EGREP_CPP(yes,[ #include "$THIS_INCLUDE" #if DB_VERSION_MAJOR == $1 - yes + yes #endif - ],[ - THIS_LIBS=$LIB - break + ],[ + THIS_LIBS=$LIB + break + ]) ]) ]) - ]) - fi + fi + done + test -n "$THIS_LIBS" && break done if test -z "$THIS_LIBS"; then AC_MSG_CHECKING(for db$1 major version) --- php-4.4.0.orig/ext/domxml/config.m4 2004-12-30 08:02:17.000000000 +0100 +++ php-4.4.0.orig/ext/domxml/config.m4 2005-09-10 01:40:08.000000000 +0200 @@ -50,11 +50,7 @@ PHP_DOM_CHECK_VERSION - if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then - DOM_LIBNAME=xml2 - else - DOM_LIBNAME=xml - fi + DOM_LIBNAME=xml2 XML2_CONFIG=$DOMXML_DIR/bin/xml2-config @@ -145,11 +141,7 @@ AC_MSG_ERROR(DOMXSLT requires DOMXML. Use --with-dom=) fi - if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then - DOM_LIBNAME=xml2 - else - DOM_LIBNAME=xml - fi + DOM_LIBNAME=xml2 PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD) PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD) --- php-4.4.0.orig/ext/gd/config.m4 2005-05-17 14:23:09.000000000 +0200 +++ php-4.4.0.orig/ext/gd/config.m4 2005-09-10 21:14:00.000000000 +0200 @@ -50,8 +50,15 @@ AC_DEFUN([PHP_GD_JPEG],[ if test "$PHP_JPEG_DIR" != "no"; then - for i in $PHP_JPEG_DIR /usr/local /usr; do - test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break + for j in lib64 lib; do + for i in $PHP_JPEG_DIR /usr/local /usr; do + if test -f "$i/$j/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/$j/libjpeg.a"; then + GD_JPEG_DIR=$i + GD_JPEG_LIB_DIR=$i/$j + break + fi + done + test -n "$GD_JPEG_DIR" && break done if test -z "$GD_JPEG_DIR"; then @@ -61,11 +68,11 @@ PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, [ PHP_ADD_INCLUDE($GD_JPEG_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_LIB_DIR, GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.]) ],[ - -L$GD_JPEG_DIR/lib + -L$GD_JPEG_LIB_DIR ]) else AC_MSG_RESULT([If configure fails try --with-jpeg-dir=]) @@ -75,8 +82,15 @@ AC_DEFUN([PHP_GD_PNG],[ if test "$PHP_PNG_DIR" != "no"; then - for i in $PHP_PNG_DIR /usr/local /usr; do - test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break + for j in lib64 lib; do + for i in $PHP_PNG_DIR /usr/local /usr; do + if test -f $"i/$j/libpng.$SHLIB_SUFFIX_NAME" -o -f "$i/$j/libpng.a"; then + GD_PNG_DIR=$i + GD_PNG_LIB_DIR=$i/$j + break + fi + done + test -n "$GD_PNG_DIR" && break done if test -z "$GD_PNG_DIR"; then @@ -94,12 +108,12 @@ PHP_CHECK_LIBRARY(png,png_write_image, [ PHP_ADD_INCLUDE($GD_PNG_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_LIB_DIR, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_LIB_DIR, GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.]) ],[ - -L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib + -L$PHP_ZLIB_LIB_DIR -lz -L$GD_PNG_LIB_DIR ]) else @@ -110,8 +124,15 @@ AC_DEFUN([PHP_GD_XPM],[ if test "$PHP_XPM_DIR" != "no"; then - for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do - test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break + for j in lib64 lib; do + for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do + if test -f "$i/$j/libXpm.$SHLIB_SUFFIX_NAME" -o -f "$i/$j/libXpm.a"; then + GD_XPM_DIR=$i + GD_XPM_LIB_DIR=$i/$j + break + fi + done + test -n "$PHP_XPM_DIR" && break done if test -z "$GD_XPM_DIR"; then @@ -129,12 +150,12 @@ PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage, [ PHP_ADD_INCLUDE($GD_XPM_INC) - PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_LIB_DIR, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_LIB_DIR, GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.]) ],[ - -L$GD_XPM_DIR/lib -lX11 + -L$GD_XPM_LIB_DIR -lX11 ]) else AC_MSG_RESULT(If configure fails try --with-xpm-dir=) @@ -145,25 +166,29 @@ if test "$PHP_TTF" != "no"; then if test "$PHP_FREETYPE_DIR" = "no" -o "$PHP_FREETYPE_DIR" = ""; then if test -n "$PHP_TTF"; then - for i in $PHP_TTF /usr/local /usr; do - if test -f "$i/include/freetype.h"; then - TTF_DIR=$i - unset TTF_INC_DIR - fi - if test -f "$i/include/freetype/freetype.h"; then - TTF_DIR=$i - TTF_INC_DIR=$i/include/freetype - fi - if test -f "$i/include/freetype1/freetype/freetype.h"; then - TTF_DIR=$i - TTF_INC_DIR=$i/include/freetype1/freetype - fi + for j in lib64 lib; do + for i in $PHP_TTF /usr/local /usr; do + if test -f "$i/$j/libttf.a" -o -f "$i/$j/libttf.$SHLIB_SUFFIX_NAME"; then + TTF_DIR=$i + TTF_LIB_DIR=$i/$j + if test -f "$i/include/freetype.h"; then + unset TTF_INC_DIR + elif test -f "$i/include/freetype/freetype.h"; then + TTF_INC_DIR=$i/include/freetype + elif test -f "$i/include/freetype1/freetype/freetype.h"; then + TTF_INC_DIR=$i/include/freetype1/freetype + else + unset TTF_DIR + fi + fi + test -n "$TTF_DIR" && break + done test -n "$TTF_DIR" && break done fi if test -n "$TTF_DIR" ; then AC_DEFINE(HAVE_LIBTTF,1,[ ]) - PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_LIB_DIR, GD_SHARED_LIBADD) fi if test -z "$TTF_INC_DIR"; then TTF_INC_DIR=$TTF_DIR/include @@ -178,16 +203,21 @@ AC_DEFUN([PHP_GD_FREETYPE2],[ if test "$PHP_FREETYPE_DIR" != "no"; then - for i in $PHP_FREETYPE_DIR /usr/local /usr; do - if test -f "$i/include/freetype2/freetype/freetype.h"; then - FREETYPE2_DIR=$i - FREETYPE2_INC_DIR=$i/include/freetype2 - break - fi + for j in lib64 lib; do + for i in $PHP_FREETYPE_DIR /usr/local /usr; do + if test -f "$i/include/freetype2/freetype/freetype.h" && \ + test -f "$i/$j/libfreetype.a" -o -f "$i/$j/libfreetype.$SHLIB_SUFFIX_NAME"; then + FREETYPE2_DIR=$i + FREETYPE2_LIB_DIR=$i/$j + FREETYPE2_INC_DIR=$i/include/freetype2 + break + fi + done + test -n "$FREETYPE2_DIR" && break done if test -n "$FREETYPE2_DIR" ; then - PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_LIB_DIR, GD_SHARED_LIBADD) PHP_ADD_INCLUDE($FREETYPE2_DIR/include) PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) @@ -203,8 +233,16 @@ AC_DEFUN([PHP_GD_T1LIB],[ if test "$PHP_T1LIB" != "no"; then - for i in $PHP_T1LIB /usr/local /usr; do - test -f "$i/include/t1lib.h" && GD_T1_DIR=$i && break + for j in lib64 lib; do + for i in $PHP_T1LIB /usr/local /usr; do + if test -f "$i/include/t1lib.h" && \ + test -f "$i/$j/libt1.a" -o -f "$i/$j/libt1.$SHLIB_SUFFIX_NAME"; then + GD_T1_DIR=$i + GD_T1_LIB_DIR=$i/$j + break + fi + done + test -n "$GD_T1_DIR" && break done if test -z "$GD_T1_DIR"; then @@ -215,7 +253,7 @@ [ AC_DEFINE(HAVE_LIBT1,1,[ ]) PHP_ADD_INCLUDE($GD_T1_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_LIB_DIR, GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) ],[ @@ -365,7 +403,7 @@ done dnl Library path - for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do + for i in lib/gd1.3 lib/gd lib lib64 gd1.3 gd ""; do test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i" done --- php-4.4.0.orig/ext/gd/config.m4~ 1970-01-01 01:00:00.000000000 +0100 +++ php-4.4.0.orig/ext/gd/config.m4~ 2005-09-10 21:14:00.000000000 +0200 @@ -0,0 +1,461 @@ +dnl +dnl $Id: config.m4,v 1.120.2.25 2005/05/17 12:23:09 tony2001 Exp $ +dnl + +dnl +dnl Configure options +dnl + +PHP_ARG_WITH(gd, for GD support, +[ --with-gd[=DIR] Include GD support where DIR is GD install prefix. + If DIR is not set, the bundled GD library will be used.]) + +if test -z "$PHP_JPEG_DIR"; then + PHP_ARG_WITH(jpeg-dir, for the location of libjpeg, + [ --with-jpeg-dir[=DIR] GD: Set the path to libjpeg install prefix.], no, no) +fi + +if test -z "$PHP_PNG_DIR"; then + PHP_ARG_WITH(png-dir, for the location of libpng, + [ --with-png-dir[=DIR] GD: Set the path to libpng install prefix.], no, no) +fi + +if test -z "$PHP_ZLIB_DIR"; then + PHP_ARG_WITH(zlib-dir, for the location of libz, + [ --with-zlib-dir[=DIR] GD: Set the path to libz install prefix.], no, no) +fi + +PHP_ARG_WITH(xpm-dir, for the location of libXpm, +[ --with-xpm-dir[=DIR] GD: Set the path to libXpm install prefix.], no, no) + +PHP_ARG_WITH(ttf, for FreeType 1.x support, +[ --with-ttf[=DIR] GD: Include FreeType 1.x support], no, no) + +PHP_ARG_WITH(freetype-dir, for FreeType 2, +[ --with-freetype-dir[=DIR] GD: Set the path to FreeType 2 install prefix.], no, no) + +PHP_ARG_WITH(t1lib, for T1lib support, +[ --with-t1lib[=DIR] GD: Include T1lib support.], no, no) + +PHP_ARG_ENABLE(gd-native-ttf, whether to enable truetype string function in GD, +[ --enable-gd-native-ttf GD: Enable TrueType string function.], no, no) + +PHP_ARG_ENABLE(gd-jis-conv, whether to enable JIS-mapped Japanese font support in GD, +[ --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support.], no, no) + +dnl +dnl Checks for the configure options +dnl + +AC_DEFUN([PHP_GD_JPEG],[ + if test "$PHP_JPEG_DIR" != "no"; then + + for j in lib64 lib; do + for i in $PHP_JPEG_DIR /usr/local /usr; do + if test -f "$i/$j/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/$j/libjpeg.a"; then + GD_JPEG_DIR=$i + GD_JPEG_LIB_DIR=$i/$j + break + fi + done + test -n "$GD_JPEG_DIR" && break + done + + if test -z "$GD_JPEG_DIR"; then + AC_MSG_ERROR([libjpeg.(a|so) not found.]) + fi + + PHP_CHECK_LIBRARY(jpeg,jpeg_read_header, + [ + PHP_ADD_INCLUDE($GD_JPEG_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_LIB_DIR, GD_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([Problem with libjpeg.(a|so). Please check config.log for more information.]) + ],[ + -L$GD_JPEG_LIB_DIR + ]) + else + AC_MSG_RESULT([If configure fails try --with-jpeg-dir=]) + fi +]) + +AC_DEFUN([PHP_GD_PNG],[ + if test "$PHP_PNG_DIR" != "no"; then + + for j in lib64 lib; do + for i in $PHP_PNG_DIR /usr/local /usr; do + if test -f $"i/$j/libpng.$SHLIB_SUFFIX_NAME" -o -f "$i/$j/libpng.a"; then + GD_PNG_DIR=$i + GD_PNG_LIB_DIR=$i/$j + break + fi + done + test -n "$GD_PNG_DIR" && break + done + + if test -z "$GD_PNG_DIR"; then + AC_MSG_ERROR([libpng.(a|so) not found.]) + fi + + if test "$PHP_ZLIB_DIR" = "no"; then + AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=]) + fi + + if test ! -f $GD_PNG_DIR/include/png.h; then + AC_MSG_ERROR([png.h not found.]) + fi + + PHP_CHECK_LIBRARY(png,png_write_image, + [ + PHP_ADD_INCLUDE($GD_PNG_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_LIB_DIR, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_LIB_DIR, GD_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([Problem with libpng.(a|so) or libz.(a|so). Please check config.log for more information.]) + ],[ + -L$PHP_ZLIB_LIB_DIR -lz -L$GD_PNG_LIB_DIR + ]) + + else + AC_MSG_RESULT([If configure fails try --with-png-dir= and --with-zlib-dir=]) + fi +]) + +AC_DEFUN([PHP_GD_XPM],[ + if test "$PHP_XPM_DIR" != "no"; then + + for j in lib64 lib; do + for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do + if test -f "$i/$j/libXpm.$SHLIB_SUFFIX_NAME" -o -f "$i/$j/libXpm.a"; then + GD_XPM_DIR=$i + GD_XPM_LIB_DIR=$i/$j + break + fi + done + test -n "$PHP_XPM_DIR" && break + done + + if test -z "$GD_XPM_DIR"; then + AC_MSG_ERROR([libXpm.(a|so) not found.]) + fi + + for i in include include/X11; do + test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/include + done + + if test -z "$GD_XPM_INC"; then + AC_MSG_ERROR([xpm.h not found.]) + fi + + PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage, + [ + PHP_ADD_INCLUDE($GD_XPM_INC) + PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_LIB_DIR, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_LIB_DIR, GD_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([Problem with libXpm.(a|so) or libX11.(a|so). Please check config.log for more information.]) + ],[ + -L$GD_XPM_LIB_DIR -lX11 + ]) + else + AC_MSG_RESULT(If configure fails try --with-xpm-dir=) + fi +]) + +AC_DEFUN([PHP_GD_FREETYPE1],[ + if test "$PHP_TTF" != "no"; then + if test "$PHP_FREETYPE_DIR" = "no" -o "$PHP_FREETYPE_DIR" = ""; then + if test -n "$PHP_TTF"; then + for j in lib64 lib; do + for i in $PHP_TTF /usr/local /usr; do + if test -f "$i/$j/libttf.a" -o -f "$i/$j/libttf.$SHLIB_SUFFIX_NAME"; then + TTF_DIR=$i + TTF_LIB_DIR=$i/$j + if test -f "$i/include/freetype.h"; then + unset TTF_INC_DIR + elif test -f "$i/include/freetype/freetype.h"; then + TTF_INC_DIR=$i/include/freetype + elif test -f "$i/include/freetype1/freetype/freetype.h"; then + TTF_INC_DIR=$i/include/freetype1/freetype + else + unset TTF_DIR + fi + fi + test -n "$TTF_DIR" && break + done + test -n "$TTF_DIR" && break + done + fi + if test -n "$TTF_DIR" ; then + AC_DEFINE(HAVE_LIBTTF,1,[ ]) + PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_LIB_DIR, GD_SHARED_LIBADD) + fi + if test -z "$TTF_INC_DIR"; then + TTF_INC_DIR=$TTF_DIR/include + fi + PHP_ADD_INCLUDE($TTF_INC_DIR) + else + AC_MSG_RESULT([no - FreeType 2.x is to be used instead]) + fi + fi +]) + +AC_DEFUN([PHP_GD_FREETYPE2],[ + if test "$PHP_FREETYPE_DIR" != "no"; then + + for j in lib64 lib; do + for i in $PHP_FREETYPE_DIR /usr/local /usr; do + if test -f "$i/include/freetype2/freetype/freetype.h" && \ + test -f "$i/$j/libfreetype.a" -o -f "$i/$j/libfreetype.$SHLIB_SUFFIX_NAME"; then + FREETYPE2_DIR=$i + FREETYPE2_LIB_DIR=$i/$j + FREETYPE2_INC_DIR=$i/include/freetype2 + break + fi + done + test -n "$FREETYPE2_DIR" && break + done + + if test -n "$FREETYPE2_DIR" ; then + PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_LIB_DIR, GD_SHARED_LIBADD) + PHP_ADD_INCLUDE($FREETYPE2_DIR/include) + PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) + AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) + AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) + else + AC_MSG_ERROR([freetype2 not found!]) + fi + else + AC_MSG_RESULT([If configure fails try --with-freetype-dir=]) + fi +]) + +AC_DEFUN([PHP_GD_T1LIB],[ + if test "$PHP_T1LIB" != "no"; then + + for j in lib64 lib; do + for i in $PHP_T1LIB /usr/local /usr; do + if test -f "$i/include/t1lib.h" && \ + test -f "$i/$j/libt1.a" -o -f "$i/$j/libt1.$SHLIB_SUFFIX_NAME"; then + GD_T1_DIR=$i + GD_T1_LIB_DIR=$i/$j + break + done + test -n "$GD_T1_DIR" && break + done + + if test -z "$GD_T1_DIR"; then + AC_MSG_ERROR([Your t1lib distribution is not installed correctly. Please reinstall it.]) + fi + + PHP_CHECK_LIBRARY(t1, T1_LoadFont, + [ + AC_DEFINE(HAVE_LIBT1,1,[ ]) + PHP_ADD_INCLUDE($GD_T1_DIR/include) + PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_LIB_DIR, GD_SHARED_LIBADD) + ],[ + AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) + ],[ + -L$GD_T1_DIR/lib + ]) + fi +]) + +AC_DEFUN([PHP_GD_TTSTR],[ + if test "$PHP_GD_NATIVE_TTF" = "yes"; then + AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) + fi +]) + +AC_DEFUN([PHP_GD_JISX0208],[ + if test "$PHP_GD_JIS_CONV" = "yes"; then + USE_GD_JIS_CONV=1 + fi +]) + +AC_DEFUN([PHP_GD_CHECK_VERSION],[ + PHP_CHECK_LIBRARY(gd, gdImageString16, [AC_DEFINE(HAVE_LIBGD13, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImagePaletteCopy, [AC_DEFINE(HAVE_LIBGD15, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF_READ, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageGif, [AC_DEFINE(HAVE_GD_GIF_CREATE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageWBMP, [AC_DEFINE(HAVE_GD_WBMP, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageCreateFromJpeg, [AC_DEFINE(HAVE_GD_JPG, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageCreateFromGd2, [AC_DEFINE(HAVE_GD_GD2, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageCreateTrueColor, [AC_DEFINE(HAVE_LIBGD20, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageSetTile, [AC_DEFINE(HAVE_GD_IMAGESETTILE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageEllipse, [AC_DEFINE(HAVE_GD_IMAGEELLIPSE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageSetBrush, [AC_DEFINE(HAVE_GD_IMAGESETBRUSH, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageStringTTF, [AC_DEFINE(HAVE_GD_STRINGTTF, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageStringFT, [AC_DEFINE(HAVE_GD_STRINGFT, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageStringFTEx, [AC_DEFINE(HAVE_GD_STRINGFTEX, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageColorClosestHWB, [AC_DEFINE(HAVE_COLORCLOSESTHWB, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdImageGifCtx, [AC_DEFINE(HAVE_GD_GIF_CTX, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdCacheCreate, [AC_DEFINE(HAVE_GD_CACHE_CREATE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown, [AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdFreeFontCache, [AC_DEFINE(HAVE_GD_FREEFONTCACHE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx, [AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ]) +]) + +dnl +dnl Main GD configure +dnl + +if test "$PHP_GD" = "yes"; then + GD_MODULE_TYPE=builtin + extra_sources="libgd/gd.c libgd/gd_gd.c libgd/gd_gd2.c libgd/gd_io.c libgd/gd_io_dp.c \ + libgd/gd_io_file.c libgd/gd_ss.c libgd/gd_io_ss.c libgd/gd_png.c libgd/gd_jpeg.c \ + libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \ + libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \ + libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c libgd/gd_gif_in.c \ + libgd/xbm.c libgd/gd_gif_out.c " + +dnl check for fabsf and floorf which are available since C99 + AC_CHECK_FUNCS(fabsf floorf) + +dnl PNG is required by GD library + test "$PHP_PNG_DIR" = "no" && PHP_PNG_DIR=yes + +dnl Various checks for GD features + PHP_GD_TTSTR + PHP_GD_JISX0208 + PHP_GD_JPEG + PHP_GD_PNG + PHP_GD_XPM + PHP_GD_FREETYPE2 + PHP_GD_FREETYPE1 + PHP_GD_T1LIB + +dnl These are always available with bundled library + AC_DEFINE(HAVE_LIBGD, 1, [ ]) + AC_DEFINE(HAVE_LIBGD13, 1, [ ]) + AC_DEFINE(HAVE_LIBGD15, 1, [ ]) + AC_DEFINE(HAVE_LIBGD20, 1, [ ]) + AC_DEFINE(HAVE_LIBGD204, 1, [ ]) + AC_DEFINE(HAVE_GD_IMAGESETTILE, 1, [ ]) + AC_DEFINE(HAVE_GD_IMAGESETBRUSH, 1, [ ]) + AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 1, [ ]) + AC_DEFINE(HAVE_COLORCLOSESTHWB, 1, [ ]) + AC_DEFINE(HAVE_GD_WBMP, 1, [ ]) + AC_DEFINE(HAVE_GD_GD2, 1, [ ]) + AC_DEFINE(HAVE_GD_PNG, 1, [ ]) + AC_DEFINE(HAVE_GD_XBM, 1, [ ]) + AC_DEFINE(HAVE_GD_BUNDLED, 1, [ ]) + AC_DEFINE(HAVE_GD_GIF_READ, 1, [ ]) + AC_DEFINE(HAVE_GD_GIF_CREATE, 1, [ ]) + AC_DEFINE(HAVE_GD_IMAGEELLIPSE, 1, [ ]) + AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ]) + AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ]) + AC_DEFINE(HAVE_GD_GIF_CTX, 1, [ ]) + +dnl Make sure the libgd/ is first in the include path + GDLIB_CFLAGS="-DHAVE_LIBPNG" + +dnl Depending which libraries were included to PHP configure, +dnl enable the support in bundled GD library + + if test -n "$GD_JPEG_DIR"; then + AC_DEFINE(HAVE_GD_JPG, 1, [ ]) + GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBJPEG" + fi + + if test -n "$GD_XPM_DIR"; then + AC_DEFINE(HAVE_GD_XPM, 1, [ ]) + GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM" + fi + + if test -n "$FREETYPE2_DIR"; then + AC_DEFINE(HAVE_GD_STRINGFT, 1, [ ]) + AC_DEFINE(HAVE_GD_STRINGFTEX, 1, [ ]) + GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE" + fi + + if test -n "$TTF_DIR"; then + GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBTTF" + fi + + if test -n "$USE_GD_JIS_CONV"; then + AC_DEFINE(USE_GD_JISX0208, 1, [ ]) + GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208" + fi + +else + + if test "$PHP_GD" != "no"; then + GD_MODULE_TYPE=external + extra_sources="gdcache.c" + +dnl Various checks for GD features + PHP_GD_TTSTR + PHP_GD_JPEG + PHP_GD_PNG + PHP_GD_XPM + PHP_GD_FREETYPE2 + PHP_GD_FREETYPE1 + PHP_GD_T1LIB + +dnl Header path + for i in include/gd1.3 include/gd include gd1.3 gd ""; do + test -f "$PHP_GD/$i/gd.h" && GD_INCLUDE="$PHP_GD/$i" + done + +dnl Library path + for i in lib/gd1.3 lib/gd lib lib64 gd1.3 gd ""; do + test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i" + done + + if test -n "$GD_INCLUDE" && test -n "$GD_LIB"; then + PHP_ADD_LIBRARY_WITH_PATH(gd, $GD_LIB, GD_SHARED_LIBADD) + AC_DEFINE(HAVE_LIBGD,1,[ ]) + PHP_GD_CHECK_VERSION + elif test -z "$GD_INCLUDE"; then + AC_MSG_ERROR([Unable to find gd.h anywhere under $PHP_GD]) + else + AC_MSG_ERROR([Unable to find libgd.(a|so) anywhere under $PHP_GD]) + fi + + PHP_EXPAND_PATH($GD_INCLUDE, GD_INCLUDE) + + dnl + dnl Check for gd 2.0.4 greater availability + dnl + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=-I$GD_INCLUDE + AC_TRY_COMPILE([ +#include +#include + ], [ +gdIOCtx *ctx; +ctx = malloc(sizeof(gdIOCtx)); +ctx->gd_free = 1; + ], [ + AC_DEFINE(HAVE_LIBGD204, 1, [ ]) + ]) + CPPFLAGS=$old_CPPFLAGS + + fi +fi + +dnl +dnl Common for both builtin and external GD +dnl +if test "$PHP_GD" != "no"; then + PHP_NEW_EXTENSION(gd, gd.c gdttf.c $extra_sources, $ext_shared,, \\$(GDLIB_CFLAGS)) + + if test "$GD_MODULE_TYPE" = "builtin"; then + GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS" + PHP_ADD_BUILD_DIR($ext_builddir/libgd) + else + GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS" + PHP_ADD_INCLUDE($GD_INCLUDE) + + PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [ + AC_MSG_ERROR([GD build test failed. Please check the config.log for details.]) + ], [ -L$GD_LIB $GD_SHARED_LIBADD ]) + fi + + PHP_SUBST(GDLIB_CFLAGS) + PHP_SUBST(GD_SHARED_LIBADD) +fi --- php-4.4.0.orig/ext/gettext/config.m4 2003-10-01 04:53:58.000000000 +0200 +++ php-4.4.0.orig/ext/gettext/config.m4 2005-09-10 01:40:08.000000000 +0200 @@ -18,7 +18,6 @@ GETTEXT_INCDIR=$GETTEXT_DIR/include O_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" AC_CHECK_LIB(intl, bindtextdomain, [ GETTEXT_LIBS=intl GETTEXT_CHECK_IN_LIB=intl --- php-4.4.0.orig/ext/imap/config.m4 2005-01-11 05:56:57.000000000 +0100 +++ php-4.4.0.orig/ext/imap/config.m4 2005-09-10 01:40:08.000000000 +0200 @@ -167,6 +167,7 @@ for lib in c-client4 c-client imap; do IMAP_LIB=$lib IMAP_LIB_CHK(lib) + IMAP_LIB_CHK(lib64) IMAP_LIB_CHK(c-client) done --- php-4.4.0.orig/ext/ldap/config.m4 2005-05-08 18:06:24.000000000 +0200 +++ php-4.4.0.orig/ext/ldap/config.m4 2005-09-10 01:40:08.000000000 +0200 @@ -6,7 +6,8 @@ if test -f $1/include/ldap.h; then LDAP_DIR=$1 LDAP_INCDIR=$1/include - LDAP_LIBDIR=$1/lib + test -f $1/lib/libldap.so && LDAP_LIBDIR=$1/lib + test -f $1/lib64/libldap.so && LDAP_LIBDIR=$1/lib64 elif test -f $1/include/umich-ldap/ldap.h; then LDAP_DIR=$1 LDAP_INCDIR=$1/include/umich-ldap --- php-4.4.0.orig/ext/mcal/config.m4 2002-03-27 11:26:16.000000000 +0100 +++ php-4.4.0.orig/ext/mcal/config.m4 2005-09-10 02:23:20.000000000 +0200 @@ -19,7 +19,7 @@ fi done - for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do + for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib64/mcal $MCAL_DIR/lib $MCAL_DIR/lib64; do if test -r "$i/libmcal.a"; then MCAL_LIBRARY=$i fi --- php-4.4.0.orig/ext/mysql/config.m4 2004-12-30 08:02:17.000000000 +0100 +++ php-4.4.0.orig/ext/mysql/config.m4 2005-09-10 01:40:08.000000000 +0200 @@ -114,7 +114,7 @@ MYSQL_MODULE_TYPE=external - for i in lib lib/mysql; do + for i in lib64 lib lib64/mysql lib/mysql; do MYSQL_LIB_CHK($i) done --- php-4.4.0.orig/ext/odbc/config.m4 2005-04-22 01:02:23.000000000 +0200 +++ php-4.4.0.orig/ext/odbc/config.m4 2005-09-10 21:17:12.000000000 +0200 @@ -47,19 +47,8 @@ # # Check for the library files, and setup the ODBC_LIBS path... # -if test ! -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -a \ - ! -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a; then - # - # we have an error and should bail out, as we can't find the libs! - # - echo "" - echo "*********************************************************************" - echo "* Unable to locate $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so or $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a" - echo "* Please correct this by creating the following links and reconfiguring:" - echo "* $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a -> $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a" - echo "* $1/${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -> $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so" - echo "*********************************************************************" -else +if test -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -a \ + -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a; then ODBC_LFLAGS=-L$1 ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version} fi @@ -100,8 +89,12 @@ withval=/usr/local fi if test "$withval" != "no"; then + for i in lib64 lib; do + ADABAS_LIBDIR=$withval/$i + test -f "$ADABAS_LIBDIR/odbclib.a" && break + done PHP_ADD_INCLUDE($withval/incl) - PHP_ADD_LIBPATH($withval/lib) + PHP_ADD_LIBPATH($ADABAS_LIBDIR) ODBC_OBJS="$withval/lib/odbclib.a" ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a" $srcdir/build/shtool mkdir -f -p ext/odbc @@ -132,8 +125,12 @@ withval=/usr/local fi if test "$withval" != "no"; then + for i in lib64 lib; do + SAPDB_LIBDIR=$withval/$i + test -f "$SAPDB_LIBDIR/libsqlod.a" -o -f "$SAPDB_LIBDIR/libsqlod.$SHLIB_SUFFIX_NAME" && break + done PHP_ADD_INCLUDE($withval/incl) - PHP_ADD_LIBPATH($withval/lib) + PHP_ADD_LIBPATH($SAP_LIBDIR) PHP_ADD_LIBRARY(sqlod) ODBC_TYPE=sapdb AC_DEFINE(HAVE_SAPDB,1,[ ]) @@ -158,19 +155,36 @@ withval=/usr/local/solid fi if test "$withval" != "no"; then - ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib - ODBC_INCLUDE=-I$ODBC_INCDIR - ODBC_TYPE=solid - if test -f $ODBC_LIBDIR/soc*35.a; then - AC_DEFINE(HAVE_SOLID_35,1,[ ]) - elif test -f $ODBC_LIBDIR/scl*30.a; then - AC_DEFINE(HAVE_SOLID_30,1,[ ]) - elif test -f $ODBC_LIBDIR/scl*23.a; then - AC_DEFINE(HAVE_SOLID,1,[ ]) + for i in lib64 lib; do + SOLID_LIBDIR=$withval/$i + ODBC_INCDIR=$withval/include + ODBC_LIBDIR=$withval/$j + ODBC_INCLUDE=-I$ODBC_INCDIR + ODBC_TYPE=solid + if test -f $ODBC_LIBDIR/soc*35.a; then + AC_DEFINE(HAVE_SOLID_35,1,[ ]) + elif test -f $ODBC_LIBDIR/scl*30.a; then + AC_DEFINE(HAVE_SOLID_30,1,[ ]) + elif test -f $ODBC_LIBDIR/scl*23.a; then + AC_DEFINE(HAVE_SOLID,1,[ ]) + fi + AC_MSG_RESULT(yes) + ODBC_LIBS= + AC_FIND_SOLID_LIBS($ODBC_LIBDIR) + test -n "$ODBC_LIBS" && break + done + if test -z "$ODBC_LIBS"; then + # + # we have an error and should bail out, as we can't find the libs! + # + echo "" + echo "*********************************************************************" + echo "* Unable to locate ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so or ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a" + echo "* Please correct this by creating the following links and reconfiguring:" + echo "* ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a -> ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a" + echo "* ODBC_LIBDIR/${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -> ODBC_LIBDIR/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so" + echo "*********************************************************************" fi - AC_MSG_RESULT(yes) - AC_FIND_SOLID_LIBS($ODBC_LIBDIR) else AC_MSG_RESULT(no) fi @@ -400,11 +414,15 @@ withval=/usr/local fi if test "$withval" != "no"; then - PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib) + for i in lib64 lib; do + IODBC_LIBDIR=$withval/$i + test -f "$IODBC_LIBDIR/libiodbc.a" -o -f "$IODBC_LIBDIR/libiodbc.$SHLIB_SUFFIX_NAME" && break + done + PHP_ADD_LIBRARY_WITH_PATH(iodbc, $IODBC_LIBDIR) PHP_ADD_INCLUDE($withval/include, 1) ODBC_TYPE=iodbc ODBC_INCLUDE=-I$withval/include - ODBC_LFLAGS=-L$withval/lib + ODBC_LFLAGS=-L$IODBC_LIBDIR ODBC_LIBS=-liodbc AC_DEFINE(HAVE_IODBC,1,[ ]) AC_DEFINE(HAVE_ODBC2,1,[ ]) @@ -429,8 +447,11 @@ withval=/usr/local/easysoft/oob/client fi if test "$withval" != "no"; then + for i in lib64 lib; do + ODBC_LIBDIR=$withval/$i + test -f "$ODBC_LIBDIR/libesoobclient.a" -o -f "$ODBC_LIBDIR/libesoobclient.$SHLIB_SUFFIX_NAME" && break + done ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-lesoobclient @@ -456,8 +477,11 @@ withval=/usr/local fi if test "$withval" != "no"; then + for i in lib64 lib; do + ODBC_LIBDIR=$withval/$i + test -f "$ODBC_LIBDIR/libodbc.a" -o -f "$ODBC_LIBDIR/libodbc.$SHLIB_SUFFIX_NAME" && break + done ODBC_INCDIR=$withval/include - ODBC_LIBDIR=$withval/lib ODBC_LFLAGS=-L$ODBC_LIBDIR ODBC_INCLUDE=-I$ODBC_INCDIR ODBC_LIBS=-lodbc --- php-4.4.0.orig/ext/pcre/config.m4 2005-05-31 14:22:27.000000000 +0200 +++ php-4.4.0.orig/ext/pcre/config.m4 2005-09-10 01:40:08.000000000 +0200 @@ -25,7 +25,7 @@ AC_MSG_ERROR([Could not find pcre.h in $PHP_PCRE_REGEX]) fi - for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib; do + for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib64 $PHP_PCRE_REGEX/lib; do test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j done --- php-4.4.0.orig/ext/snmp/config.m4 2003-09-23 10:16:47.000000000 +0200 +++ php-4.4.0.orig/ext/snmp/config.m4 2005-09-10 01:40:08.000000000 +0200 @@ -45,8 +45,8 @@ test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp done - for i in /usr /usr/snmp /usr/local /usr/local/snmp; do - test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib + for i in /usr/lib /usr/lib64 /usr/snmp/lib /usr/local/lib /usr/local/snmp/lib; do + test -f $i/libsnmp.a -o -f $i/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i done else SNMP_INCDIR=$PHP_SNMP/include --- php-4.4.0.orig/ext/xml/config.m4 2004-12-20 21:38:18.000000000 +0100 +++ php-4.4.0.orig/ext/xml/config.m4 2005-09-10 02:28:11.000000000 +0200 @@ -33,6 +33,10 @@ for i in $PHP_XML $PHP_EXPAT_DIR; do if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then EXPAT_DIR=$i + EXPAT_LIBDIR=$i/lib + elif test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME ; then + EXPAT_DIR=$i + EXPAT_LIBDIR=$i/lib64 fi done @@ -41,7 +45,7 @@ fi PHP_ADD_INCLUDE($EXPAT_DIR/include) - PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_LIBDIR, XML_SHARED_LIBADD) PHP_SUBST(XML_SHARED_LIBADD) fi fi --- php-4.4.0.orig/ext/xmlrpc/config.m4 2003-10-03 07:25:43.000000000 +0200 +++ php-4.4.0.orig/ext/xmlrpc/config.m4 2005-09-10 01:40:08.000000000 +0200 @@ -30,6 +30,13 @@ testval=yes break fi + if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then + AC_DEFINE(HAVE_LIBEXPAT2,1,[ ]) + PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XMLRPC_SHARED_LIBADD) + PHP_ADD_INCLUDE($i/include) + testval=yes + break + fi done if test "$testval" = "no"; then --- php-4.4.0.orig/ext/xslt/config.m4 2004-08-18 07:14:16.000000000 +0200 +++ php-4.4.0.orig/ext/xslt/config.m4 2005-09-10 02:29:07.000000000 +0200 @@ -104,6 +104,12 @@ PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XSLT_SHARED_LIBADD) found_expat=yes break + elif test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then + AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ]) + PHP_ADD_INCLUDE($i/include) + PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XSLT_SHARED_LIBADD) + found_expat=yes + break fi done