- Enable bundled library

diff --git a/ext/fileinfo/config.m4 b/ext/fileinfo/config.m4
index 75aff6724e7beabd70a53fd4c204ad762fe4643c..ce876d4586e9cb980fe1141fcbb4cdb708916edb 100644 (file)
--- a/ext/fileinfo/config.m4
+++ b/ext/fileinfo/config.m4
@@ -17,18 +17,17 @@ if test "$PHP_FILEINFO" != "no"; then
     done
   done
 
-  AC_CHECK_FUNCS([utimes])
-  
   AC_DEFINE_UNQUOTED(PHP_DEFAULT_MAGIC_FILE,"$PHP_DEFAULT_MAGIC_FILE",[magic file path])
 
-  PHP_SUBST(FILEINFO_SHARED_LIBADD)
-
-  PHP_NEW_EXTENSION(fileinfo, fileinfo.c lib/apprentice.c lib/apptype.c lib/ascmagic.c lib/compress.c lib/file.c lib/fsmagic.c lib/funcs.c lib/getopt_long.c lib/is_tar.c lib/magic.c lib/print.c lib/readelf.c lib/softmagic.c, $ext_shared)
+  libmagic_sources=" \
+    libmagic/apprentice.c libmagic/apptype.c libmagic/ascmagic.c \
+    libmagic/compress.c libmagic/file.c libmagic/fsmagic.c libmagic/funcs.c \
+    libmagic/getopt_long.c libmagic/is_tar.c libmagic/magic.c libmagic/print.c \
+    libmagic/readelf.c libmagic/softmagic.c"
 
-if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then
-  echo '#include <php_config.h>' > $ext_builddir/libsqlite/src/config.h
-else
-  echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h
-fi
+  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])
 fi

diff --git a/ext/fileinfo/libmagic/config.h b/ext/fileinfo/libmagic/config.h
index d68561188ae0ec4bba9b09fb0805919fca78821f..bce21a573f84a8e5fbbc21cdfc9823ee3249ab58 100644 (file)
--- a/ext/fileinfo/libmagic/config.h
+++ b/ext/fileinfo/libmagic/config.h
@@ -1 +1,4 @@
 #include <php_config.h>
+#ifdef HAVE_CONFIG_H
+#include "../config.h"
+#endif