diff options
Diffstat (limited to 'ext/gd/config.m4')
| -rw-r--r-- | ext/gd/config.m4 | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 index fba27659a9..f5d3c95275 100644 --- a/ext/gd/config.m4 +++ b/ext/gd/config.m4 @@ -51,7 +51,7 @@ 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 + test -f $i/$PHP_LIBDIR/libjpeg.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libjpeg.a && GD_JPEG_DIR=$i && break done if test -z "$GD_JPEG_DIR"; then @@ -61,11 +61,11 @@ AC_DEFUN(PHP_GD_JPEG,[ 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_DIR/$PHP_LIBDIR, 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_DIR/$PHP_LIBDIR ]) else AC_MSG_RESULT([If configure fails try --with-jpeg-dir=<DIR>]) @@ -76,7 +76,7 @@ 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 + test -f $i/$PHP_LIBDIR/libpng.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libpng.a && GD_PNG_DIR=$i && break done if test -z "$GD_PNG_DIR"; then @@ -94,12 +94,12 @@ AC_DEFUN(PHP_GD_PNG,[ 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_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(png, $GD_PNG_DIR/$PHP_LIBDIR, 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_DIR/$PHP_LIBDIR -lz -L$GD_PNG_DIR/$PHP_LIBDIR ]) else @@ -111,7 +111,7 @@ 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 + test -f $i/$PHP_LIBDIR/libXpm.$SHLIB_SUFFIX_NAME -o -f $i/$PHP_LIBDIR/libXpm.a && GD_XPM_DIR=$i && break done if test -z "$GD_XPM_DIR"; then @@ -129,12 +129,12 @@ AC_DEFUN(PHP_GD_XPM,[ 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_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) + PHP_ADD_LIBRARY_WITH_PATH(X11, $GD_XPM_DIR/$PHP_LIBDIR, 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_DIR/$PHP_LIBDIR -lX11 ]) else AC_MSG_RESULT(If configure fails try --with-xpm-dir=<DIR>) @@ -163,7 +163,7 @@ AC_DEFUN(PHP_GD_FREETYPE1,[ 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_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) fi if test -z "$TTF_INC_DIR"; then TTF_INC_DIR=$TTF_DIR/include @@ -188,7 +188,7 @@ AC_DEFUN(PHP_GD_FREETYPE2,[ 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_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) PHP_ADD_INCLUDE($FREETYPE2_DIR/include) PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) @@ -216,7 +216,7 @@ AC_DEFUN(PHP_GD_T1LIB,[ [ 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_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) ],[ AC_MSG_ERROR([Problem with libt1.(a|so). Please check config.log for more information.]) ],[ |