diff options
| author | Yang Tse <yangsita@gmail.com> | 2012-04-11 19:33:54 +0200 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2012-04-11 19:33:54 +0200 |
| commit | 9e24b9c7afbcb81120af4cf3f6cdee49a06d8224 (patch) | |
| tree | 0c671c32f59daa6848636e7f34c6071ed2bcae37 /lib/Makefile.am | |
| parent | a144bb8b767b1c9ae40a0e7853db88ed67c9e8c3 (diff) | |
| download | curl-9e24b9c7afbcb81120af4cf3f6cdee49a06d8224.tar.gz | |
build adjustments: CURL_HIDDEN_SYMBOLS no longer defined in config files
configure script now provides conditional definitions for Makefile.am
that result in CURL_HIDDEN_SYMBOLS being defined by resulting makefiles
when appropriate.
Additionally, configure script option for symbol hiding control is now
named --enable-symbol-hiding --disable-symbol-hiding. While still valid,
old option name --enable-hidden-symbols --disable-hidden-symbols will
be deprecated in some future release.
Diffstat (limited to 'lib/Makefile.am')
| -rw-r--r-- | lib/Makefile.am | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 76fd66040..5a8b3aa95 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -48,6 +48,8 @@ LIBCURL_LIBS = @LIBCURL_LIBS@ # This might hold -Werror CFLAGS += @CURL_CFLAG_EXTRAS@ +CFLAG_SYMBOL_HIDING = @CFLAG_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 # being currently built and tested are searched before the library which @@ -134,6 +136,14 @@ endif libcurl_la_LDFLAGS = $(UNDEF) $(VERSIONINFO) $(MIMPURE) $(VERSIONED_SYMBOLS) $(LIBCURL_LIBS) +if DOING_SYMBOL_HIDING +libcurl_la_CPPFLAGS = $(AM_CPPFLAGS) -DCURL_HIDDEN_SYMBOLS +libcurl_la_CFLAGS = $(AM_CFLAGS) $(CFLAG_SYMBOL_HIDING) +else +libcurl_la_CPPFLAGS = $(AM_CPPFLAGS) +libcurl_la_CFLAGS = $(AM_CFLAGS) +endif + # unit testing static library built only along with unit tests if BUILD_UNITTESTS noinst_LTLIBRARIES = libcurlu.la @@ -143,6 +153,7 @@ endif libcurlu_la_CPPFLAGS = $(AM_CPPFLAGS) -DUNITTESTS libcurlu_la_LDFLAGS = -static $(LIBCURL_LIBS) +libcurlu_la_CFLAGS = $(AM_CFLAGS) # Makefile.inc provides the CSOURCES and HHEADERS defines include Makefile.inc |