cvs: php4 /ext/fdf config.m4

sniper Mon Oct 21 18:58:52 2002 EDT Modified files: /php4/ext/fdf config.m4 Log: Cleanup. (no tabs here!) Index: php4/ext/fdf/config.m4 diff -u php4/ext/fdf/config.m4:1.19 php4/ext/fdf/config.m4:1.20 --- php4/ext/fdf/config.m4:1.19 Mon Oct 21 15:55:28 2002 +++ php4/ext/fdf/config.m4 Mon Oct 21 18:58:52 2002 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.19 2002/10/21 19:55:28 hholzgra Exp $ +dnl $Id: config.m4,v 1.20 2002/10/21 22:58:52 sniper Exp $ dnl PHP_ARG_WITH(fdftk, for FDF support, @@ -7,65 +7,62 @@ if test "$PHP_FDFTK" != "no"; then - case $host_os in - aix*) - libtype=aix - ;; - solaris* ) - libtype=solaris - ;; - linux*) - libtype=linux - ;; - *) - AC_MSG_ERROR(sorry but the fdf tookkit is available for aix, solaris and linux only ... $host_os ... blame adboe) - ;; + case $host_os in + aix*) + libtype=aix + ;; + solaris* ) + libtype=solaris + ;; + linux*) + libtype=linux + ;; + *) + AC_MSG_ERROR([The fdf toolkit is not available for $host_os.]) + ;; esac - if test "$PHP_FDFTK" = "yes"; then - PHP_FDFTK="/usr /usr/local ../FDFToolkitForUNIX ext/fdf/FDFToolkitForUNIX" - fi + if test "$PHP_FDFTK" = "yes"; then + PHP_FDFTK="/usr /usr/local ../FDFToolkitForUNIX ext/fdf/FDFToolkitForUNIX" + fi for dir in $PHP_FDFTK; do - for subdir in include HeadersAndLibraries/headers; do - if test -r $dir/$subdir/FdfTk.h; then - FDFTK_DIR=$dir - FDFTK_H_DIR=$dir/$subdir - elif test -r $dir/$subdir/fdftk.h; then - AC_DEFINE(HAVE_FDFTK_H_LOWER,1,[ ]) - FDFTK_DIR=$dir - FDFTK_H_DIR=$dir/$subdir - fi - done + for subdir in include HeadersAndLibraries/headers; do + if test -r $dir/$subdir/FdfTk.h; then + FDFTK_DIR=$dir + FDFTK_H_DIR=$dir/$subdir + break 2 + elif test -r $dir/$subdir/fdftk.h; then + AC_DEFINE(HAVE_FDFTK_H_LOWER,1,[ ]) + FDFTK_DIR=$dir + FDFTK_H_DIR=$dir/$subdir + break 2 + fi + done done if test -z "$FDFTK_DIR"; then - AC_MSG_ERROR(FdfTk.h or fdftk.h not found. Please reinstall the fdftk distribution.) + AC_MSG_ERROR([FdfTk.h or fdftk.h not found. Please reinstall the fdf toolkit.]) fi PHP_ADD_INCLUDE($FDFTK_H_DIR) FDFLIBRARY="" for file in fdftk FdfTk; do - for dir in $FDFTK_DIR/lib $FDFTK_DIR/HeadersAndLibraries/$libtype/C; do - echo testing $dir/lib$file.so + for dir in $FDFTK_DIR/lib $FDFTK_DIR/HeadersAndLibraries/$libtype/C; do if test -r $dir/lib$file.so; then - if test -z "$FDFLIBRARY"; then - PHP_CHECK_LIBRARY($file, FDFOpen, [FDFLIBRARY=$file], [], [-L$dir -lm]) - if test "$FDFLIBRARY"; then - echo ok - FDFTK_LIB_DIR=$dir - fi - fi - fi - done - done + PHP_CHECK_LIBRARY($file, FDFOpen, [FDFLIBRARY=$file], [], [-L$dir -lm]) + if test "$FDFLIBRARY"; then + FDFTK_LIB_DIR=$dir + break 2 + fi + fi + done + done if test -z "$FDFLIBRARY"; then AC_MSG_ERROR(no usable fdf library found) fi - - AC_DEFINE(HAVE_FDFLIB,1,[ ]) PHP_ADD_LIBRARY_WITH_PATH($FDFLIBRARY, $FDFTK_LIB_DIR, FDFTK_SHARED_LIBADD)