From: Ilia Alshanetsky Date: Thu, 17 Feb 2005 22:56:47 +0000 (+0000) Subject: Improved search paths. X-Git-Tag: RELEASE_0_2_4~9 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6af3197b90cb05b8c1bfb62040e597517d6430cc;p=php Improved search paths. --- diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4 index 06f758f3e6..c9ad617163 100644 --- a/ext/fileinfo/config.m4 +++ b/ext/fileinfo/config.m4 @@ -5,8 +5,8 @@ PHP_ARG_WITH(fileinfo, for fileinfo support, [ --with-fileinfo=DIR Include fileinfo support]) if test "$PHP_FILEINFO" != "no"; then - SEARCH_PATH="/usr/local /usr" - SEARCH_FOR="/include/magic.h" + SEARCH_PATH="/usr/local/include /usr/include /usr/share/file" + SEARCH_FOR="/magic.h" if test -r $PHP_FILEINFO/$SEARCH_FOR; then FILEINFO_DIR=$PHP_FILEINFO else @@ -36,7 +36,7 @@ if test "$PHP_FILEINFO" != "no"; then ],[ AC_MSG_ERROR([wrong magic lib version or lib not found]) ],[ - -L$FILEINFO_DIR/lib -lm -ldl + -L$FILEINFO_DIR/lib -lm -lz -ldl ]) MAGIC_MIME_LOCATIONS="/usr/local/share/file/magic /usr/share/file/magic /usr/share/misc/file/magic /etc/magic"