From: Eric Biggers <ebiggers3@gmail.com>
Date: Thu, 4 Sep 2014 04:20:53 +0000 (-0500)
Subject: Remove WINDOWS_LDADD
X-Git-Tag: v1.7.2~40
X-Git-Url: https://wimlib.net/git/?p=wimlib;a=commitdiff_plain;h=bfd69010caead41c39ab50e306b1c21f8e26ba12

Remove WINDOWS_LDADD

Linking with shlwapi is no longer needed.
---

diff --git a/Makefile.am b/Makefile.am
index 18c7f316..cff4aa89 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -174,8 +174,7 @@ libwim_la_LIBADD =		\
 	$(LTLIBICONV)		\
 	$(LIBCRYPTO_LIBS)	\
 	$(SSSE3_SHA1_OBJ)	\
-	$(PTHREAD_LDADD)	\
-	$(WINDOWS_LDADD)
+	$(PTHREAD_LDADD)
 
 libwim_la_CFLAGS =		\
 	$(AM_CFLAGS)		\
diff --git a/configure.ac b/configure.ac
index 04e5a642..c98df106 100644
--- a/configure.ac
+++ b/configure.ac
@@ -178,7 +178,6 @@ VISIBILITY_CFLAGS="-fvisibility=hidden"
 WINDOWS_CFLAGS=""
 WINDOWS_CPPFLAGS=""
 WINDOWS_LDFLAGS=""
-WINDOWS_LDADD=""
 
 case "$host_os" in
 	mingw*)
@@ -188,7 +187,6 @@ case "$host_os" in
 		WINDOWS_CFLAGS="-municode"
 		WINDOWS_CPPFLAGS="-D_POSIX -DUNICODE -D_UNICODE -D_CRT_NON_CONFORMING_SWPRINTFS"
 		WINDOWS_LDFLAGS="-no-undefined"
-		WINDOWS_LDADD="-lshlwapi"
 		;;
 	linux*)
 		# Linux
@@ -203,7 +201,6 @@ esac
 
 AC_SUBST([VISIBILITY_CFLAGS], [$VISIBILITY_CFLAGS])
 AC_SUBST([WINDOWS_LDFLAGS], [$WINDOWS_LDFLAGS])
-AC_SUBST([WINDOWS_LDADD], [$WINDOWS_LDADD])
 AC_SUBST([WINDOWS_CPPFLAGS], [$WINDOWS_CPPFLAGS])
 AC_SUBST([WINDOWS_CFLAGS], [$WINDOWS_CFLAGS])
 AM_CONDITIONAL([WINDOWS_NATIVE_BUILD], [test "x$WINDOWS_NATIVE_BUILD" = "xyes"])