cvs: php4 /ext/fdf config.m4 php_fdf.h

sniper Tue Mar 19 19:39:28 2002 EDT Modified files: /php4/ext/fdf config.m4 php_fdf.h Log: - Fix this without breaking BC Index: php4/ext/fdf/config.m4 diff -u php4/ext/fdf/config.m4:1.17 php4/ext/fdf/config.m4:1.18 --- php4/ext/fdf/config.m4:1.17 Tue Mar 12 11:17:02 2002 +++ php4/ext/fdf/config.m4 Tue Mar 19 19:39:28 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.17 2002/03/12 16:17:02 sas Exp $ +dnl $Id: config.m4,v 1.18 2002/03/20 00:39:28 sniper Exp $ dnl PHP_ARG_WITH(fdftk, for FDF support, @@ -8,7 +8,10 @@ if test "$PHP_FDFTK" != "no"; then for i in /usr /usr/local $PHP_FDFTK; do - if test -r $i/include/FdfTk.h -o -r $i/include/fdftk.h; then + if test -r $i/include/FdfTk.h; then + FDFTK_DIR=$i + elif test -r $i/include/fdftk.h; then + AC_DEFINE(HAVE_FDFTK_H_LOWER,1,[ ]) FDFTK_DIR=$i fi done Index: php4/ext/fdf/php_fdf.h diff -u php4/ext/fdf/php_fdf.h:1.16 php4/ext/fdf/php_fdf.h:1.17 --- php4/ext/fdf/php_fdf.h:1.16 Tue Mar 19 09:03:30 2002 +++ php4/ext/fdf/php_fdf.h Tue Mar 19 19:39:28 2002 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fdf.h,v 1.16 2002/03/19 14:03:30 steinm Exp $ */ +/* $Id: php_fdf.h,v 1.17 2002/03/20 00:39:28 sniper Exp $ */ #ifndef PHP_FDF_H #define PHP_FDF_H @@ -27,7 +27,11 @@ #define UNIX_DEV #endif -#include <fdftk.h> +#if HAVE_FDFTK_H_LOWER +# include <fdftk.h> +#else +# include <FdfTk.h> +#endif extern zend_module_entry fdf_module_entry; #define fdf_module_ptr &fdf_module_entry