From fc2c91c206ef4695fd0a71371910c923b133dfd6 Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Tue, 17 Apr 2012 12:46:22 +0200
Subject: build adjustments: CARES_SYMBOL_HIDING no longer defined in config
 files

configure script now provides conditional definitions for Makefile.am
that result in CARES_SYMBOL_HIDING being defined by resulting makefiles
when appropriate.
---
 Makefile.am | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

(limited to 'Makefile.am')

diff --git a/Makefile.am b/Makefile.am
index 08d6a58..edf7b59 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -103,6 +103,8 @@ libcares_la_LDFLAGS = $(UNDEF) $(VER)
 # Add -Werror if defined
 CFLAGS += @CARES_CFLAG_EXTRAS@
 
+CFLAG_CARES_SYMBOL_HIDING = @CFLAG_CARES_SYMBOL_HIDING@
+
 # For Windows build targets, when building or using static c-ares
 if USE_CPPFLAG_CARES_STATICLIB
 AM_CPPFLAGS = -DCARES_STATICLIB
@@ -110,12 +112,21 @@ else
 AM_CPPFLAGS =
 endif
 
-# For Windows build targets, when building c-ares library
+if DOING_CARES_SYMBOL_HIDING
+if USE_CPPFLAG_CARES_BUILDING_LIBRARY
+libcares_la_CPPFLAGS = $(AM_CPPFLAGS) -DCARES_SYMBOL_HIDING -DCARES_BUILDING_LIBRARY
+else
+libcares_la_CPPFLAGS = $(AM_CPPFLAGS) -DCARES_SYMBOL_HIDING
+endif
+libcares_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_CARES_SYMBOL_HIDING)
+else
 if USE_CPPFLAG_CARES_BUILDING_LIBRARY
 libcares_la_CPPFLAGS = $(AM_CPPFLAGS) -DCARES_BUILDING_LIBRARY
 else
 libcares_la_CPPFLAGS = $(AM_CPPFLAGS)
 endif
+libcares_la_CFLAGS = $(AM_CFLAGS)
+endif
 
 # Makefile.inc provides the CSOURCES and HHEADERS defines
 include Makefile.inc
-- 
cgit v1.2.3