From: Tim Kientzle <kientzle@gmail.com>
Date: Sun, 21 Nov 2010 00:18:16 +0000 (-0500)
Subject: Revert a change that was inadvertently picked up in r2793.
X-Git-Tag: v3.0.0a~842
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01a4df5406332f6f6bc6a549a7cdcddc51e7fbd8;p=thirdparty%2Flibarchive.git

Revert a change that was inadvertently picked up in r2793.
Also, add an AC_LANG_SOURCE call that seems to be required
since autoconf 2.68.

SVN-Revision: 2798
---

diff --git a/configure.ac b/configure.ac
index 92e2c0236..71956c1aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ AC_SUBST(PLATFORMCPPFLAGS)
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_USE_SYSTEM_EXTENSIONS
-#AC_LIBTOOL_WIN32_DLL
+AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 AC_CHECK_TOOL([STRIP],[strip])
 
@@ -271,7 +271,7 @@ AC_DEFUN([MD_CHECK], [
     CPPFLAGS="$CPPFLAGS -I$srcdir/libarchive"
     LIBS="$LIBS $4"
     AC_MSG_CHECKING([support for ARCHIVE_HASH_$1_$2])
-    AC_LINK_IFELSE([
+    AC_LINK_IFELSE([AC_LANG_SOURCE([
 #define $1_COMPILE_TEST
 #define ARCHIVE_HASH_$1_$2
 #define __LIBARCHIVE_BUILD
@@ -287,7 +287,7 @@ main(int argc, char **argv)
 	archive_$3_final(&ctx, *argv);
 	return 0;
 }
-],
+])],
     [ AC_MSG_RESULT([yes])
       found_$1=yes
       mdLIBS="$mdLIBS $4"