From a2bd84a5320f509e6420cde32313da07640b6829 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Fri, 13 Jul 2007 20:44:26 +0000 Subject: [PATCH] added --disable-visibility configure option git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47439 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++- configure.in | 6 +++++- 2 files changed, 65 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 11c0cbff1e..fd4323c299 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Id: configure.in 47349 2007-07-11 23:31:24Z VZ . +# From configure.in Id: configure.in 47419 2007-07-13 09:13:55Z VS . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for wxWidgets 2.9.0. # @@ -1671,6 +1671,7 @@ Optional Features: --disable-compat28 disable wxWidgets 2.8 compatibility --disable-rpath disable use of rpath for uninstalled builds --enable-objc_uniquifying enable Objective-C class name uniquifying + --disable-visibility disable use of ELF symbols visibility even if supported --enable-intl use internationalization system --enable-config use wxConfig (and derived) classes --enable-protocols use wxProtocol and derived classes @@ -5863,6 +5864,62 @@ echo "${ECHO_T}$result" >&6; } + enablestring=disable + defaultval= + if test -z "$defaultval"; then + if test x"$enablestring" = xdisable; then + defaultval=yes + else + defaultval=no + fi + fi + + { echo "$as_me:$LINENO: checking for --${enablestring:-enable}-visibility" >&5 +echo $ECHO_N "checking for --${enablestring:-enable}-visibility... $ECHO_C" >&6; } + no_cache=0 + # Check whether --enable-visibility was given. +if test "${enable_visibility+set}" = set; then + enableval=$enable_visibility; + if test "$enableval" = yes; then + ac_cv_use_visibility='wxUSE_VISIBILITY=yes' + else + ac_cv_use_visibility='wxUSE_VISIBILITY=no' + fi + +else + + LINE=`grep "^wxUSE_VISIBILITY=" ${wx_arg_cache_file}` + if test "x$LINE" != x ; then + eval "DEFAULT_$LINE" + else + no_cache=1 + fi + + ac_cv_use_visibility='wxUSE_VISIBILITY=${'DEFAULT_wxUSE_VISIBILITY":-$defaultval}" + +fi + + + eval "$ac_cv_use_visibility" + if test "$no_cache" != 1; then + echo $ac_cv_use_visibility >> ${wx_arg_cache_file}.tmp + fi + + if test x"$enablestring" = xdisable; then + if test $wxUSE_VISIBILITY = yes; then + result=no + else + result=yes + fi + else + result=$wxUSE_VISIBILITY + fi + + { echo "$as_me:$LINENO: result: $result" >&5 +echo "${ECHO_T}$result" >&6; } + + + enablestring= defaultval=$wxUSE_ALL_FEATURES @@ -35679,6 +35736,7 @@ echo "${ECHO_T}$wx_cv_version_script" >&6; } esac + if test "$wxUSE_VISIBILITY" != "no"; then if test -n "$GCC"; then @@ -35777,6 +35835,7 @@ _ACEOF fi + fi if test "x$SUNCXX" = xyes; then SAMPLES_RPATH_FLAG="-R\$(wx_top_builddir)/lib" diff --git a/configure.in b/configure.in index 69e3cfa146..6b322e600d 100644 --- a/configure.in +++ b/configure.in @@ -557,6 +557,8 @@ WX_ARG_DISABLE(rpath, [ --disable-rpath disable use of rpath for WX_ARG_ENABLE(objc_uniquifying,[ --enable-objc_uniquifying enable Objective-C class name uniquifying], wxUSE_OBJC_UNIQUIFYING) +WX_ARG_DISABLE(visibility, [ --disable-visibility disable use of ELF symbols visibility even if supported], wxUSE_VISIBILITY) + dnl --------------------------------------------------------------------------- dnl optional non GUI features dnl --------------------------------------------------------------------------- @@ -3690,7 +3692,9 @@ if test "$wxUSE_SHARED" = "yes"; then dnl test for GCC's visibility support (sets CFLAGS_VISIBILITY, which is dnl assigned to CFLAGS and CXXFLAGS below) - WX_VISIBILITY + if test "$wxUSE_VISIBILITY" != "no"; then + WX_VISIBILITY + fi dnl test for Sun CC which can be used under both Solaris and Linux if test "x$SUNCXX" = xyes; then -- 2.47.2