From 21e17d7ec083c6344d0dc1f72ee141b3c5f31a88 Mon Sep 17 00:00:00 2001
From: Ilia Alshanetsky <iliaa@php.net>
Date: Wed, 29 Jun 2005 15:57:16 +0000
Subject: [PATCH] Final (i hope) set of magic.h detection fixes.
---
ext/fileinfo/config.m4 | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
index cd4705e900..f1c15c006b 100644
--- a/ext/fileinfo/config.m4
+++ b/ext/fileinfo/config.m4
@@ -5,16 +5,16 @@ PHP_ARG_WITH(fileinfo, for fileinfo support,
[ --with-fileinfo=DIR Include fileinfo support])
if test "$PHP_FILEINFO" != "no"; then
- SEARCH_PATH="/usr/local/include /usr/include /usr/share/file"
- SEARCH_FOR="/magic.h"
- if test -r $PHP_FILEINFO/$SEARCH_FOR; then
+ SEARCH_PATH="/usr/local /usr /usr/share/file"
+ if test -r $PHP_FILEINFO/include/magic.h || test -r $PHP_FILEINFO/magic.h; then
FILEINFO_DIR=$PHP_FILEINFO
else
AC_MSG_CHECKING([for magic files in default path])
for i in $SEARCH_PATH ; do
- if test -r $i/$SEARCH_FOR; then
+ if test -r $i/include/magic.h || test -r $i/magic.h; then
FILEINFO_DIR=$i
AC_MSG_RESULT(found in $i)
+ break
fi
done
fi
@@ -24,7 +24,11 @@ if test "$PHP_FILEINFO" != "no"; then
AC_MSG_ERROR([Please reinstall the libmagic distribution])
fi
- PHP_ADD_INCLUDE($FILEINFO_DIR/include)
+ if test -r "$FILEINFO_DIR/include/magic.h"; then
+ PHP_ADD_INCLUDE($FILEINFO_DIR/include)
+ else
+ PHP_ADD_INCLUDE($FILEINFO_DIR)
+ fi
LIBNAME=magic
LIBSYMBOL=magic_open
--
2.40.0