Attachment #68136 for bug #96813

Lines 194-200 Link Here

(-)php-4.4.0.orig/acinclude.m4 (-7 / +19 lines)
194	unset ac_new_flags	194	unset ac_new_flags
195	for i in [$]$1; do	195	for i in [$]$1; do
196	case [$]i in	196	case [$]i in
197	-L/usr/lib\|-L/usr/lib/[)] ;;	197	-L/usr/lib\|-L/usr/lib/\|-L/usr/lib64\|-L/usr/lib64/[)] ;;
198	*[)] ac_new_flags="[$]ac_new_flags [$]i" ;;	198	*[)] ac_new_flags="[$]ac_new_flags [$]i" ;;
199	esac	199	esac
200	done	200	done
Lines 856-862 Link Here
856	dnl add a library to linkpath/runpath	856	dnl add a library to linkpath/runpath
857	dnl	857	dnl
858	AC_DEFUN([PHP_ADD_LIBPATH],[	858	AC_DEFUN([PHP_ADD_LIBPATH],[
859	if test "$1" != "/usr/lib"; then	859	case x$1 in
		860	x/usr/lib\|x/usr/lib64) ;;
		861	*)
860	PHP_EXPAND_PATH($1, ai_p)	862	PHP_EXPAND_PATH($1, ai_p)
861	ifelse([$2],,[	863	ifelse([$2],,[
862	_PHP_ADD_LIBPATH_GLOBAL([$ai_p])	864	_PHP_ADD_LIBPATH_GLOBAL([$ai_p])
Lines 866-873 Link Here
866	else	868	else
867	_PHP_ADD_LIBPATH_GLOBAL([$ai_p])	869	_PHP_ADD_LIBPATH_GLOBAL([$ai_p])
868	fi	870	fi
869	])	871	]) ;;
870	fi	872	esac
871	])	873	])
872		874
873	dnl	875	dnl
Lines 1651-1665 Link Here
1651	fi	1653	fi
1652		1654
1653	for i in $PHP_KERBEROS; do	1655	for i in $PHP_KERBEROS; do
1654	if test -f $i/lib/libkrb5.a \|\| test -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then	1656	if test -f $i/lib/libkrb5.a -o -f $i/lib/libkrb5.$SHLIB_SUFFIX_NAME; then
1655	PHP_KERBEROS_DIR=$i	1657	PHP_KERBEROS_DIR=$i
		1658	PHP_KERBEROS_LIBDIR=$i/lib
		1659	break
		1660	elif test -f $i/lib64/libkrb5.a -o -f $i/lib64/libkrb5.$SHLIB_SUFFIX_NAME; then
		1661	PHP_KERBEROS_DIR=$i
		1662	PHP_KERBEROS_LIBDIR=$i/lib64
1656	break	1663	break
1657	fi	1664	fi
1658	done	1665	done
1659		1666
1660	if test "$PHP_KERBEROS_DIR"; then	1667	if test "$PHP_KERBEROS_DIR"; then
1661	found_kerberos=yes	1668	found_kerberos=yes
1662	PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/lib, $1)	1669	PHP_ADD_LIBPATH($PHP_KERBEROS_LIBDIR, $1)
1663	PHP_ADD_LIBRARY(gssapi_krb5, 1, $1)	1670	PHP_ADD_LIBRARY(gssapi_krb5, 1, $1)
1664	PHP_ADD_LIBRARY(krb5, 1, $1)	1671	PHP_ADD_LIBRARY(krb5, 1, $1)
1665	PHP_ADD_LIBRARY(k5crypto, 1, $1)	1672	PHP_ADD_LIBRARY(k5crypto, 1, $1)
Lines 1731-1736 Link Here
1731	if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then	1738	if test -r $i/lib/libssl.a -o -r $i/lib/libssl.$SHLIB_SUFFIX_NAME; then
1732	OPENSSL_LIBDIR=$i/lib	1739	OPENSSL_LIBDIR=$i/lib
1733	fi	1740	fi
		1741	if test -r $i/lib64/libssl.a -o -r $i/lib64/libssl.$SHLIB_SUFFIX_NAME; then
		1742	OPENSSL_LIBDIR=$i/lib64
		1743	fi
1734	test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break	1744	test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break
1735	done	1745	done
1736		1746
Lines 1851-1857 Link Here
1851	fi	1861	fi
1852		1862
1853	if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a \|\|	1863	if test -f $ICONV_DIR/lib/lib$iconv_lib_name.a \|\|
1854	test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME	1864	test -f $ICONV_DIR/lib/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME \|\|
		1865	test -f $ICONV_DIR/lib64/lib$iconv_lib_name.a \|\|
		1866	test -f $ICONV_DIR/lib64/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME
1855	then	1867	then
1856	PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [	1868	PHP_CHECK_LIBRARY($iconv_lib_name, libiconv, [
1857	found_iconv=yes	1869	found_iconv=yes




dnl parameters(version, library list, function)
AC_DEFUN([PHP_DBA_DB_CHECK],[
  for LIB in $2; do
    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,[
#include "$THIS_INCLUDE"
#if DB_VERSION_MAJOR == $1
              yes
#endif
            ],[
              THIS_LIBS=$LIB
              break
            ])
          ])
        ])
      fi
    done
    test -n "$THIS_LIBS" && break
  done
  if test -z "$THIS_LIBS"; then
	AC_MSG_CHECKING(for db$1 major version)





  PHP_DOM_CHECK_VERSION

  DOM_LIBNAME=xml2
    DOM_LIBNAME=xml2
  else
    DOM_LIBNAME=xml
  fi

  XML2_CONFIG=$DOMXML_DIR/bin/xml2-config
 

    AC_MSG_ERROR(DOMXSLT requires DOMXML. Use --with-dom=<DIR>)
  fi
  
  DOM_LIBNAME=xml2
    DOM_LIBNAME=xml2
  else
    DOM_LIBNAME=xml
  fi

  PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
  PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD)




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

    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=<DIR>])

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

    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_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

    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=<DIR>)

  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

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_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
        fi
      done
      test -n "$GD_T1_DIR" && break
    done

    if test -z "$GD_T1_DIR"; then

    [
      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.]) 
    ],[

  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





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=<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=<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=<DIR> and --with-zlib-dir=<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=<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=<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 <gd.h>
#include <stdlib.h>
  ], [
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

Lines 18-24 Link Here

(-)php-4.4.0.orig/ext/gettext/config.m4 (-1 lines)
18	GETTEXT_INCDIR=$GETTEXT_DIR/include	18	GETTEXT_INCDIR=$GETTEXT_DIR/include
19		19
20	O_LDFLAGS=$LDFLAGS	20	O_LDFLAGS=$LDFLAGS
21	LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR"
22	AC_CHECK_LIB(intl, bindtextdomain, [	21	AC_CHECK_LIB(intl, bindtextdomain, [
23	GETTEXT_LIBS=intl	22	GETTEXT_LIBS=intl
24	GETTEXT_CHECK_IN_LIB=intl	23	GETTEXT_CHECK_IN_LIB=intl

Lines 167-172 Link Here

(-)php-4.4.0.orig/ext/imap/config.m4 (+1 lines)
167	for lib in c-client4 c-client imap; do	167	for lib in c-client4 c-client imap; do
168	IMAP_LIB=$lib	168	IMAP_LIB=$lib
169	IMAP_LIB_CHK(lib)	169	IMAP_LIB_CHK(lib)
		170	IMAP_LIB_CHK(lib64)
170	IMAP_LIB_CHK(c-client)	171	IMAP_LIB_CHK(c-client)
171	done	172	done
172		173

Lines 6-12 Link Here

(-)php-4.4.0.orig/ext/ldap/config.m4 (-1 / +2 lines)
6	if test -f $1/include/ldap.h; then	6	if test -f $1/include/ldap.h; then
7	LDAP_DIR=$1	7	LDAP_DIR=$1
8	LDAP_INCDIR=$1/include	8	LDAP_INCDIR=$1/include
9	LDAP_LIBDIR=$1/lib	9	test -f $1/lib/libldap.so && LDAP_LIBDIR=$1/lib
		10	test -f $1/lib64/libldap.so && LDAP_LIBDIR=$1/lib64
10	elif test -f $1/include/umich-ldap/ldap.h; then	11	elif test -f $1/include/umich-ldap/ldap.h; then
11	LDAP_DIR=$1	12	LDAP_DIR=$1
12	LDAP_INCDIR=$1/include/umich-ldap	13	LDAP_INCDIR=$1/include/umich-ldap

Lines 19-25 Link Here

(-)php-4.4.0.orig/ext/mcal/config.m4 (-1 / +1 lines)
19	fi	19	fi
20	done	20	done
21		21
22	for i in $MCAL_DIR $MCAL_DIR/mcal $MCAL_DIR/mcal/lib $MCAL_DIR/lib/mcal $MCAL_DIR/lib; do	22	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
23	if test -r "$i/libmcal.a"; then	23	if test -r "$i/libmcal.a"; then
24	MCAL_LIBRARY=$i	24	MCAL_LIBRARY=$i
25	fi	25	fi

Lines 114-120 Link Here

(-)php-4.4.0.orig/ext/mysql/config.m4 (-1 / +1 lines)
114		114
115	MYSQL_MODULE_TYPE=external	115	MYSQL_MODULE_TYPE=external
116		116
117	for i in lib lib/mysql; do	117	for i in lib64 lib lib64/mysql lib/mysql; do
118	MYSQL_LIB_CHK($i)	118	MYSQL_LIB_CHK($i)
119	done	119	done
120		120




#
# 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
  ODBC_LFLAGS=-L$1
  ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}
fi

    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($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

    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($SAP_LIBDIR)
    PHP_ADD_LIBRARY(sqlod)
    ODBC_TYPE=sapdb
    AC_DEFINE(HAVE_SAPDB,1,[ ])

    withval=/usr/local/solid
  fi
  if test "$withval" != "no"; then
    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

    withval=/usr/local
  fi
  if test "$withval" != "no"; then
    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$IODBC_LIBDIR
    ODBC_LIBS=-liodbc
    AC_DEFINE(HAVE_IODBC,1,[ ])
    AC_DEFINE(HAVE_ODBC2,1,[ ])

    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

    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

Lines 25-31 Link Here

(-)php-4.4.0.orig/ext/pcre/config.m4 (-1 / +1 lines)
25	AC_MSG_ERROR([Could not find pcre.h in $PHP_PCRE_REGEX])	25	AC_MSG_ERROR([Could not find pcre.h in $PHP_PCRE_REGEX])
26	fi	26	fi
27		27
28	for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib; do	28	for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/lib64 $PHP_PCRE_REGEX/lib; do
29	test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j	29	test -f $j/libpcre.a -o -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j
30	done	30	done
31		31

Lines 45-52 Link Here

(-)php-4.4.0.orig/ext/snmp/config.m4 (-2 / +2 lines)
45	test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp	45	test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp
46	test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp	46	test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp
47	done	47	done
48	for i in /usr /usr/snmp /usr/local /usr/local/snmp; do	48	for i in /usr/lib /usr/lib64 /usr/snmp/lib /usr/local/lib /usr/local/snmp/lib; do
49	test -f $i/lib/libsnmp.a -o -f $i/lib/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i/lib	49	test -f $i/libsnmp.a -o -f $i/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i
50	done	50	done
51	else	51	else
52	SNMP_INCDIR=$PHP_SNMP/include	52	SNMP_INCDIR=$PHP_SNMP/include

Lines 33-38 Link Here

(-)php-4.4.0.orig/ext/xml/config.m4 (-1 / +5 lines)
33	for i in $PHP_XML $PHP_EXPAT_DIR; do	33	for i in $PHP_XML $PHP_EXPAT_DIR; do
34	if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then	34	if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then
35	EXPAT_DIR=$i	35	EXPAT_DIR=$i
		36	EXPAT_LIBDIR=$i/lib
		37	elif test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME ; then
		38	EXPAT_DIR=$i
		39	EXPAT_LIBDIR=$i/lib64
36	fi	40	fi
37	done	41	done
38		42
Lines 41-47 Link Here
41	fi	45	fi
42		46
43	PHP_ADD_INCLUDE($EXPAT_DIR/include)	47	PHP_ADD_INCLUDE($EXPAT_DIR/include)
44	PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD)	48	PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_LIBDIR, XML_SHARED_LIBADD)
45	PHP_SUBST(XML_SHARED_LIBADD)	49	PHP_SUBST(XML_SHARED_LIBADD)
46	fi	50	fi
47	fi	51	fi

Lines 30-35 Link Here

(-)php-4.4.0.orig/ext/xmlrpc/config.m4 (+7 lines)
30	testval=yes	30	testval=yes
31	break	31	break
32	fi	32	fi
		33	if test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then
		34	AC_DEFINE(HAVE_LIBEXPAT2,1,[ ])
		35	PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XMLRPC_SHARED_LIBADD)
		36	PHP_ADD_INCLUDE($i/include)
		37	testval=yes
		38	break
		39	fi
33	done	40	done
34		41
35	if test "$testval" = "no"; then	42	if test "$testval" = "no"; then

Lines 104-109 Link Here

(-)php-4.4.0.orig/ext/xslt/config.m4 (+6 lines)
104	PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XSLT_SHARED_LIBADD)	104	PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XSLT_SHARED_LIBADD)
105	found_expat=yes	105	found_expat=yes
106	break	106	break
		107	elif test -f $i/lib64/libexpat.a -o -f $i/lib64/libexpat.$SHLIB_SUFFIX_NAME; then
		108	AC_DEFINE(HAVE_LIBEXPAT2, 1, [ ])
		109	PHP_ADD_INCLUDE($i/include)
		110	PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib64, XSLT_SHARED_LIBADD)
		111	found_expat=yes
		112	break
107	fi	113	fi
108	done	114	done
109		115

Return to bug 96813

Lines 135-159 Link Here

(-)php-4.4.0.orig/ext/dba/config.m4 (-13 / +16 lines)
135	dnl parameters(version, library list, function)	135	dnl parameters(version, library list, function)
136	AC_DEFUN([PHP_DBA_DB_CHECK],[	136	AC_DEFUN([PHP_DBA_DB_CHECK],[
137	for LIB in $2; do	137	for LIB in $2; do
138	if test -f $THIS_PREFIX/lib/lib$LIB.a -o -f $THIS_PREFIX/lib/lib$LIB.$SHLIB_SUFFIX_NAME; then	138	for LIBDIR in lib64 lib; do
139	PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/lib, -l$LIB,[	139	if test -f $THIS_PREFIX/$LIBDIR/lib$LIB.a -o -f $THIS_PREFIX/$LIBDIR/lib$LIB.$SHLIB_SUFFIX_NAME; then
140	AC_TRY_LINK([	140	PHP_TEMP_LDFLAGS(-L$THIS_PREFIX/$LIBDIR, -l$LIB,[
		141	AC_TRY_LINK([
141	#include "$THIS_INCLUDE"	142	#include "$THIS_INCLUDE"
142	],[	143	],[
143	$3;	144	$3;
144	],[	145	],[
145	AC_EGREP_CPP(yes,[	146	AC_EGREP_CPP(yes,[
146	#include "$THIS_INCLUDE"	147	#include "$THIS_INCLUDE"
147	#if DB_VERSION_MAJOR == $1	148	#if DB_VERSION_MAJOR == $1
148	yes	149	yes
149	#endif	150	#endif
150	],[	151	],[
151	THIS_LIBS=$LIB	152	THIS_LIBS=$LIB
152	break	153	break
		154	])
153	])	155	])
154	])	156	])
155	])	157	fi
156	fi	158	done
		159	test -n "$THIS_LIBS" && break
157	done	160	done
158	if test -z "$THIS_LIBS"; then	161	if test -z "$THIS_LIBS"; then
159	AC_MSG_CHECKING(for db$1 major version)	162	AC_MSG_CHECKING(for db$1 major version)

Lines 50-60 Link Here

(-)php-4.4.0.orig/ext/domxml/config.m4 (-10 / +2 lines)
50		50
51	PHP_DOM_CHECK_VERSION	51	PHP_DOM_CHECK_VERSION
52		52
53	if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then	53	DOM_LIBNAME=xml2
54	DOM_LIBNAME=xml2
55	else
56	DOM_LIBNAME=xml
57	fi
58		54
59	XML2_CONFIG=$DOMXML_DIR/bin/xml2-config	55	XML2_CONFIG=$DOMXML_DIR/bin/xml2-config
60		56
Lines 145-155 Link Here
145	AC_MSG_ERROR(DOMXSLT requires DOMXML. Use --with-dom=<DIR>)	141	AC_MSG_ERROR(DOMXSLT requires DOMXML. Use --with-dom=<DIR>)
146	fi	142	fi
147		143
148	if test -f $DOMXML_DIR/lib/libxml2.a -o -f $DOMXML_DIR/lib/libxml2.$SHLIB_SUFFIX_NAME ; then	144	DOM_LIBNAME=xml2
149	DOM_LIBNAME=xml2
150	else
151	DOM_LIBNAME=xml
152	fi
153		145
154	PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)	146	PHP_ADD_LIBRARY_WITH_PATH($DOM_LIBNAME, $DOMXML_DIR/lib, DOMXML_SHARED_LIBADD)
155	PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD)	147	PHP_ADD_INCLUDE($DOMXML_DIR/include$DOMXML_DIR_ADD)

Lines 50-57 Link Here

(-)php-4.4.0.orig/ext/gd/config.m4 (-39 / +77 lines)
50	AC_DEFUN([PHP_GD_JPEG],[	50	AC_DEFUN([PHP_GD_JPEG],[
51	if test "$PHP_JPEG_DIR" != "no"; then	51	if test "$PHP_JPEG_DIR" != "no"; then
52		52
53	for i in $PHP_JPEG_DIR /usr/local /usr; do	53	for j in lib64 lib; do
54	test -f $i/lib/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/lib/libjpeg.a && GD_JPEG_DIR=$i && break	54	for i in $PHP_JPEG_DIR /usr/local /usr; do
		55	if test -f "$i/$j/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/$j/libjpeg.a"; then
		56	GD_JPEG_DIR=$i
		57	GD_JPEG_LIB_DIR=$i/$j
		58	break
		59	fi
		60	done
		61	test -n "$GD_JPEG_DIR" && break
55	done	62	done
56		63
57	if test -z "$GD_JPEG_DIR"; then	64	if test -z "$GD_JPEG_DIR"; then
Lines 61-71 Link Here
61	PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,	68	PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
62	[	69	[
63	PHP_ADD_INCLUDE($GD_JPEG_DIR/include)	70	PHP_ADD_INCLUDE($GD_JPEG_DIR/include)
64	PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_DIR/lib, GD_SHARED_LIBADD)	71	PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_LIB_DIR, GD_SHARED_LIBADD)
65	],[	72	],[
66	AC_MSG_ERROR([Problem with libjpeg.(a\|so). Please check config.log for more information.])	73	AC_MSG_ERROR([Problem with libjpeg.(a\|so). Please check config.log for more information.])
67	],[	74	],[
68	-L$GD_JPEG_DIR/lib	75	-L$GD_JPEG_LIB_DIR
69	])	76	])
70	else	77	else
71	AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>])	78	AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>])
Lines 75-82 Link Here
75	AC_DEFUN([PHP_GD_PNG],[	82	AC_DEFUN([PHP_GD_PNG],[
76	if test "$PHP_PNG_DIR" != "no"; then	83	if test "$PHP_PNG_DIR" != "no"; then
77		84
78	for i in $PHP_PNG_DIR /usr/local /usr; do	85	for j in lib64 lib; do
79	test -f $i/lib/libpng.$SHLIB_SUFFIX_NAME -o -f $i/lib/libpng.a && GD_PNG_DIR=$i && break	86	for i in $PHP_PNG_DIR /usr/local /usr; do
		87	if test -f $"i/$j/libpng.$SHLIB_SUFFIX_NAME" -o -f "$i/$j/libpng.a"; then
		88	GD_PNG_DIR=$i
		89	GD_PNG_LIB_DIR=$i/$j
		90	break
		91	fi
		92	done
		93	test -n "$GD_PNG_DIR" && break
80	done	94	done
81		95
82	if test -z "$GD_PNG_DIR"; then	96	if test -z "$GD_PNG_DIR"; then
Lines 94-105 Link Here
94	PHP_CHECK_LIBRARY(png,png_write_image,	108	PHP_CHECK_LIBRARY(png,png_write_image,
95	[	109	[
96	PHP_ADD_INCLUDE($GD_PNG_DIR/include)	110	PHP_ADD_INCLUDE($GD_PNG_DIR/include)
97	PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_DIR/lib, GD_SHARED_LIBADD)	111	PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_LIB_DIR, GD_SHARED_LIBADD)
98	PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/lib, GD_SHARED_LIBADD)	112	PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_LIB_DIR, GD_SHARED_LIBADD)
99	],[	113	],[
100	AC_MSG_ERROR([Problem with libpng.(a\|so) or libz.(a\|so). Please check config.log for more information.])	114	AC_MSG_ERROR([Problem with libpng.(a\|so) or libz.(a\|so). Please check config.log for more information.])
101	],[	115	],[
102	-L$PHP_ZLIB_DIR/lib -lz -L$GD_PNG_DIR/lib	116	-L$PHP_ZLIB_LIB_DIR -lz -L$GD_PNG_LIB_DIR
103	])	117	])
104		118
105	else	119	else
Lines 110-117 Link Here
110	AC_DEFUN([PHP_GD_XPM],[	124	AC_DEFUN([PHP_GD_XPM],[
111	if test "$PHP_XPM_DIR" != "no"; then	125	if test "$PHP_XPM_DIR" != "no"; then
112		126
113	for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do	127	for j in lib64 lib; do
114	test -f $i/lib/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/lib/libXpm.a && GD_XPM_DIR=$i && break	128	for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
		129	if test -f "$i/$j/libXpm.$SHLIB_SUFFIX_NAME" -o -f "$i/$j/libXpm.a"; then
		130	GD_XPM_DIR=$i
		131	GD_XPM_LIB_DIR=$i/$j
		132	break
		133	fi
		134	done
		135	test -n "$PHP_XPM_DIR" && break
115	done	136	done
116		137
117	if test -z "$GD_XPM_DIR"; then	138	if test -z "$GD_XPM_DIR"; then
Lines 129-140 Link Here
129	PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage,	150	PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage,
130	[	151	[
131	PHP_ADD_INCLUDE($GD_XPM_INC)	152	PHP_ADD_INCLUDE($GD_XPM_INC)
132	PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_DIR/lib, GD_SHARED_LIBADD)	153	PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_LIB_DIR, GD_SHARED_LIBADD)
133	PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/lib, GD_SHARED_LIBADD)	154	PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_LIB_DIR, GD_SHARED_LIBADD)
134	],[	155	],[
135	AC_MSG_ERROR([Problem with libXpm.(a\|so) or libX11.(a\|so). Please check config.log for more information.])	156	AC_MSG_ERROR([Problem with libXpm.(a\|so) or libX11.(a\|so). Please check config.log for more information.])
136	],[	157	],[
137	-L$GD_XPM_DIR/lib -lX11	158	-L$GD_XPM_LIB_DIR -lX11
138	])	159	])
139	else	160	else
140	AC_MSG_RESULT(If configure fails try --with-xpm-dir=<DIR>)	161	AC_MSG_RESULT(If configure fails try --with-xpm-dir=<DIR>)
Lines 145-169 Link Here
145	if test "$PHP_TTF" != "no"; then	166	if test "$PHP_TTF" != "no"; then
146	if test "$PHP_FREETYPE_DIR" = "no" -o "$PHP_FREETYPE_DIR" = ""; then	167	if test "$PHP_FREETYPE_DIR" = "no" -o "$PHP_FREETYPE_DIR" = ""; then
147	if test -n "$PHP_TTF"; then	168	if test -n "$PHP_TTF"; then
148	for i in $PHP_TTF /usr/local /usr; do	169	for j in lib64 lib; do
149	if test -f "$i/include/freetype.h"; then	170	for i in $PHP_TTF /usr/local /usr; do
150	TTF_DIR=$i	171	if test -f "$i/$j/libttf.a" -o -f "$i/$j/libttf.$SHLIB_SUFFIX_NAME"; then
151	unset TTF_INC_DIR	172	TTF_DIR=$i
152	fi	173	TTF_LIB_DIR=$i/$j
153	if test -f "$i/include/freetype/freetype.h"; then	174	if test -f "$i/include/freetype.h"; then
154	TTF_DIR=$i	175	unset TTF_INC_DIR
155	TTF_INC_DIR=$i/include/freetype	176	elif test -f "$i/include/freetype/freetype.h"; then
156	fi	177	TTF_INC_DIR=$i/include/freetype
157	if test -f "$i/include/freetype1/freetype/freetype.h"; then	178	elif test -f "$i/include/freetype1/freetype/freetype.h"; then
158	TTF_DIR=$i	179	TTF_INC_DIR=$i/include/freetype1/freetype
159	TTF_INC_DIR=$i/include/freetype1/freetype	180	else
160	fi	181	unset TTF_DIR
		182	fi
		183	fi
		184	test -n "$TTF_DIR" && break
		185	done
161	test -n "$TTF_DIR" && break	186	test -n "$TTF_DIR" && break
162	done	187	done
163	fi	188	fi
164	if test -n "$TTF_DIR" ; then	189	if test -n "$TTF_DIR" ; then
165	AC_DEFINE(HAVE_LIBTTF,1,[ ])	190	AC_DEFINE(HAVE_LIBTTF,1,[ ])
166	PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib, GD_SHARED_LIBADD)	191	PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_LIB_DIR, GD_SHARED_LIBADD)
167	fi	192	fi
168	if test -z "$TTF_INC_DIR"; then	193	if test -z "$TTF_INC_DIR"; then
169	TTF_INC_DIR=$TTF_DIR/include	194	TTF_INC_DIR=$TTF_DIR/include
Lines 178-193 Link Here
178	AC_DEFUN([PHP_GD_FREETYPE2],[	203	AC_DEFUN([PHP_GD_FREETYPE2],[
179	if test "$PHP_FREETYPE_DIR" != "no"; then	204	if test "$PHP_FREETYPE_DIR" != "no"; then
180		205
181	for i in $PHP_FREETYPE_DIR /usr/local /usr; do	206	for j in lib64 lib; do
182	if test -f "$i/include/freetype2/freetype/freetype.h"; then	207	for i in $PHP_FREETYPE_DIR /usr/local /usr; do
183	FREETYPE2_DIR=$i	208	if test -f "$i/include/freetype2/freetype/freetype.h" && \
184	FREETYPE2_INC_DIR=$i/include/freetype2	209	test -f "$i/$j/libfreetype.a" -o -f "$i/$j/libfreetype.$SHLIB_SUFFIX_NAME"; then
185	break	210	FREETYPE2_DIR=$i
186	fi	211	FREETYPE2_LIB_DIR=$i/$j
		212	FREETYPE2_INC_DIR=$i/include/freetype2
		213	break
		214	fi
		215	done
		216	test -n "$FREETYPE2_DIR" && break
187	done	217	done
188		218
189	if test -n "$FREETYPE2_DIR" ; then	219	if test -n "$FREETYPE2_DIR" ; then
190	PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/lib, GD_SHARED_LIBADD)	220	PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_LIB_DIR, GD_SHARED_LIBADD)
191	PHP_ADD_INCLUDE($FREETYPE2_DIR/include)	221	PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
192	PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)	222	PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
193	AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])	223	AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
Lines 203-210 Link Here
203	AC_DEFUN([PHP_GD_T1LIB],[	233	AC_DEFUN([PHP_GD_T1LIB],[
204	if test "$PHP_T1LIB" != "no"; then	234	if test "$PHP_T1LIB" != "no"; then
205		235
206	for i in $PHP_T1LIB /usr/local /usr; do	236	for j in lib64 lib; do
207	test -f "$i/include/t1lib.h" && GD_T1_DIR=$i && break	237	for i in $PHP_T1LIB /usr/local /usr; do
		238	if test -f "$i/include/t1lib.h" && \
		239	test -f "$i/$j/libt1.a" -o -f "$i/$j/libt1.$SHLIB_SUFFIX_NAME"; then
		240	GD_T1_DIR=$i
		241	GD_T1_LIB_DIR=$i/$j
		242	break
		243	fi
		244	done
		245	test -n "$GD_T1_DIR" && break
208	done	246	done
209		247
210	if test -z "$GD_T1_DIR"; then	248	if test -z "$GD_T1_DIR"; then
Lines 215-221 Link Here
215	[	253	[
216	AC_DEFINE(HAVE_LIBT1,1,[ ])	254	AC_DEFINE(HAVE_LIBT1,1,[ ])
217	PHP_ADD_INCLUDE($GD_T1_DIR/include)	255	PHP_ADD_INCLUDE($GD_T1_DIR/include)
218	PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_DIR/lib, GD_SHARED_LIBADD)	256	PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_LIB_DIR, GD_SHARED_LIBADD)
219	],[	257	],[
220	AC_MSG_ERROR([Problem with libt1.(a\|so). Please check config.log for more information.])	258	AC_MSG_ERROR([Problem with libt1.(a\|so). Please check config.log for more information.])
221	],[	259	],[
Lines 365-371 Link Here
365	done	403	done
366		404
367	dnl Library path	405	dnl Library path
368	for i in lib/gd1.3 lib/gd lib gd1.3 gd ""; do	406	for i in lib/gd1.3 lib/gd lib lib64 gd1.3 gd ""; do
369	test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i"	407	test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i"
370	done	408	done
371		409

Line 0 Link Here

(-)php-4.4.0.orig/ext/gd/config.m4~ (+461 lines)
		1	dnl
		2	dnl $Id: config.m4,v 1.120.2.25 2005/05/17 12:23:09 tony2001 Exp $
		3	dnl
		4
		5	dnl
		6	dnl Configure options
		7	dnl
		8
		9	PHP_ARG_WITH(gd, for GD support,
		10	[ --with-gd[=DIR] Include GD support where DIR is GD install prefix.
		11	If DIR is not set, the bundled GD library will be used.])
		12
		13	if test -z "$PHP_JPEG_DIR"; then
		14	PHP_ARG_WITH(jpeg-dir, for the location of libjpeg,
		15	[ --with-jpeg-dir[=DIR] GD: Set the path to libjpeg install prefix.], no, no)
		16	fi
		17
		18	if test -z "$PHP_PNG_DIR"; then
		19	PHP_ARG_WITH(png-dir, for the location of libpng,
		20	[ --with-png-dir[=DIR] GD: Set the path to libpng install prefix.], no, no)
		21	fi
		22
		23	if test -z "$PHP_ZLIB_DIR"; then
		24	PHP_ARG_WITH(zlib-dir, for the location of libz,
		25	[ --with-zlib-dir[=DIR] GD: Set the path to libz install prefix.], no, no)
		26	fi
		27
		28	PHP_ARG_WITH(xpm-dir, for the location of libXpm,
		29	[ --with-xpm-dir[=DIR] GD: Set the path to libXpm install prefix.], no, no)
		30
		31	PHP_ARG_WITH(ttf, for FreeType 1.x support,
		32	[ --with-ttf[=DIR] GD: Include FreeType 1.x support], no, no)
		33
		34	PHP_ARG_WITH(freetype-dir, for FreeType 2,
		35	[ --with-freetype-dir[=DIR] GD: Set the path to FreeType 2 install prefix.], no, no)
		36
		37	PHP_ARG_WITH(t1lib, for T1lib support,
		38	[ --with-t1lib[=DIR] GD: Include T1lib support.], no, no)
		39
		40	PHP_ARG_ENABLE(gd-native-ttf, whether to enable truetype string function in GD,
		41	[ --enable-gd-native-ttf GD: Enable TrueType string function.], no, no)
		42
		43	PHP_ARG_ENABLE(gd-jis-conv, whether to enable JIS-mapped Japanese font support in GD,
		44	[ --enable-gd-jis-conv GD: Enable JIS-mapped Japanese font support.], no, no)
		45
		46	dnl
		47	dnl Checks for the configure options
		48	dnl
		49
		50	AC_DEFUN([PHP_GD_JPEG],[
		51	if test "$PHP_JPEG_DIR" != "no"; then
		52
		53	for j in lib64 lib; do
		54	for i in $PHP_JPEG_DIR /usr/local /usr; do
		55	if test -f "$i/$j/libjpeg.$SHLIB_SUFFIX_NAME" -o -f "$i/$j/libjpeg.a"; then
		56	GD_JPEG_DIR=$i
		57	GD_JPEG_LIB_DIR=$i/$j
		58	break
		59	fi
		60	done
		61	test -n "$GD_JPEG_DIR" && break
		62	done
		63
		64	if test -z "$GD_JPEG_DIR"; then
65	AC_MSG_ERROR([libjpeg.(a\|so) not found.])
66	fi
67
68	PHP_CHECK_LIBRARY(jpeg,jpeg_read_header,
69	[
70	PHP_ADD_INCLUDE($GD_JPEG_DIR/include)
71	PHP_ADD_LIBRARY_WITH_PATH(jpeg, $GD_JPEG_LIB_DIR, GD_SHARED_LIBADD)
72	],[
73	AC_MSG_ERROR([Problem with libjpeg.(a\|so). Please check config.log for more information.])
74	],[
75	-L$GD_JPEG_LIB_DIR
76	])
77	else
78	AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>])
79	fi
80	])
81
82	AC_DEFUN([PHP_GD_PNG],[
83	if test "$PHP_PNG_DIR" != "no"; then
84
85	for j in lib64 lib; do
86	for i in $PHP_PNG_DIR /usr/local /usr; do
87	if test -f $"i/$j/libpng.$SHLIB_SUFFIX_NAME" -o -f "$i/$j/libpng.a"; then
88	GD_PNG_DIR=$i
89	GD_PNG_LIB_DIR=$i/$j
90	break
91	fi
92	done
93	test -n "$GD_PNG_DIR" && break
94	done
95
96	if test -z "$GD_PNG_DIR"; then
97	AC_MSG_ERROR([libpng.(a\|so) not found.])
98	fi
99
100	if test "$PHP_ZLIB_DIR" = "no"; then
101	AC_MSG_ERROR([PNG support requires ZLIB. Use --with-zlib-dir=<DIR>])
102	fi
103
104	if test ! -f $GD_PNG_DIR/include/png.h; then
105	AC_MSG_ERROR([png.h not found.])
106	fi
107
108	PHP_CHECK_LIBRARY(png,png_write_image,
109	[
110	PHP_ADD_INCLUDE($GD_PNG_DIR/include)
111	PHP_ADD_LIBRARY_WITH_PATH(z, $PHP_ZLIB_LIB_DIR, GD_SHARED_LIBADD)
112	PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_LIB_DIR, GD_SHARED_LIBADD)
113	],[
114	AC_MSG_ERROR([Problem with libpng.(a\|so) or libz.(a\|so). Please check config.log for more information.])
115	],[
116	-L$PHP_ZLIB_LIB_DIR -lz -L$GD_PNG_LIB_DIR
117	])
118
119	else
120	AC_MSG_RESULT([If configure fails try --with-png-dir=<DIR> and --with-zlib-dir=<DIR>])
121	fi
122	])
123
124	AC_DEFUN([PHP_GD_XPM],[
125	if test "$PHP_XPM_DIR" != "no"; then
126
127	for j in lib64 lib; do
128	for i in $PHP_XPM_DIR /usr/local /usr/X11R6 /usr; do
129	if test -f "$i/$j/libXpm.$SHLIB_SUFFIX_NAME" -o -f "$i/$j/libXpm.a"; then
130	GD_XPM_DIR=$i
131	GD_XPM_LIB_DIR=$i/$j
132	break
133	fi
134	done
135	test -n "$PHP_XPM_DIR" && break
136	done
137
138	if test -z "$GD_XPM_DIR"; then
139	AC_MSG_ERROR([libXpm.(a\|so) not found.])
140	fi
141
142	for i in include include/X11; do
143	test -f $GD_XPM_DIR/$i/xpm.h && GD_XPM_INC=$GD_XPM_DIR/include
144	done
145
146	if test -z "$GD_XPM_INC"; then
147	AC_MSG_ERROR([xpm.h not found.])
148	fi
149
150	PHP_CHECK_LIBRARY(Xpm,XpmFreeXpmImage,
151	[
152	PHP_ADD_INCLUDE($GD_XPM_INC)
153	PHP_ADD_LIBRARY_WITH_PATH(Xpm, $GD_XPM_LIB_DIR, GD_SHARED_LIBADD)
154	PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_LIB_DIR, GD_SHARED_LIBADD)
155	],[
156	AC_MSG_ERROR([Problem with libXpm.(a\|so) or libX11.(a\|so). Please check config.log for more information.])
157	],[
158	-L$GD_XPM_LIB_DIR -lX11
159	])
160	else
161	AC_MSG_RESULT(If configure fails try --with-xpm-dir=<DIR>)
162	fi
163	])
164
165	AC_DEFUN([PHP_GD_FREETYPE1],[
166	if test "$PHP_TTF" != "no"; then
167	if test "$PHP_FREETYPE_DIR" = "no" -o "$PHP_FREETYPE_DIR" = ""; then
168	if test -n "$PHP_TTF"; then
169	for j in lib64 lib; do
170	for i in $PHP_TTF /usr/local /usr; do
171	if test -f "$i/$j/libttf.a" -o -f "$i/$j/libttf.$SHLIB_SUFFIX_NAME"; then
172	TTF_DIR=$i
173	TTF_LIB_DIR=$i/$j
174	if test -f "$i/include/freetype.h"; then
175	unset TTF_INC_DIR
176	elif test -f "$i/include/freetype/freetype.h"; then
177	TTF_INC_DIR=$i/include/freetype
178	elif test -f "$i/include/freetype1/freetype/freetype.h"; then
179	TTF_INC_DIR=$i/include/freetype1/freetype
180	else
181	unset TTF_DIR
182	fi
183	fi
184	test -n "$TTF_DIR" && break
185	done
186	test -n "$TTF_DIR" && break
187	done
188	fi
189	if test -n "$TTF_DIR" ; then
190	AC_DEFINE(HAVE_LIBTTF,1,[ ])
191	PHP_ADD_LIBRARY_WITH_PATH(ttf, $TTF_LIB_DIR, GD_SHARED_LIBADD)
192	fi
193	if test -z "$TTF_INC_DIR"; then
194	TTF_INC_DIR=$TTF_DIR/include
195	fi
196	PHP_ADD_INCLUDE($TTF_INC_DIR)
197	else
198	AC_MSG_RESULT([no - FreeType 2.x is to be used instead])
199	fi
200	fi
201	])
202
203	AC_DEFUN([PHP_GD_FREETYPE2],[
204	if test "$PHP_FREETYPE_DIR" != "no"; then
205
206	for j in lib64 lib; do
207	for i in $PHP_FREETYPE_DIR /usr/local /usr; do
208	if test -f "$i/include/freetype2/freetype/freetype.h" && \
209	test -f "$i/$j/libfreetype.a" -o -f "$i/$j/libfreetype.$SHLIB_SUFFIX_NAME"; then
210	FREETYPE2_DIR=$i
211	FREETYPE2_LIB_DIR=$i/$j
212	FREETYPE2_INC_DIR=$i/include/freetype2
213	break
214	fi
215	done
216	test -n "$FREETYPE2_DIR" && break
217	done
218
219	if test -n "$FREETYPE2_DIR" ; then
220	PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_LIB_DIR, GD_SHARED_LIBADD)
221	PHP_ADD_INCLUDE($FREETYPE2_DIR/include)
222	PHP_ADD_INCLUDE($FREETYPE2_INC_DIR)
223	AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
224	AC_DEFINE(HAVE_LIBFREETYPE,1,[ ])
225	else
226	AC_MSG_ERROR([freetype2 not found!])
227	fi
228	else
229	AC_MSG_RESULT([If configure fails try --with-freetype-dir=<DIR>])
230	fi
231	])
232
233	AC_DEFUN([PHP_GD_T1LIB],[
234	if test "$PHP_T1LIB" != "no"; then
235
236	for j in lib64 lib; do
237	for i in $PHP_T1LIB /usr/local /usr; do
238	if test -f "$i/include/t1lib.h" && \
239	test -f "$i/$j/libt1.a" -o -f "$i/$j/libt1.$SHLIB_SUFFIX_NAME"; then
240	GD_T1_DIR=$i
241	GD_T1_LIB_DIR=$i/$j
242	break
243	done
244	test -n "$GD_T1_DIR" && break
245	done
246
247	if test -z "$GD_T1_DIR"; then
248	AC_MSG_ERROR([Your t1lib distribution is not installed correctly. Please reinstall it.])
249	fi
250
251	PHP_CHECK_LIBRARY(t1, T1_LoadFont,
252	[
253	AC_DEFINE(HAVE_LIBT1,1,[ ])
254	PHP_ADD_INCLUDE($GD_T1_DIR/include)
255	PHP_ADD_LIBRARY_WITH_PATH(t1, $GD_T1_LIB_DIR, GD_SHARED_LIBADD)
256	],[
257	AC_MSG_ERROR([Problem with libt1.(a\|so). Please check config.log for more information.])
258	],[
259	-L$GD_T1_DIR/lib
260	])
261	fi
262	])
263
264	AC_DEFUN([PHP_GD_TTSTR],[
265	if test "$PHP_GD_NATIVE_TTF" = "yes"; then
266	AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ])
267	fi
268	])
269
270	AC_DEFUN([PHP_GD_JISX0208],[
271	if test "$PHP_GD_JIS_CONV" = "yes"; then
272	USE_GD_JIS_CONV=1
273	fi
274	])
275
276	AC_DEFUN([PHP_GD_CHECK_VERSION],[
277	PHP_CHECK_LIBRARY(gd, gdImageString16, [AC_DEFINE(HAVE_LIBGD13, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
278	PHP_CHECK_LIBRARY(gd, gdImagePaletteCopy, [AC_DEFINE(HAVE_LIBGD15, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
279	PHP_CHECK_LIBRARY(gd, gdImageCreateFromPng, [AC_DEFINE(HAVE_GD_PNG, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
280	PHP_CHECK_LIBRARY(gd, gdImageCreateFromGif, [AC_DEFINE(HAVE_GD_GIF_READ, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
281	PHP_CHECK_LIBRARY(gd, gdImageGif, [AC_DEFINE(HAVE_GD_GIF_CREATE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
282	PHP_CHECK_LIBRARY(gd, gdImageWBMP, [AC_DEFINE(HAVE_GD_WBMP, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
283	PHP_CHECK_LIBRARY(gd, gdImageCreateFromJpeg, [AC_DEFINE(HAVE_GD_JPG, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
284	PHP_CHECK_LIBRARY(gd, gdImageCreateFromXpm, [AC_DEFINE(HAVE_GD_XPM, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
285	PHP_CHECK_LIBRARY(gd, gdImageCreateFromGd2, [AC_DEFINE(HAVE_GD_GD2, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
286	PHP_CHECK_LIBRARY(gd, gdImageCreateTrueColor, [AC_DEFINE(HAVE_LIBGD20, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
287	PHP_CHECK_LIBRARY(gd, gdImageSetTile, [AC_DEFINE(HAVE_GD_IMAGESETTILE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
288	PHP_CHECK_LIBRARY(gd, gdImageEllipse, [AC_DEFINE(HAVE_GD_IMAGEELLIPSE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
289	PHP_CHECK_LIBRARY(gd, gdImageSetBrush, [AC_DEFINE(HAVE_GD_IMAGESETBRUSH, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
290	PHP_CHECK_LIBRARY(gd, gdImageStringTTF, [AC_DEFINE(HAVE_GD_STRINGTTF, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
291	PHP_CHECK_LIBRARY(gd, gdImageStringFT, [AC_DEFINE(HAVE_GD_STRINGFT, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
292	PHP_CHECK_LIBRARY(gd, gdImageStringFTEx, [AC_DEFINE(HAVE_GD_STRINGFTEX, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
293	PHP_CHECK_LIBRARY(gd, gdImageColorClosestHWB, [AC_DEFINE(HAVE_COLORCLOSESTHWB, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
294	PHP_CHECK_LIBRARY(gd, gdImageColorResolve, [AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
295	PHP_CHECK_LIBRARY(gd, gdImageGifCtx, [AC_DEFINE(HAVE_GD_GIF_CTX, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
296	PHP_CHECK_LIBRARY(gd, gdCacheCreate, [AC_DEFINE(HAVE_GD_CACHE_CREATE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
297	PHP_CHECK_LIBRARY(gd, gdFontCacheShutdown, [AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
298	PHP_CHECK_LIBRARY(gd, gdFreeFontCache, [AC_DEFINE(HAVE_GD_FREEFONTCACHE, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
299	PHP_CHECK_LIBRARY(gd, gdNewDynamicCtxEx, [AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ])], [], [ -L$GD_LIB $GD_SHARED_LIBADD ])
300	])
301
302	dnl
303	dnl Main GD configure
304	dnl
305
306	if test "$PHP_GD" = "yes"; then
307	GD_MODULE_TYPE=builtin
308	extra_sources="libgd/gd.c libgd/gd_gd.c libgd/gd_gd2.c libgd/gd_io.c libgd/gd_io_dp.c \
309	libgd/gd_io_file.c libgd/gd_ss.c libgd/gd_io_ss.c libgd/gd_png.c libgd/gd_jpeg.c \
310	libgd/gdxpm.c libgd/gdfontt.c libgd/gdfonts.c libgd/gdfontmb.c libgd/gdfontl.c \
311	libgd/gdfontg.c libgd/gdtables.c libgd/gdft.c libgd/gdcache.c libgd/gdkanji.c \
312	libgd/wbmp.c libgd/gd_wbmp.c libgd/gdhelpers.c libgd/gd_topal.c libgd/gd_gif_in.c \
313	libgd/xbm.c libgd/gd_gif_out.c "
314
315	dnl check for fabsf and floorf which are available since C99
316	AC_CHECK_FUNCS(fabsf floorf)
317
318	dnl PNG is required by GD library
319	test "$PHP_PNG_DIR" = "no" && PHP_PNG_DIR=yes
320
321	dnl Various checks for GD features
322	PHP_GD_TTSTR
323	PHP_GD_JISX0208
324	PHP_GD_JPEG
325	PHP_GD_PNG
326	PHP_GD_XPM
327	PHP_GD_FREETYPE2
328	PHP_GD_FREETYPE1
329	PHP_GD_T1LIB
330
331	dnl These are always available with bundled library
332	AC_DEFINE(HAVE_LIBGD, 1, [ ])
333	AC_DEFINE(HAVE_LIBGD13, 1, [ ])
334	AC_DEFINE(HAVE_LIBGD15, 1, [ ])
335	AC_DEFINE(HAVE_LIBGD20, 1, [ ])
336	AC_DEFINE(HAVE_LIBGD204, 1, [ ])
337	AC_DEFINE(HAVE_GD_IMAGESETTILE, 1, [ ])
338	AC_DEFINE(HAVE_GD_IMAGESETBRUSH, 1, [ ])
339	AC_DEFINE(HAVE_GDIMAGECOLORRESOLVE, 1, [ ])
340	AC_DEFINE(HAVE_COLORCLOSESTHWB, 1, [ ])
341	AC_DEFINE(HAVE_GD_WBMP, 1, [ ])
342	AC_DEFINE(HAVE_GD_GD2, 1, [ ])
343	AC_DEFINE(HAVE_GD_PNG, 1, [ ])
344	AC_DEFINE(HAVE_GD_XBM, 1, [ ])
345	AC_DEFINE(HAVE_GD_BUNDLED, 1, [ ])
346	AC_DEFINE(HAVE_GD_GIF_READ, 1, [ ])
347	AC_DEFINE(HAVE_GD_GIF_CREATE, 1, [ ])
348	AC_DEFINE(HAVE_GD_IMAGEELLIPSE, 1, [ ])
349	AC_DEFINE(HAVE_GD_FONTCACHESHUTDOWN,1, [ ])
350	AC_DEFINE(HAVE_GD_DYNAMIC_CTX_EX, 1, [ ])
351	AC_DEFINE(HAVE_GD_GIF_CTX, 1, [ ])
352
353	dnl Make sure the libgd/ is first in the include path
354	GDLIB_CFLAGS="-DHAVE_LIBPNG"
355
356	dnl Depending which libraries were included to PHP configure,
357	dnl enable the support in bundled GD library
358
359	if test -n "$GD_JPEG_DIR"; then
360	AC_DEFINE(HAVE_GD_JPG, 1, [ ])
361	GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBJPEG"
362	fi
363
364	if test -n "$GD_XPM_DIR"; then
365	AC_DEFINE(HAVE_GD_XPM, 1, [ ])
366	GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_XPM"
367	fi
368
369	if test -n "$FREETYPE2_DIR"; then
370	AC_DEFINE(HAVE_GD_STRINGFT, 1, [ ])
371	AC_DEFINE(HAVE_GD_STRINGFTEX, 1, [ ])
372	GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBFREETYPE"
373	fi
374
375	if test -n "$TTF_DIR"; then
376	GDLIB_CFLAGS="$GDLIB_CFLAGS -DHAVE_LIBTTF"
377	fi
378
379	if test -n "$USE_GD_JIS_CONV"; then
380	AC_DEFINE(USE_GD_JISX0208, 1, [ ])
381	GDLIB_CFLAGS="$GDLIB_CFLAGS -DJISX0208"
382	fi
383
384	else
385
386	if test "$PHP_GD" != "no"; then
387	GD_MODULE_TYPE=external
388	extra_sources="gdcache.c"
389
390	dnl Various checks for GD features
391	PHP_GD_TTSTR
392	PHP_GD_JPEG
393	PHP_GD_PNG
394	PHP_GD_XPM
395	PHP_GD_FREETYPE2
396	PHP_GD_FREETYPE1
397	PHP_GD_T1LIB
398
399	dnl Header path
400	for i in include/gd1.3 include/gd include gd1.3 gd ""; do
401	test -f "$PHP_GD/$i/gd.h" && GD_INCLUDE="$PHP_GD/$i"
402	done
403
404	dnl Library path
405	for i in lib/gd1.3 lib/gd lib lib64 gd1.3 gd ""; do
406	test -f "$PHP_GD/$i/libgd.$SHLIB_SUFFIX_NAME" -o -f "$PHP_GD/$i/libgd.a" && GD_LIB="$PHP_GD/$i"
407	done
408
409	if test -n "$GD_INCLUDE" && test -n "$GD_LIB"; then
410	PHP_ADD_LIBRARY_WITH_PATH(gd, $GD_LIB, GD_SHARED_LIBADD)
411	AC_DEFINE(HAVE_LIBGD,1,[ ])
412	PHP_GD_CHECK_VERSION
413	elif test -z "$GD_INCLUDE"; then
414	AC_MSG_ERROR([Unable to find gd.h anywhere under $PHP_GD])
415	else
416	AC_MSG_ERROR([Unable to find libgd.(a\|so) anywhere under $PHP_GD])
417	fi
418
419	PHP_EXPAND_PATH($GD_INCLUDE, GD_INCLUDE)
420
421	dnl
422	dnl Check for gd 2.0.4 greater availability
423	dnl
424	old_CPPFLAGS=$CPPFLAGS
425	CPPFLAGS=-I$GD_INCLUDE
426	AC_TRY_COMPILE([
427	#include <gd.h>
428	#include <stdlib.h>
429	], [
430	gdIOCtx *ctx;
431	ctx = malloc(sizeof(gdIOCtx));
432	ctx->gd_free = 1;
433	], [
434	AC_DEFINE(HAVE_LIBGD204, 1, [ ])
435	])
436	CPPFLAGS=$old_CPPFLAGS
437
438	fi
439	fi
440
441	dnl
442	dnl Common for both builtin and external GD
443	dnl
444	if test "$PHP_GD" != "no"; then
445	PHP_NEW_EXTENSION(gd, gd.c gdttf.c $extra_sources, $ext_shared,, \\$(GDLIB_CFLAGS))
446
447	if test "$GD_MODULE_TYPE" = "builtin"; then
448	GDLIB_CFLAGS="-I$ext_srcdir/libgd $GDLIB_CFLAGS"
449	PHP_ADD_BUILD_DIR($ext_builddir/libgd)
450	else
451	GDLIB_CFLAGS="-I$GD_INCLUDE $GDLIB_CFLAGS"
452	PHP_ADD_INCLUDE($GD_INCLUDE)
453
454	PHP_CHECK_LIBRARY(gd, gdImageCreate, [], [
455	AC_MSG_ERROR([GD build test failed. Please check the config.log for details.])
456	], [ -L$GD_LIB $GD_SHARED_LIBADD ])
457	fi
458
459	PHP_SUBST(GDLIB_CFLAGS)
460	PHP_SUBST(GD_SHARED_LIBADD)
461	fi

Lines 47-65 Link Here

(-)php-4.4.0.orig/ext/odbc/config.m4 (-31 / +55 lines)
47	#	47	#
48	# Check for the library files, and setup the ODBC_LIBS path...	48	# Check for the library files, and setup the ODBC_LIBS path...
49	#	49	#
50	if test ! -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -a \	50	if test -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -a \
51	! -f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a; then	51	-f $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.a; then
52	#
53	# we have an error and should bail out, as we can't find the libs!
54	#
55	echo ""
56	echo "*********************************************************************"
57	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"
58	echo "* Please correct this by creating the following links and reconfiguring:"
59	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"
60	echo "* $1/${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so -> $1/lib${ac_solid_prefix}${ac_solid_os}${ac_solid_version}.so"
61	echo "*********************************************************************"
62	else
63	ODBC_LFLAGS=-L$1	52	ODBC_LFLAGS=-L$1
64	ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}	53	ODBC_LIBS=-l${ac_solid_prefix}${ac_solid_os}${ac_solid_version}
65	fi	54	fi
Lines 100-107 Link Here
100	withval=/usr/local	89	withval=/usr/local
101	fi	90	fi
102	if test "$withval" != "no"; then	91	if test "$withval" != "no"; then
		92	for i in lib64 lib; do
		93	ADABAS_LIBDIR=$withval/$i
		94	test -f "$ADABAS_LIBDIR/odbclib.a" && break
		95	done
103	PHP_ADD_INCLUDE($withval/incl)	96	PHP_ADD_INCLUDE($withval/incl)
104	PHP_ADD_LIBPATH($withval/lib)	97	PHP_ADD_LIBPATH($ADABAS_LIBDIR)
105	ODBC_OBJS="$withval/lib/odbclib.a"	98	ODBC_OBJS="$withval/lib/odbclib.a"
106	ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"	99	ODBC_LIB="$abs_builddir/ext/odbc/libodbc_adabas.a"
107	$srcdir/build/shtool mkdir -f -p ext/odbc	100	$srcdir/build/shtool mkdir -f -p ext/odbc
Lines 132-139 Link Here
132	withval=/usr/local	125	withval=/usr/local
133	fi	126	fi
134	if test "$withval" != "no"; then	127	if test "$withval" != "no"; then
		128	for i in lib64 lib; do
		129	SAPDB_LIBDIR=$withval/$i
		130	test -f "$SAPDB_LIBDIR/libsqlod.a" -o -f "$SAPDB_LIBDIR/libsqlod.$SHLIB_SUFFIX_NAME" && break
		131	done
135	PHP_ADD_INCLUDE($withval/incl)	132	PHP_ADD_INCLUDE($withval/incl)
136	PHP_ADD_LIBPATH($withval/lib)	133	PHP_ADD_LIBPATH($SAP_LIBDIR)
137	PHP_ADD_LIBRARY(sqlod)	134	PHP_ADD_LIBRARY(sqlod)
138	ODBC_TYPE=sapdb	135	ODBC_TYPE=sapdb
139	AC_DEFINE(HAVE_SAPDB,1,[ ])	136	AC_DEFINE(HAVE_SAPDB,1,[ ])
Lines 158-176 Link Here
158	withval=/usr/local/solid	155	withval=/usr/local/solid
159	fi	156	fi
160	if test "$withval" != "no"; then	157	if test "$withval" != "no"; then
161	ODBC_INCDIR=$withval/include	158	for i in lib64 lib; do
162	ODBC_LIBDIR=$withval/lib	159	SOLID_LIBDIR=$withval/$i
163	ODBC_INCLUDE=-I$ODBC_INCDIR	160	ODBC_INCDIR=$withval/include
164	ODBC_TYPE=solid	161	ODBC_LIBDIR=$withval/$j
165	if test -f $ODBC_LIBDIR/soc*35.a; then	162	ODBC_INCLUDE=-I$ODBC_INCDIR
166	AC_DEFINE(HAVE_SOLID_35,1,[ ])	163	ODBC_TYPE=solid
167	elif test -f $ODBC_LIBDIR/scl*30.a; then	164	if test -f $ODBC_LIBDIR/soc*35.a; then
168	AC_DEFINE(HAVE_SOLID_30,1,[ ])	165	AC_DEFINE(HAVE_SOLID_35,1,[ ])
169	elif test -f $ODBC_LIBDIR/scl*23.a; then	166	elif test -f $ODBC_LIBDIR/scl*30.a; then
170	AC_DEFINE(HAVE_SOLID,1,[ ])	167	AC_DEFINE(HAVE_SOLID_30,1,[ ])
		168	elif test -f $ODBC_LIBDIR/scl*23.a; then
		169	AC_DEFINE(HAVE_SOLID,1,[ ])
		170	fi
		171	AC_MSG_RESULT(yes)
		172	ODBC_LIBS=
		173	AC_FIND_SOLID_LIBS($ODBC_LIBDIR)
		174	test -n "$ODBC_LIBS" && break
		175	done
		176	if test -z "$ODBC_LIBS"; then
		177	#
		178	# we have an error and should bail out, as we can't find the libs!
		179	#
		180	echo ""
		181	echo "*********************************************************************"
		182	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"
		183	echo "* Please correct this by creating the following links and reconfiguring:"
		184	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"
		185	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"
		186	echo "*********************************************************************"
171	fi	187	fi
172	AC_MSG_RESULT(yes)
173	AC_FIND_SOLID_LIBS($ODBC_LIBDIR)
174	else	188	else
175	AC_MSG_RESULT(no)	189	AC_MSG_RESULT(no)
176	fi	190	fi
Lines 400-410 Link Here
400	withval=/usr/local	414	withval=/usr/local
401	fi	415	fi
402	if test "$withval" != "no"; then	416	if test "$withval" != "no"; then
403	PHP_ADD_LIBRARY_WITH_PATH(iodbc, $withval/lib)	417	for i in lib64 lib; do
		418	IODBC_LIBDIR=$withval/$i
		419	test -f "$IODBC_LIBDIR/libiodbc.a" -o -f "$IODBC_LIBDIR/libiodbc.$SHLIB_SUFFIX_NAME" && break
		420	done
		421	PHP_ADD_LIBRARY_WITH_PATH(iodbc, $IODBC_LIBDIR)
404	PHP_ADD_INCLUDE($withval/include, 1)	422	PHP_ADD_INCLUDE($withval/include, 1)
405	ODBC_TYPE=iodbc	423	ODBC_TYPE=iodbc
406	ODBC_INCLUDE=-I$withval/include	424	ODBC_INCLUDE=-I$withval/include
407	ODBC_LFLAGS=-L$withval/lib	425	ODBC_LFLAGS=-L$IODBC_LIBDIR
408	ODBC_LIBS=-liodbc	426	ODBC_LIBS=-liodbc
409	AC_DEFINE(HAVE_IODBC,1,[ ])	427	AC_DEFINE(HAVE_IODBC,1,[ ])
410	AC_DEFINE(HAVE_ODBC2,1,[ ])	428	AC_DEFINE(HAVE_ODBC2,1,[ ])
Lines 429-436 Link Here
429	withval=/usr/local/easysoft/oob/client	447	withval=/usr/local/easysoft/oob/client
430	fi	448	fi
431	if test "$withval" != "no"; then	449	if test "$withval" != "no"; then
		450	for i in lib64 lib; do
		451	ODBC_LIBDIR=$withval/$i
		452	test -f "$ODBC_LIBDIR/libesoobclient.a" -o -f "$ODBC_LIBDIR/libesoobclient.$SHLIB_SUFFIX_NAME" && break
		453	done
432	ODBC_INCDIR=$withval/include	454	ODBC_INCDIR=$withval/include
433	ODBC_LIBDIR=$withval/lib
434	ODBC_LFLAGS=-L$ODBC_LIBDIR	455	ODBC_LFLAGS=-L$ODBC_LIBDIR
435	ODBC_INCLUDE=-I$ODBC_INCDIR	456	ODBC_INCLUDE=-I$ODBC_INCDIR
436	ODBC_LIBS=-lesoobclient	457	ODBC_LIBS=-lesoobclient
Lines 456-463 Link Here
456	withval=/usr/local	477	withval=/usr/local
457	fi	478	fi
458	if test "$withval" != "no"; then	479	if test "$withval" != "no"; then
		480	for i in lib64 lib; do
		481	ODBC_LIBDIR=$withval/$i
		482	test -f "$ODBC_LIBDIR/libodbc.a" -o -f "$ODBC_LIBDIR/libodbc.$SHLIB_SUFFIX_NAME" && break
		483	done
459	ODBC_INCDIR=$withval/include	484	ODBC_INCDIR=$withval/include
460	ODBC_LIBDIR=$withval/lib
461	ODBC_LFLAGS=-L$ODBC_LIBDIR	485	ODBC_LFLAGS=-L$ODBC_LIBDIR
462	ODBC_INCLUDE=-I$ODBC_INCDIR	486	ODBC_INCLUDE=-I$ODBC_INCDIR
463	ODBC_LIBS=-lodbc	487	ODBC_LIBS=-lodbc