MFH: enable fileinfo by default

diff --git a/ext/fileinfo/Makefile.frag b/ext/fileinfo/Makefile.frag
new file mode 100644 (file)
index 0000000..5af690a
--- /dev/null
+++ b/ext/fileinfo/Makefile.frag
@@ -0,0 +1,2 @@
+
+$(builddir)/libmagic/apprentice.lo: $(srcdir)/data_file.c

diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
index 7a5a170caade7513eb7031995cdf27f2fcb4d63e..0229bbebfcb6767f624f8510a9733be3d20f07fc 100644 (file)
--- a/ext/fileinfo/config.m4
+++ b/ext/fileinfo/config.m4
@@ -1,23 +1,10 @@
 dnl $Id$
 dnl config.m4 for extension fileinfo
 
-PHP_ARG_WITH(fileinfo, for fileinfo support,
-[  --with-fileinfo=DIR   Include fileinfo support])
+PHP_ARG_ENABLE(fileinfo, for fileinfo support,
+[  --disable-fileinfo      Disable fileinfo support], yes)
 
 if test "$PHP_FILEINFO" != "no"; then
-  MAGIC_MIME_DIRS="/usr/local/share/file /usr/share/file /usr/share/misc/file /etc /usr/share/misc"
-  MAGIC_MIME_FILENAMES="magic magic.mime"
-  
-  for i in $MAGIC_MIME_DIRS; do
-    for j in $MAGIC_MIME_FILENAMES; do
-      if test -f "$i/$j"; then
-        PHP_DEFAULT_MAGIC_FILE="$i/$j"
-        break
-      fi
-    done
-  done
-
-  AC_DEFINE_UNQUOTED(PHP_DEFAULT_MAGIC_FILE,"$PHP_DEFAULT_MAGIC_FILE",[magic file path])
 
   libmagic_sources=" \
     libmagic/apprentice.c libmagic/apptype.c libmagic/ascmagic.c \
@@ -26,8 +13,9 @@ if test "$PHP_FILEINFO" != "no"; then
     libmagic/readelf.c libmagic/softmagic.c"
 
   PHP_NEW_EXTENSION(fileinfo, fileinfo.c $libmagic_sources, $ext_shared,,-I@ext_srcdir@/libmagic)
-  PHP_SUBST(FILEINFO_SHARED_LIBADD)
   PHP_ADD_BUILD_DIR($ext_builddir/libmagic)
 
   AC_CHECK_FUNCS([utimes])
+
+  PHP_ADD_MAKEFILE_FRAGMENT
 fi

diff --git a/ext/fileinfo/fileinfo.c b/ext/fileinfo/fileinfo.c
index 1f25ef3097792cc09df989f4e6656db25cf33337..4ae4c713b92b4b709c40fb1729a963001a5e389a 100644 (file)
--- a/ext/fileinfo/fileinfo.c
+++ b/ext/fileinfo/fileinfo.c
@@ -44,10 +44,6 @@ struct php_fileinfo {
        struct magic_set *magic;
 };
 
-#ifndef PHP_DEFAULT_MAGIC_FILE
-#define PHP_DEFAULT_MAGIC_FILE NULL
-#endif
-
 #ifdef ZEND_ENGINE_2
 /* {{{ */
 static zend_object_handlers finfo_object_handlers;