cvs: /php4/ext/gd config.m4

sas Thu Mar 30 06:59:53 2000 EDT Modified files: /php4/ext/gd config.m4 Log: Fix libpng and libz order and stuff the libjpeg into its own macro. Index: php4/ext/gd/config.m4 diff -u php4/ext/gd/config.m4:1.27 php4/ext/gd/config.m4:1.28 --- php4/ext/gd/config.m4:1.27 Sat Mar 18 15:23:39 2000 +++ php4/ext/gd/config.m4 Thu Mar 30 06:59:23 2000 @@ -1,3 +1,25 @@ +AC_DEFUN(PHP_GD_JPEG,[ + AC_MSG_CHECKING([for libjpeg (needed by gd-1.8+)]) + AC_ARG_WITH(jpeg-dir, + [ --with-jpeg-dir[=DIR] jpeg dir for gd-1.8+],[ + AC_MSG_RESULT(yes) + if test -z $withval; then + withval="/usr/local" + fi + old_LIBS=$LIBS + LIBS="$LIBS -L$withval/lib" + AC_CHECK_LIB(jpeg,jpeg_read_header, [LIBS="$LIBS -L$withval/lib -ljpeg"],[AC_MSG_RESULT(no)],) + LIBS=$old_LIBS + AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) + LIBS="$LIBS -L$withval/lib -ljpeg" + ],[ + AC_MSG_RESULT(no) + AC_MSG_WARN(If configure fails try --with-jpeg-dir=<DIR>) + ]) + AC_CHECK_LIB(gd, gdImageCreateFromJpeg, [AC_DEFINE(HAVE_GD_JPG, 1, [ ])]) +]) + + shared=no AC_MSG_CHECKING(whether to include GD support) AC_ARG_WITH(gd, @@ -36,26 +58,8 @@ AC_ADD_LIBRARY(png) AC_ADD_LIBRARY(z) fi - - AC_MSG_CHECKING([for libjpeg (needed by gd-1.8+)]) - AC_ARG_WITH(jpeg-dir, - [ --with-jpeg-dir[=DIR] jpeg dir for gd-1.8+],[ - AC_MSG_RESULT(yes) - if test -z $withval; then - withval="/usr/local" - fi - old_LIBS=$LIBS - LIBS="$LIBS -L$withval/lib" - AC_CHECK_LIB(jpeg,jpeg_read_header, [LIBS="$LIBS -L$withval/lib -ljpeg"],[AC_MSG_RESULT(no)],) - LIBS=$old_LIBS - AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) - LIBS="$LIBS -L$withval/lib -ljpeg" - ],[ - AC_MSG_RESULT(no) - AC_MSG_WARN(If configure fails try --with-jpeg-dir=<DIR>) - ]) - AC_CHECK_LIB(gd, gdImageCreateFromJpeg, [AC_DEFINE(HAVE_GD_JPG, 1, [ ])]) + PHP_GD_JPEG ac_cv_lib_gd_gdImageLine=yes ;; *) @@ -103,29 +107,11 @@ LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then - AC_ADD_LIBRARY(png) AC_ADD_LIBRARY(z) + AC_ADD_LIBRARY(png) fi + PHP_GD_JPEG - AC_MSG_CHECKING([for libjpeg (needed by gd-1.8+)]) - AC_ARG_WITH(jpeg-dir, - [ --with-jpeg-dir[=DIR] jpeg dir for gd-1.8+],[ - AC_MSG_RESULT(yes) - if test -z $withval; then - withval="/usr/local" - fi - old_LIBS=$LIBS - LIBS="$LIBS -L$withval/lib" - AC_CHECK_LIB(jpeg,jpeg_read_header, [LIBS="$LIBS -L$withval/lib -ljpeg"],[AC_MSG_RESULT(no)],) - LIBS=$old_LIBS - AC_ADD_LIBRARY_WITH_PATH(jpeg, $withval/lib) - LIBS="$LIBS -L$withval/lib -ljpeg" - ],[ - AC_MSG_RESULT(no) - AC_MSG_WARN(If configure fails try --with-jpeg-dir=<DIR>) - ]) - AC_CHECK_LIB(gd, gdImageCreateFromJpeg, [AC_DEFINE(HAVE_GD_JPG, 1, [ ])]) - ac_cv_lib_gd_gdImageLine=yes else AC_MSG_ERROR([Unable to find libgd.(a|so) anywhere under $withval]) @@ -146,8 +132,8 @@ LIBS=$old_LIBS LDFLAGS=$old_LDFLAGS if test "$ac_cv_lib_gd_gdImageCreateFromPng" = "yes"; then - AC_ADD_LIBRARY(png) AC_ADD_LIBRARY(z) + AC_ADD_LIBRARY(png) fi ac_cv_lib_gd_gdImageLine=yes fi