From 3833765ba5f77e74ce1d82d761b1c45ca2b32fbb Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Tue, 17 Apr 2012 12:42:14 +0200
Subject: build adjustments: commit 9e24b9c7 follow-up

---
 lib/Makefile.am           |  6 +++---
 m4/curl-confopts.m4       | 10 +++++-----
 tests/libtest/Makefile.am |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 5a8b3aa95..4bf6368a6 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -48,7 +48,7 @@ LIBCURL_LIBS = @LIBCURL_LIBS@
 # This might hold -Werror
 CFLAGS += @CURL_CFLAG_EXTRAS@
 
-CFLAG_SYMBOL_HIDING = @CFLAG_SYMBOL_HIDING@
+CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@
 
 # Specify our include paths here, and do it relative to $(top_srcdir) and
 # $(top_builddir), to ensure that these paths which belong to the library
@@ -136,9 +136,9 @@ endif
 
 libcurl_la_LDFLAGS = $(UNDEF) $(VERSIONINFO) $(MIMPURE) $(VERSIONED_SYMBOLS) $(LIBCURL_LIBS)
 
-if DOING_SYMBOL_HIDING
+if DOING_CURL_SYMBOL_HIDING
 libcurl_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_HIDDEN_SYMBOLS
-libcurl_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_SYMBOL_HIDING)
+libcurl_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_CURL_SYMBOL_HIDING)
 else
 libcurl_la_CPPFLAGS = $(AM_CPPFLAGS)
 libcurl_la_CFLAGS = $(AM_CFLAGS)
diff --git a/m4/curl-confopts.m4 b/m4/curl-confopts.m4
index f335b7a60..048fc9b4b 100644
--- a/m4/curl-confopts.m4
+++ b/m4/curl-confopts.m4
@@ -21,7 +21,7 @@
 #***************************************************************************
 
 # File version for 'aclocal' use. Keep it a single number.
-# serial 17
+# serial 18
 
 dnl CURL_CHECK_OPTION_THREADED_RESOLVER
 dnl -------------------------------------------------
@@ -466,21 +466,21 @@ dnl been done to prevent interferences on other tests.
 
 AC_DEFUN([CURL_CONFIGURE_SYMBOL_HIDING], [
   AC_MSG_CHECKING([whether hiding of library internal symbols will actually happen])
-  CFLAG_SYMBOL_HIDING=""
+  CFLAG_CURL_SYMBOL_HIDING=""
   doing_symbol_hiding="no"
   if test x"$ac_cv_native_windows" != "xyes" &&
     test "$want_symbol_hiding" = "yes" &&
     test "$supports_symbol_hiding" = "yes"; then
     doing_symbol_hiding="yes"
-    CFLAG_SYMBOL_HIDING="$symbol_hiding_CFLAGS"
+    CFLAG_CURL_SYMBOL_HIDING="$symbol_hiding_CFLAGS"
     AC_DEFINE_UNQUOTED(CURL_EXTERN_SYMBOL, $symbol_hiding_EXTERN,
       [Definition to make a library symbol externally visible.])
     AC_MSG_RESULT([yes])
   else
     AC_MSG_RESULT([no])
   fi
-  AM_CONDITIONAL(DOING_SYMBOL_HIDING, test x$doing_symbol_hiding = xyes)
-  AC_SUBST(CFLAG_SYMBOL_HIDING)
+  AM_CONDITIONAL(DOING_CURL_SYMBOL_HIDING, test x$doing_symbol_hiding = xyes)
+  AC_SUBST(CFLAG_CURL_SYMBOL_HIDING)
 ])
 
 
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index e4538b750..6170453a0 100644
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -53,7 +53,7 @@ endif
 EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl	\
 test1022.pl Makefile.inc
 
-CFLAG_SYMBOL_HIDING = @CFLAG_SYMBOL_HIDING@
+CFLAG_CURL_SYMBOL_HIDING = @CFLAG_CURL_SYMBOL_HIDING@
 
 # Dependencies (may need to be overriden)
 LDADD = $(top_builddir)/lib/libcurl.la @CURL_LIBS@
@@ -88,9 +88,9 @@ libhostname_la_LIBADD =
 libhostname_la_DEPENDENCIES =
 libhostname_la_LDFLAGS = -module -avoid-version $(UNDEF) -rpath /nowhere
 
-if DOING_SYMBOL_HIDING
+if DOING_CURL_SYMBOL_HIDING
 libhostname_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_HIDDEN_SYMBOLS
-libhostname_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_SYMBOL_HIDING)
+libhostname_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_CURL_SYMBOL_HIDING)
 else
 libhostname_la_CPPFLAGS = $(AM_CPPFLAGS)
 libhostname_la_CFLAGS = $(AM_CFLAGS)
-- 
cgit v1.2.3