diff options
| author | foobar <sniper@php.net> | 2002-10-21 22:58:52 +0000 |
|---|---|---|
| committer | foobar <sniper@php.net> | 2002-10-21 22:58:52 +0000 |
| commit | 0abca4f60aea1005477aea08883789e312f490cd (patch) | |
| tree | 7055ba88802fb1ccf3a30596152285347d40e4fe | |
| parent | dabf1053cdbd1bf8cd9020d16b41eb6b7ca2013f (diff) | |
| download | php-git-0abca4f60aea1005477aea08883789e312f490cd.tar.gz | |
Cleanup. (no tabs here!)
| -rw-r--r-- | ext/fdf/config.m4 | 79 |
1 files changed, 38 insertions, 41 deletions
diff --git a/ext/fdf/config.m4 b/ext/fdf/config.m4 index 6549b22dc1..3d4587db91 100644 --- a/ext/fdf/config.m4 +++ b/ext/fdf/config.m4 @@ -7,65 +7,62 @@ PHP_ARG_WITH(fdftk, for FDF support, 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) |