Remove support for --with-imagex-progname configure option

[wimlib] / configure.ac

diff --git a/configure.ac b/configure.ac
index c98df106c87bd4e246e994d314463929615a400f..6803b90b0a4bada51a6932248f4bda051fb61ffd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([wimlib], [1.7.2-BETA], [ebiggers3@gmail.com])
+AC_INIT([wimlib], [1.7.4-BETA], [ebiggers3@gmail.com])
 AC_CONFIG_SRCDIR([src/wim.c])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([build-aux])
@@ -10,37 +10,27 @@ LT_INIT
 PKGCONFIG_PRIVATE_REQUIRES=""
 PKGCONFIG_PRIVATE_LIBS=""
 
-AC_ARG_WITH(imagex-progname,
-            [AS_HELP_STRING([--with-imagex-progname=NAME],
-                           [Set the name of installed ImageX program (default: wimlib-imagex)])],
-            [IMAGEX_PROGNAME=$withval],
-            [IMAGEX_PROGNAME="wimlib-imagex"])
-
-AC_SUBST([IMAGEX_PROGNAME], [$IMAGEX_PROGNAME])
-AC_DEFINE_UNQUOTED([IMAGEX_PROGNAME], ["$IMAGEX_PROGNAME"],
-                  [Binary name for the implementation of ImageX distributed with wimlib])
-
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_FILES([Makefile]
                [doc/Doxyfile]
                [wimlib.pc]
-               [doc/man1/"$IMAGEX_PROGNAME".1:doc/man1/imagex.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-append.1:doc/man1/imagex-append.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-apply.1:doc/man1/imagex-apply.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-capture.1:doc/man1/imagex-capture.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-delete.1:doc/man1/imagex-delete.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-dir.1:doc/man1/imagex-dir.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-export.1:doc/man1/imagex-export.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-extract.1:doc/man1/imagex-extract.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-info.1:doc/man1/imagex-info.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-join.1:doc/man1/imagex-join.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-mount.1:doc/man1/imagex-mount.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-mountrw.1:doc/man1/imagex-mountrw.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-optimize.1:doc/man1/imagex-optimize.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-split.1:doc/man1/imagex-split.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-unmount.1:doc/man1/imagex-unmount.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-update.1:doc/man1/imagex-update.1.in]
-               [doc/man1/"$IMAGEX_PROGNAME"-verify.1:doc/man1/imagex-verify.1.in]
+               [doc/man1/wimlib-imagex.1:doc/man1/imagex.1.in]
+               [doc/man1/wimlib-imagex-append.1:doc/man1/imagex-append.1.in]
+               [doc/man1/wimlib-imagex-apply.1:doc/man1/imagex-apply.1.in]
+               [doc/man1/wimlib-imagex-capture.1:doc/man1/imagex-capture.1.in]
+               [doc/man1/wimlib-imagex-delete.1:doc/man1/imagex-delete.1.in]
+               [doc/man1/wimlib-imagex-dir.1:doc/man1/imagex-dir.1.in]
+               [doc/man1/wimlib-imagex-export.1:doc/man1/imagex-export.1.in]
+               [doc/man1/wimlib-imagex-extract.1:doc/man1/imagex-extract.1.in]
+               [doc/man1/wimlib-imagex-info.1:doc/man1/imagex-info.1.in]
+               [doc/man1/wimlib-imagex-join.1:doc/man1/imagex-join.1.in]
+               [doc/man1/wimlib-imagex-mount.1:doc/man1/imagex-mount.1.in]
+               [doc/man1/wimlib-imagex-mountrw.1:doc/man1/imagex-mountrw.1.in]
+               [doc/man1/wimlib-imagex-optimize.1:doc/man1/imagex-optimize.1.in]
+               [doc/man1/wimlib-imagex-split.1:doc/man1/imagex-split.1.in]
+               [doc/man1/wimlib-imagex-unmount.1:doc/man1/imagex-unmount.1.in]
+               [doc/man1/wimlib-imagex-update.1:doc/man1/imagex-update.1.in]
+               [doc/man1/wimlib-imagex-verify.1:doc/man1/imagex-verify.1.in]
                [doc/man1/mkwinpeimg.1])
 
 AC_CONFIG_FILES([programs/mkwinpeimg], [chmod +x programs/mkwinpeimg])
@@ -128,18 +118,6 @@ if test "x$ENABLE_ASSERTIONS" = "xyes"; then
        AC_DEFINE([ENABLE_ASSERTIONS], [1], [Define to 1 if including assertions.])
 fi
 
-AC_MSG_CHECKING([whether to include more assertions])
-AC_ARG_ENABLE([more-assertions],
-       AS_HELP_STRING([--enable-more-assertions], [include even more assertions]),
-       [ENABLE_MORE_ASSERTIONS=$enableval],
-       [ENABLE_MORE_ASSERTIONS=no]
-       )
-AC_MSG_RESULT([$ENABLE_MORE_ASSERTIONS])
-if test "x$ENABLE_MORE_ASSERTIONS" = "xyes"; then
-       AC_DEFINE([ENABLE_MORE_ASSERTIONS], [1], [Define to 1 if including more assertions.])
-fi
-
-
 AC_MSG_CHECKING([whether to include automatic compression verification])
 AC_ARG_ENABLE([verify_compression],
              AS_HELP_STRING([--enable-verify-compression], [always
@@ -344,7 +322,6 @@ if test "x$WITH_LIBCRYPTO" = "xyes" -a "x$ENABLE_SSSE3_SHA1" = "xno"; then
        PKG_CHECK_MODULES([LIBCRYPTO], [libcrypto])
        PKGCONFIG_PRIVATE_REQUIRES="$PKGCONFIG_PRIVATE_REQUIRES libcrypto"
 fi
-AC_SUBST([SHA1_SOURCES], [$SHA1_SOURCES])
 
 AC_SUBST([PKGCONFIG_PRIVATE_REQUIRES], [$PKGCONFIG_PRIVATE_REQUIRES])
 AC_SUBST([PKGCONFIG_PRIVATE_LIBS], [$PKGCONFIG_PRIVATE_LIBS])