X-Git-Url: https://wimlib.net/git/?p=wimlib;a=blobdiff_plain;f=configure.ac;h=2b15855b60e84e19ce1d7491e4087e11ba865af8;hp=ad04b478e3393fb15815f645ebac4bc62445a64b;hb=232c381f9f3ab814258aa8e2380f537498a50905;hpb=2a33c303e30fd740f740e21632fd06b9e414b0c7

diff --git a/configure.ac b/configure.ac
index ad04b478..2b15855b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,26 +6,39 @@ AM_INIT_AUTOMAKE([-Wall -Werror subdir-objects])
 AC_C_BIGENDIAN
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_INIT
+
+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/imagex.1
-		doc/imagex-append.1
-		doc/imagex-apply.1
-		doc/imagex-capture.1
-		doc/imagex-delete.1
-		doc/imagex-dir.1
-		doc/imagex-export.1
-		doc/imagex-info.1
-		doc/imagex-join.1
-		doc/imagex-mount.1
-		doc/imagex-mountrw.1
-		doc/imagex-optimize.1
-		doc/imagex-split.1
-		doc/imagex-unmount.1
-		doc/mkwinpeimg.1
-		])
+AC_CONFIG_FILES([Makefile]
+		[doc/Doxyfile]
+		[wimlib.pc]
+		[doc/"$IMAGEX_PROGNAME".1:doc/imagex.1.in]
+		[doc/"$IMAGEX_PROGNAME"-append.1:doc/imagex-append.1.in]
+		[doc/"$IMAGEX_PROGNAME"-apply.1:doc/imagex-apply.1.in]
+		[doc/"$IMAGEX_PROGNAME"-capture.1:doc/imagex-capture.1.in]
+		[doc/"$IMAGEX_PROGNAME"-delete.1:doc/imagex-delete.1.in]
+		[doc/"$IMAGEX_PROGNAME"-dir.1:doc/imagex-dir.1.in]
+		[doc/"$IMAGEX_PROGNAME"-export.1:doc/imagex-export.1.in]
+		[doc/"$IMAGEX_PROGNAME"-info.1:doc/imagex-info.1.in]
+		[doc/"$IMAGEX_PROGNAME"-join.1:doc/imagex-join.1.in]
+		[doc/"$IMAGEX_PROGNAME"-mount.1:doc/imagex-mount.1.in]
+		[doc/"$IMAGEX_PROGNAME"-mountrw.1:doc/imagex-mountrw.1.in]
+		[doc/"$IMAGEX_PROGNAME"-optimize.1:doc/imagex-optimize.1.in]
+		[doc/"$IMAGEX_PROGNAME"-split.1:doc/imagex-split.1.in]
+		[doc/"$IMAGEX_PROGNAME"-unmount.1:doc/imagex-unmount.1.in]
+		[doc/mkwinpeimg.1])
+
+AC_CONFIG_FILES([programs/mkwinpeimg], [chmod +x programs/mkwinpeimg])
+
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_CANONICAL_HOST
@@ -157,46 +170,46 @@ if test "x$ENABLE_MULTITHREADED_COMPRESSION" = "xyes"; then
 	AC_DEFINE([ENABLE_MULTITHREADED_COMPRESSION], [1],
 		  	[Define to 1 if including support for multithreaded
 			 compression])
-	PTHREAD_LDADD="-lpthread"
-else
-	PTHREAD_LDADD=""
 fi
+
+PTHREAD_LDADD="-lpthread"
 AC_SUBST([PTHREAD_LDADD], [$PTHREAD_LDADD])
 
+WITH_NTFS_3G_DEFAULT="yes"
+WITH_FUSE_DEFAULT="yes"
+WINDOWS_NATIVE_BUILD="no"
+VISIBILITY_CFLAGS="-fvisibility=hidden"
+WINDOWS_CPPFLAGS=""
+WINDOWS_LDFLAGS=""
+WINDOWS_LDADD=""
+
 case "$host" in
 	*-*-mingw*)
 		# Native Windows
-		WINDOWS_EXTRA_LDFLAGS="-no-undefined"
-		VISIBILITY_CFLAGS=""
 		WITH_NTFS_3G_DEFAULT="no"
 		WITH_FUSE_DEFAULT="no"
-		WINDOWS_BUILD="yes"
+		WINDOWS_NATIVE_BUILD="yes"
+		VISIBILITY_CFLAGS=""
+		WINDOWS_CPPFLAGS="-D_POSIX"
+		WINDOWS_LDFLAGS="-no-undefined"
 		WINDOWS_LDADD="-lshlwapi"
 		;;
  	*-*-cygwin*)
 		# Cygwin (WARNING: not well supported)
-		WINDOWS_EXTRA_LDFLAGS="-no-undefined"
-		VISIBILITY_CFLAGS=""
 		WITH_NTFS_3G_DEFAULT="no"
 		WITH_FUSE_DEFAULT="no"
-		WINDOWS_BUILD="yes"
-		WINDOWS_LDADD=""
+		VISIBILITY_CFLAGS=""
 		;;
 	*)
 		# UNIX / other
-		WINDOWS_EXTRA_LDFLAGS=""
-		VISIBILITY_CFLAGS="-fvisibility=hidden"
-		WITH_NTFS_3G_DEFAULT="yes"
-		WITH_FUSE_DEFAULT="yes"
-		WINDOWS_BUILD="no"
-		WINDOWS_LDADD=""
 		;;
 esac
 
-AC_SUBST([WINDOWS_EXTRA_LDFLAGS], [$WINDOWS_EXTRA_LDFLAGS])
 AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS])
+AC_SUBST([WINDOWS_LDFLAGS], [$WINDOWS_LDFLAGS])
 AC_SUBST([WINDOWS_LDADD], [$WINDOWS_LDADD])
-AM_CONDITIONAL([WINDOWS_BUILD], [test "x$WINDOWS_BUILD" = "xyes"])
+AC_SUBST([WINDOWS_CPPFLAGS], [$WINDOWS_CPPFLAGS])
+AM_CONDITIONAL([WINDOWS_NATIVE_BUILD], [test "x$WINDOWS_NATIVE_BUILD" = "xyes"])
 
 AC_MSG_CHECKING([whether to include support for ntfs-3g])
 AC_ARG_WITH([ntfs-3g],
@@ -236,22 +249,20 @@ else
 	LIBNTFS_3G_LDADD=
 	LIBNTFS_3G_CFLAGS=
 
-	if test "x$WINDOWS_BUILD" != "xyes"; then
-		AM_ICONV
-		if test "x$am_cv_func_iconv" != "xyes"; then
-			AC_MSG_ERROR([Cannot find the iconv() function.
-			iconv() is used to convert between UTF-8 and UTF-16 encodings of WIM
-			filenames and XML data.  Wimlib cannot be compiled without it.  iconv()
-			is available in the latest version of glibc and sometimes in other
-			libraries.])
-		fi
-	fi
 fi
 AM_CONDITIONAL([WITH_NTFS_3G], [test "x$WITH_NTFS_3G" = "xyes"])
 
 AC_SUBST([LIBNTFS_3G_LDADD], [$LIBNTFS_3G_LDADD])
 AC_SUBST([LIBNTFS_3G_CFLAGS], [$LIBNTFS_3G_CFLAGS])
 
+AM_ICONV
+if test "x$am_cv_func_iconv" != "xyes"; then
+	AC_MSG_ERROR([Cannot find the iconv() function.
+	iconv() is used to convert between encodings of WIM filenames and XML data.
+	wimlib cannot be compiled without it.  iconv() is available in the latest
+	version of glibc and sometimes in other libraries.])
+fi
+
 AC_MSG_CHECKING([whether to include support for mounting WIMs])
 AC_ARG_WITH([fuse],
 		AS_HELP_STRING([--without-fuse], [build without libfuse.