cvs: php4 /ext/fdf Makefile.in config.m4
| From: | Rui Hirokawa | Date: | Sun, 12 Nov 2000 05:59:35 +0000 |
| Subject: | cvs: php4 /ext/fdf Makefile.in config.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2562@lists.php.net to get a copy of this message | ||
hirokawa Sat Nov 11 21:59:35 2000 EDT
Modified files:
/php4/ext/fdf Makefile.in config.m4
Log:
enabled shared module.
Index: php4/ext/fdf/Makefile.in
diff -u php4/ext/fdf/Makefile.in:1.7 php4/ext/fdf/Makefile.in:1.8
--- php4/ext/fdf/Makefile.in:1.7 Mon May 1 15:38:27 2000
+++ php4/ext/fdf/Makefile.in Sat Nov 11 21:59:34 2000
@@ -1,5 +1,6 @@
LTLIBRARY_NAME = libfdf.la
LTLIBRARY_SOURCES = fdf.c
+LTLIBRARY_SHARED_NAME = fdf.la
include $(top_srcdir)/build/dynlib.mk
Index: php4/ext/fdf/config.m4
diff -u php4/ext/fdf/config.m4:1.6 php4/ext/fdf/config.m4:1.7
--- php4/ext/fdf/config.m4:1.6 Wed Dec 29 20:52:00 1999
+++ php4/ext/fdf/config.m4 Sat Nov 11 21:59:34 2000
@@ -1,39 +1,37 @@
-dnl $Id: config.m4,v 1.6 1999/12/30 04:52:00 sas Exp $
+dnl $Id: config.m4,v 1.7 2000/11/12 05:59:34 hirokawa Exp $
-AC_MSG_CHECKING(whether to include fdftk support)
-AC_ARG_WITH(fdftk,
-[ --with-fdftk[=DIR] Include fdftk support.
- DIR is the fdftk install directory,
- defaults to /usr/local.],
-[
- case "$withval" in
- no)
- AC_MSG_RESULT(no) ;;
- yes)
- AC_MSG_RESULT(yes)
- PHP_EXTENSION(fdf)
- AC_CHECK_LIB(FdfTk, FDFOpen, [
- AC_DEFINE(HAVE_FDFLIB,1,[ ])
- EXTRA_LIBS="$EXTRA_LIBS -lFdfTk"
- ],[AC_MSG_ERROR(fdftk module requires fdftk 2.0)])
- ;;
- *)
- test -f $withval/include/FdfTk.h && FDFLIB_INCLUDE="-I$withval/include"
- if test -n "$FDFLIB_INCLUDE" ; then
- AC_MSG_RESULT(yes)
- PHP_EXTENSION(fdf)
- old_LIBS=$LIBS
- LIBS="$LIBS -L$withval/lib"
- AC_CHECK_LIB(FdfTk, FDFOpen, [
- AC_DEFINE(HAVE_FDFLIB,1,[ ])
- EXTRA_LIBS="$EXTRA_LIBS -L$withval/lib -lFdfTk"
- ],[AC_MSG_ERROR(fdftk module requires fdftk lib 2.0.)])
- LIBS=$old_LIBS
- INCLUDES="$INCLUDES $FDFLIB_INCLUDE"
- else
- AC_MSG_RESULT(no)
- fi ;;
- esac
-],[
- AC_MSG_RESULT(no)
-])
+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
+ 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
+ FDFTK_DIR=$i
+ AC_MSG_RESULT(found in $i)
+ fi
+ done
+ fi
+
+ if test -z "$FDFTK_DIR"; then
+ AC_MSG_RESULT(not found)
+ AC_MSG_ERROR(Please reinstall the fdftk distribution)
+ fi
+
+ AC_ADD_INCLUDE($FDFTK_DIR/include)
+
+ old_LIBS=$LIBS
+ LIBS="$LIBS -lm"
+ AC_CHECK_LIB(FdfTk, FDFOpen, [AC_DEFINE(HAVE_FDFLIB,1,[ ])],
+ [AC_MSG_ERROR(fdftk module requires fdftk 2.0)])
+ LIBS=$old_LIBS
+
+ PHP_SUBST(FDFTK_SHARED_LIBADD)
+ AC_ADD_LIBRARY_WITH_PATH(FdfTk, $FDFTK_DIR/lib, FDFTK_SHARED_LIBADD)
+
+ PHP_EXTENSION(fdftk, $ext_shared)
+fi
+