Changed how --disable-clibs works

Makefile.in

@@ -31,7 +31,6 @@ all: build
 
 install: build
 	$(PYTHON) ./setup.py install $(PREFIX)
-	#if [ "$(BUILD_C_LIBS)" -eq "1" ] && [ $(findstring "CYGWIN", $(PLATFORM)) ]; then ldconfig || true; fi
 
 build:
 	if [ "$(BUILD_C_LIBS)" -eq "1" ]; then make -C $(SRC_C_DIR); fi

configure

@@ -1286,11 +1286,11 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --disable-clibs         do not build/install any c libraries
-  --disable-bundles       do not install bundled software
+  --disable-clibs         do not build/install binwalk c libraries
+  --disable-bundles       do not build/install any bundled software
   --disable-libmagic      do not build/install the bundled libmagic library
   --disable-libfuzzy      do not build/install the bundled libfuzzy library
-  --disable-pyqtgraph     do not install the bundled pyqtgraph library
+  --disable-pyqtgraph     do not build/install the bundled pyqtgraph module
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -3376,21 +3376,18 @@ then
     BUILD_PYQTGRAPH=0
 fi
 
-if test "$BUILD_C_LIBS" != "0"
+if test "$BUILD_MAGIC" != "0"
 then
-    if test "$BUILD_MAGIC" != "0"
-    then
-        rm -rf $(ls ./src/bundles/file-*.tar.gz | sed -e 's/\.tar\.gz//')
-        (cd ./src/bundles && tar -zxvf file-*.tar.gz > /dev/null)
-        (cd ./src/bundles/file-*/ && ./configure) || exit 1
-    fi
+    rm -rf $(ls ./src/bundles/file-*.tar.gz | sed -e 's/\.tar\.gz//')
+    (cd ./src/bundles && tar -zxvf file-*.tar.gz > /dev/null)
+    (cd ./src/bundles/file-*/ && ./configure) || exit 1
+fi
 
-    if test "$BUILD_FUZZY" != "0"
-    then
-        rm -rf $(ls ./src/bundles/ssdeep-*.tar.gz | sed -e 's/\.tar\.gz//')
-        (cd ./src/bundles && tar -zxvf ssdeep-*.tar.gz > /dev/null)
-        (cd ./src/bundles/ssdeep-*/ && ./configure) || exit 1
-    fi
+if test "$BUILD_FUZZY" != "0"
+then
+    rm -rf $(ls ./src/bundles/ssdeep-*.tar.gz | sed -e 's/\.tar\.gz//')
+    (cd ./src/bundles && tar -zxvf ssdeep-*.tar.gz > /dev/null)
+    (cd ./src/bundles/ssdeep-*/ && ./configure) || exit 1
 fi
 
 if test "$BUILD_PYQTGRAPH" != "0"

configure.ac

@@ -13,12 +13,12 @@ AC_ARG_WITH([python],
             [PYTHON=python])
 
 AC_ARG_ENABLE([clibs],
-              [AS_HELP_STRING([--disable-clibs], [do not build/install any c libraries])],
+              [AS_HELP_STRING([--disable-clibs], [do not build/install binwalk c libraries])],
               [BUILD_C_LIBS=0],
               [BUILD_C_LIBS=1])
 
 AC_ARG_ENABLE([bundles],
-              [AS_HELP_STRING([--disable-bundles], [do not install bundled software])],
+              [AS_HELP_STRING([--disable-bundles], [do not build/install any bundled software])],
               [BUILD_BUNDLES=0],
               [BUILD_BUNDLES=1])
 
@@ -33,7 +33,7 @@ AC_ARG_ENABLE([libfuzzy],
               [BUILD_FUZZY=1])
 
 AC_ARG_ENABLE([pyqtgraph],
-              [AS_HELP_STRING([--disable-pyqtgraph], [do not install the bundled pyqtgraph library])],
+              [AS_HELP_STRING([--disable-pyqtgraph], [do not build/install the bundled pyqtgraph module])],
               [BUILD_PYQTGRAPH=0],
               [BUILD_PYQTGRAPH=1])
 
@@ -61,21 +61,18 @@ then
     BUILD_PYQTGRAPH=0
 fi
 
-if test "$BUILD_C_LIBS" != "0"
+if test "$BUILD_MAGIC" != "0"
 then
-    if test "$BUILD_MAGIC" != "0"
-    then
-        rm -rf $(ls ./src/bundles/file-*.tar.gz | sed -e 's/\.tar\.gz//')
-        (cd ./src/bundles && tar -zxvf file-*.tar.gz > /dev/null)
-        (cd ./src/bundles/file-*/ && ./configure) || exit 1
-    fi
-
-    if test "$BUILD_FUZZY" != "0"
-    then
-        rm -rf $(ls ./src/bundles/ssdeep-*.tar.gz | sed -e 's/\.tar\.gz//')
-        (cd ./src/bundles && tar -zxvf ssdeep-*.tar.gz > /dev/null)
-        (cd ./src/bundles/ssdeep-*/ && ./configure) || exit 1
-    fi
+    rm -rf $(ls ./src/bundles/file-*.tar.gz | sed -e 's/\.tar\.gz//')
+    (cd ./src/bundles && tar -zxvf file-*.tar.gz > /dev/null)
+    (cd ./src/bundles/file-*/ && ./configure) || exit 1
+fi
+
+if test "$BUILD_FUZZY" != "0"
+then
+    rm -rf $(ls ./src/bundles/ssdeep-*.tar.gz | sed -e 's/\.tar\.gz//')
+    (cd ./src/bundles && tar -zxvf ssdeep-*.tar.gz > /dev/null)
+    (cd ./src/bundles/ssdeep-*/ && ./configure) || exit 1
 fi
 
 if test "$BUILD_PYQTGRAPH" != "0"