cvs: php4 /ext/fdf config.m4

sniper Sun Apr 29 03:14:19 2001 EDT Modified files: /php4/ext/fdf config.m4 Log: Fix bug #10545. Index: php4/ext/fdf/config.m4 diff -u php4/ext/fdf/config.m4:1.10 php4/ext/fdf/config.m4:1.11 --- php4/ext/fdf/config.m4:1.10 Tue Mar 27 12:34:25 2001 +++ php4/ext/fdf/config.m4 Sun Apr 29 03:14:18 2001 @@ -1,15 +1,15 @@ -dnl $Id: config.m4,v 1.10 2001/03/27 20:34:25 sniper Exp $ +dnl $Id: config.m4,v 1.11 2001/04/29 10:14:18 sniper Exp $ PHP_ARG_WITH(fdftk, for fdftk support, [ --with-fdftk[=DIR] Include fdftk support]) if test "$PHP_FDFTK" != "no"; then - if test -r $PHP_FDFTK/include/FdfTk.h; then + if test -r $PHP_FDFTK/include/FdfTk.h -o -r $PHP_FDFTK/fdftk.h; then FDFTK_DIR=$PHP_FDFTK else AC_MSG_CHECKING(for fdftk in default path) for i in /usr/local /usr; do - if test -r $i/include/FdfTk.h; then + if test -r $i/include/FdfTk.h -o -r $i/include/fdftk.h; then FDFTK_DIR=$i AC_MSG_RESULT(found in $i) fi @@ -25,13 +25,20 @@ old_LIBS=$LIBS LIBS="$LIBS -L$FDFTK_DIR/lib -lm" - AC_CHECK_LIB(FdfTk, FDFOpen, [AC_DEFINE(HAVE_FDFLIB,1,[ ])], - [AC_MSG_ERROR(fdftk module requires fdftk 2.0)]) + FDFLIBRARY="" + for i in fdftk FdfTk; do + AC_CHECK_LIB($i, FDFOpen, [FDFLIBRARY=$i]) + done LIBS=$old_LIBS + + if test $FDFLIBRARY = ""; then + AC_MSG_ERROR(fdftk module requires fdftk 2.0) + fi + + AC_DEFINE(HAVE_FDFLIB,1,[ ]) + PHP_ADD_LIBRARY_WITH_PATH($FDFLIBRARY, $FDFTK_DIR/lib, FDFTK_SHARED_LIBADD) PHP_SUBST(FDFTK_SHARED_LIBADD) - PHP_ADD_LIBRARY_WITH_PATH(FdfTk, $FDFTK_DIR/lib, FDFTK_SHARED_LIBADD) - PHP_EXTENSION(fdf, $ext_shared) fi