Added configure options to disable the building of bundled libmagic/libfuzzy libraries.

Makefile.in

@@ -7,6 +7,8 @@ export exec_prefix=@exec_prefix@
 export LIBDIR=@libdir@
 export INSTALL_OPTIONS=@INSTALL_OPTIONS@
 export PLATFORM=@PLATFORM@
+export BUILD_MAGIC=@BUILD_MAGIC@
+export BUILD_FUZZY=@BUILD_FUZZY@
 
 BUILD_C_LIBS=@BUILD_C_LIBS@
 PYTHON=@PYTHON@

configure

@@ -604,6 +604,8 @@ PLATFORM
 SOEXT
 SONAME
 PYTHON
+BUILD_FUZZY
+BUILD_MAGIC
 BUILD_C_LIBS
 LIBOBJS
 EGREP
@@ -659,6 +661,8 @@ ac_user_opts='
 enable_option_checking
 with_python
 enable_clibs
+enable_libmagic
+enable_libfuzzy
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1279,6 +1283,8 @@ Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-clibs         do not build/install dependent c libraries
+  --disable-libmagic      do not build/install the bundled libmagic library
+  --disable-libfuzzy      do not build/install the bundled libfuzzy library
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -3308,34 +3314,60 @@ else
 fi
 
 
+# Check whether --enable-libmagic was given.
+if test "${enable_libmagic+set}" = set; then :
+  enableval=$enable_libmagic; BUILD_MAGIC=0
+else
+  BUILD_MAGIC=1
+fi
+
+
+# Check whether --enable-libfuzzy was given.
+if test "${enable_libfuzzy+set}" = set; then :
+  enableval=$enable_libfuzzy; BUILD_FUZZY=0
+else
+  BUILD_FUZZY=1
+fi
+
+
 CFLAGS="-Wall -fPIC $CFLAGS"
+INSTALL_OPTIONS="-m644"
 
 if test "$(uname)" == "Darwin"
 then
 	SONAME="-install_name"
 	SOEXT="dylib"
-	INSTALL_OPTIONS="-m644"
 else
 	SONAME="-soname"
 	SOEXT="so"
-	INSTALL_OPTIONS="-D -m644"
 fi
 
 if test "$BUILD_C_LIBS" != "0"
 then
+    if test "$BUILD_MAGIC" != "0"
+    then
         (cd ./src/C/file-*/ && autoreconf -v && ./configure) || exit 1
+    fi
+
+    if test "$BUILD_FUZZY" != "0"
+    then
         (cd ./src/C/ssdeep-*/ && autoreconf -v && ./configure) || exit 1
+    fi
 fi
 
 BUILD_C_LIBS=$BUILD_C_LIBS
 
+BUILD_MAGIC=$BUILD_MAGIC
+
+BUILD_FUZZY=$BUILD_FUZZY
+
 PYTHON=$PYTHON
 
 SONAME=$SONAME
 
 SOEXT=$SOEXT
 
-PLATFORM=$(uname -o)
+PLATFORM=$(uname -s)
 
 INSTALL_OPTIONS=$INSTALL_OPTIONS
 

configure.ac

@@ -17,6 +17,16 @@ AC_ARG_ENABLE([clibs],
               [BUILD_C_LIBS=0],
               [BUILD_C_LIBS=1])
 
+AC_ARG_ENABLE([libmagic],
+              [AS_HELP_STRING([--disable-libmagic], [do not build/install the bundled libmagic library])],
+              [BUILD_MAGIC=0],
+              [BUILD_MAGIC=1])
+
+AC_ARG_ENABLE([libfuzzy],
+              [AS_HELP_STRING([--disable-libfuzzy], [do not build/install the bundled libfuzzy library])],
+              [BUILD_FUZZY=0],
+              [BUILD_FUZZY=1])
+
 CFLAGS="-Wall -fPIC $CFLAGS"
 INSTALL_OPTIONS="-m644"
 
@@ -28,15 +38,23 @@ else
 	SONAME="-soname"
 	SOEXT="so"
 fi
-dnl AS_IF([test "x$enable_foo" != "xno"], [
 
 if test "$BUILD_C_LIBS" != "0"
 then
+    if test "$BUILD_MAGIC" != "0"
+    then
         (cd ./src/C/file-*/ && autoreconf -v && ./configure) || exit 1
+    fi
+
+    if test "$BUILD_FUZZY" != "0"
+    then
         (cd ./src/C/ssdeep-*/ && autoreconf -v && ./configure) || exit 1
+    fi
 fi
 
 AC_SUBST(BUILD_C_LIBS, $BUILD_C_LIBS)
+AC_SUBST(BUILD_MAGIC, $BUILD_MAGIC)
+AC_SUBST(BUILD_FUZZY, $BUILD_FUZZY)
 AC_SUBST(PYTHON, $PYTHON)
 AC_SUBST(SONAME, $SONAME)
 AC_SUBST(SOEXT, $SOEXT)

src/C/Makefile

@@ -6,39 +6,39 @@ SSDEEP_VERSION=2.10
 all: ssdeep_make_prep file_make_prep
 	make -C miniz
 	make -C compress
-	make -C ssdeep-$(SSDEEP_VERSION) libinfuzzy.la
-	make -C file-$(FILE_VERSION)/src magic.h # This must be done first for OSX, else MAGIC_VERSION is undefined
-	make -C file-$(FILE_VERSION)/src libinmagic.la
+	if [ "$(BUILD_FUZZY)" -eq "1" ]; then make -C ssdeep-$(SSDEEP_VERSION) libinfuzzy.la; fi
+	if [ "$(BUILD_MAGIC)" -eq "1" ]; then make -C file-$(FILE_VERSION)/src magic.h; fi # This must be done first for OSX, else MAGIC_VERSION is undefined
+	if [ "$(BUILD_MAGIC)" -eq "1" ]; then make -C file-$(FILE_VERSION)/src libinmagic.la; fi
 
 install:
 	make -C miniz install
 	make -C compress install
-	make -C ssdeep-$(SSDEEP_VERSION) install-libLTLIBRARIES
-	make -C file-$(FILE_VERSION)/src install-libLTLIBRARIES
+	if [ "$(BUILD_FUZZY)" -eq "1" ]; then make -C ssdeep-$(SSDEEP_VERSION) install-libLTLIBRARIES; fi
+	if [ "$(BUILD_MAGIC)" -eq "1" ]; then make -C file-$(FILE_VERSION)/src install-libLTLIBRARIES; fi
 
 clean:
 	make -C miniz clean
 	make -C compress clean
-	make -C ssdeep-$(SSDEEP_VERSION) clean
-	make -C file-$(FILE_VERSION) clean
+	if [ "$(BUILD_FUZZY)" -eq "1" ]; then make -C ssdeep-$(SSDEEP_VERSION) clean; fi
+	if [ "$(BUILD_MAGIC)" -eq "1" ]; then make -C file-$(FILE_VERSION) clean; fi
 
 distclean:
 	make -C miniz distclean
 	make -C compress distclean
-	make -C ssdeep-$(SSDEEP_VERSION) distclean
-	make -C file-$(FILE_VERSION) distclean
+	if [ "$(BUILD_FUZZY)" -eq "1" ]; then make -C ssdeep-$(SSDEEP_VERSION) distclean; fi
+	if [ "$(BUILD_MAGIC)" -eq "1" ]; then make -C file-$(FILE_VERSION) distclean; fi
 
 uninstall:
 	make -C miniz uninstall
 	make -C compress uninstall
-	make -C ssdeep-$(SSDEEP_VERSION) uninstall-libLTLIBRARIES
-	make -C file-$(FILE_VERSION)/src uninstall-libLTLIBRARIES
+	if [ "$(BUILD_FUZZY)" -eq "1" ]; then make -C ssdeep-$(SSDEEP_VERSION) uninstall-libLTLIBRARIES; fi
+	if [ "$(BUILD_MAGIC)" -eq "1" ]; then make -C file-$(FILE_VERSION)/src uninstall-libLTLIBRARIES; fi
 
 file_make_prep:
-	sed -e s/libmagic/libinmagic/g < ./file-$(FILE_VERSION)/src/Makefile >./file-$(FILE_VERSION)/src/mktmp
-	mv ./file-$(FILE_VERSION)/src/mktmp ./file-$(FILE_VERSION)/src/Makefile
+	if [ "$(BUILD_MAGIC)" -eq "1" ]; then sed -e s/libmagic/libinmagic/g < ./file-$(FILE_VERSION)/src/Makefile >./file-$(FILE_VERSION)/src/mktmp; fi
+	if [ "$(BUILD_MAGIC)" -eq "1" ]; then mv ./file-$(FILE_VERSION)/src/mktmp ./file-$(FILE_VERSION)/src/Makefile; fi
 
 ssdeep_make_prep:
-	sed -e s/libfuzzy/libinfuzzy/g < ./ssdeep-$(SSDEEP_VERSION)/Makefile >./ssdeep-$(SSDEEP_VERSION)/mktmp
-	mv ./ssdeep-$(SSDEEP_VERSION)/mktmp ./ssdeep-$(SSDEEP_VERSION)/Makefile
+	if [ "$(BUILD_FUZZY)" -eq "1" ]; then sed -e s/libfuzzy/libinfuzzy/g < ./ssdeep-$(SSDEEP_VERSION)/Makefile >./ssdeep-$(SSDEEP_VERSION)/mktmp; fi
+	if [ "$(BUILD_FUZZY)" -eq "1" ]; then mv ./ssdeep-$(SSDEEP_VERSION)/mktmp ./ssdeep-$(SSDEEP_VERSION)/Makefile; fi