From 66c6a7b4c462b6290c3f98054476bd10b3b513c9 Mon Sep 17 00:00:00 2001
From: Charles Wilson <cwilso11@gmail.com>
Date: Mon, 20 Jul 2009 22:01:06 -0400
Subject: [PATCH] Correct error when linking bsdtar/bsdcpio statically on
 cygwin

SVN-Revision: 1251
---
 Makefile.am | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 3c4c270f0..52e4d807f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -385,15 +385,17 @@ endif
 bsdtar_DEPENDENCIES= libarchive.la libarchive_fe.la
 
 if STATIC_BSDTAR
-bsdtar_static= -static
+bsdtar_ldstatic= -static
+bsdtar_ccstatic= -DLIBARCHIVE_STATIC
 else
-bsdtar_static=
+bsdtar_ldstatic=
+bsdtar_ccstatic=
 endif
 
 bsdtar_LDADD= libarchive.la libarchive_fe.la
-bsdtar_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe
+bsdtar_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdtar_ccstatic)
+bsdtar_LDFLAGS= $(bsdtar_ldstatic)
 
-bsdtar_LDFLAGS= $(bsdtar_static)
 bsdtar_EXTRA_DIST=		\
 	tar/bsdtar.1		\
 	tar/bsdtar_windows.h	\
@@ -478,14 +480,17 @@ bsdcpio_DEPENDENCIES = libarchive.la libarchive_fe.la
 
 
 if STATIC_BSDCPIO
-bsdcpio_static= -static
+bsdcpio_ldstatic= -static
+bsdcpio_ccstatic= -DLIBARCHIVE_STATIC
 else
-bsdcpio_static=
+bsdcpio_ldstatic=
+bsdcpio_ccstatic=
 endif
 
 bsdcpio_LDADD= libarchive_fe.la libarchive.la
-bsdcpio_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe
-bsdcpio_LDFLAGS= $(bsdcpio_static)
+bsdcpio_CPPFLAGS= -I$(top_srcdir)/libarchive -I$(top_srcdir)/libarchive_fe $(bsdcpio_ccstatic)
+bsdcpio_LDFLAGS= $(bsdcpio_ldstatic)
+
 bsdcpio_EXTRA_DIST=		\
 	cpio/test/list.h	\
 	cpio/bsdcpio.1		\
-- 
2.47.3