[Libreoffice-commits] libcdr.git: configure.ac src/lib

[Libreoffice Gerrit user]

 configure.ac        |   16 ++++++----------
 src/lib/Makefile.am |    6 ++++++
 2 files changed, 12 insertions(+), 10 deletions(-)

New commits:
commit f0f24b6ef07e50d09a4f71180b132f5e6234e2fe
Author:     David Tardon <dtardon at redhat.com>
AuthorDate: Thu Dec 27 19:15:24 2018 +0100
Commit:     David Tardon <dtardon at redhat.com>
CommitDate: Thu Dec 27 19:15:24 2018 +0100

    check for __attribute__((visibility)) too
    
    Change-Id: Icf5f2a52cc046cf42d0feb7e5bcb993f426b83e1

diff --git a/configure.ac b/configure.ac
index 3927e5e..0ef99cc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -185,16 +185,12 @@ AS_IF([test $platform_win32 = yes],
         AC_MSG_CHECKING([for -fvisibility=hidden compiler flag])
         saved_CXXFLAGS="$CXXFLAGS"
         CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
-        AC_TRY_COMPILE([], [],
-            [
-                AC_MSG_RESULT([yes])
-                CXXFLAGS="$CXXFLAGS -DLIBCDR_VISIBILITY"
-            ],
-            [
-                AC_MSG_RESULT([no])
-                CXXFLAGS="$saved_CXXFLAGS"
-            ]
-        )
+        AC_TRY_COMPILE([], [], [have_visibility=yes], [have_visibility=no])
+        AC_MSG_RESULT([$have_visibility])
+        CXXFLAGS="$saved_CXXFLAGS"
+        AX_GCC_FUNC_ATTRIBUTE([visibility])
+        AM_CONDITIONAL([HAVE_VISIBILITY], [
+            test "$have_visibility" = "yes" && test "$ax_cv_gcc_func_attribute_visibility" = "yes"])
     ]
 )
 
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 2a44977..77af17d 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -17,6 +17,12 @@ AM_CXXFLAGS = -I$(top_srcdir)/inc \
 	-DBOOST_ERROR_CODE_HEADER_ONLY \
 	-DBOOST_SYSTEM_NO_DEPRECATED
 
+if HAVE_VISIBILITY
+AM_CXXFLAGS += \
+	-DLIBCDR_VISIBILITY \
+	-fvisibility=hidden
+endif
+
 libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_LIBADD  = libcdr-internal.la $(REVENGE_LIBS) $(LCMS2_LIBS) $(ZLIB_LIBS) $(ICU_LIBS) @LIBCDR_WIN32_RESOURCE@
 libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_DEPENDENCIES = libcdr-internal.la @LIBCDR_WIN32_RESOURCE@
 libcdr_ at CDR_MAJOR_VERSION@_ at CDR_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined