From: Tim Kientzle <kientzle@gmail.com>
Date: Sat, 27 Jun 2009 18:32:16 +0000 (-0400)
Subject: binmode.o should no longer be needed on Cygwin.
X-Git-Tag: v2.8.0~563
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cee6343aa5baaa8029134ec589fac4e9a14e4382;p=thirdparty%2Flibarchive.git

binmode.o should no longer be needed on Cygwin.

SVN-Revision: 1189
---

diff --git a/Makefile.am b/Makefile.am
index 6b1ab0f89..a03245b53 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -303,8 +303,6 @@ libarchive_test_SOURCES=					\
 
 libarchive_test_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_builddir)/libarchive/test -DLIBARCHIVE_STATIC
 
-libarchive_test_LDADD=@PROG_LDADD_EXTRA@
-
 # The "list.h" file just lists all of the tests defined in all of the sources.
 # Building it automatically provides a sanity-check on libarchive_test_SOURCES
 # above.
@@ -397,7 +395,7 @@ else
 bsdtar_static=
 endif
 
-bsdtar_LDADD= libarchive.la libarchive_fe.la @PROG_LDADD_EXTRA@
+bsdtar_LDADD= libarchive.la libarchive_fe.la
 bsdtar_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe
 
 bsdtar_LDFLAGS= $(bsdtar_static)
@@ -445,7 +443,6 @@ bsdtar_test_SOURCES=						\
 
 
 bsdtar_test_CPPFLAGS= -I$(top_builddir)/tar/test
-bsdtar_test_LDADD=@PROG_LDADD_EXTRA@
 
 tar/test/list.h: Makefile
 	cat $(top_srcdir)/tar/test/test_*.c | grep DEFINE_TEST > tar/test/list.h
@@ -497,7 +494,7 @@ else
 bsdcpio_static=
 endif
 
-bsdcpio_LDADD= libarchive_fe.la libarchive.la @PROG_LDADD_EXTRA@
+bsdcpio_LDADD= libarchive_fe.la libarchive.la
 bsdcpio_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe
 bsdcpio_LDFLAGS= $(bsdcpio_static)
 bsdcpio_EXTRA_DIST=		\
@@ -559,7 +556,7 @@ bsdcpio_test_SOURCES=						\
 bsdcpio_test_CPPFLAGS= \
 	-I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe \
 	-I$(top_srcdir)/cpio -I$(top_builddir)/cpio/test
-bsdcpio_test_LDADD=libarchive_fe.la @PROG_LDADD_EXTRA@
+bsdcpio_test_LDADD=libarchive_fe.la
 
 cpio/test/list.h: Makefile
 	cat $(top_srcdir)/cpio/test/test_*.c | grep DEFINE_TEST > cpio/test/list.h
diff --git a/configure.ac b/configure.ac
index 4750169f6..929eb2a2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -85,21 +85,6 @@ AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 AC_CHECK_TOOL([STRIP],[strip])
 
-#
-# Locate some specific link objects for cygwin
-#
-prog_ldadd_extra=
-case "$host_os" in
-*cygwin*)
-  binmode_path=`$CC -print-file-name=binmode.o`
-  if test -n "$binmode_path" && test -f "$binmode_path" ; then
-    prog_ldadd_extra="$binmode_path"
-  fi
-  ;;
-esac
-PROG_LDADD_EXTRA=$prog_ldadd_extra
-AC_SUBST(PROG_LDADD_EXTRA)
-
 #
 # Options for building bsdtar.
 #