diff options
| author | Björn Jacke <bj@sernet.de> | 2010-07-20 19:48:39 +0200 |
|---|---|---|
| committer | Björn Jacke <bj@sernet.de> | 2010-07-22 15:51:36 +0200 |
| commit | c75106fd3ab3715af190dbbdeda9809a019edaac (patch) | |
| tree | fc5cec1955dfa5520b6435f2a930d03134997090 | |
| parent | 61cfbf342fb508477bd45ed8378af7ba6f147727 (diff) | |
| download | samba-c75106fd3ab3715af190dbbdeda9809a019edaac.tar.gz samba-c75106fd3ab3715af190dbbdeda9809a019edaac.tar.bz2 samba-c75106fd3ab3715af190dbbdeda9809a019edaac.zip | |
s3: not use as-needed by default and auto use if enable-developer is active
as discussed on samba-technical, we don't want people out there to use it
unwittingly by default. However by enabling it when enable-developer is used we
make sure that we don't break the feature.
| -rw-r--r-- | source3/configure.in | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source3/configure.in b/source3/configure.in index b99a004a68..26e98f5333 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -1800,9 +1800,16 @@ fi AC_MSG_RESULT($BLDSHARED) +if test x"$enable_developer" = x"yes" ; then + default_as_needed=auto +else + default_as_needed=no +fi AC_ARG_ENABLE(as-needed, - [AS_HELP_STRING([--enable-as-needed], - [Turn on as-needed support if available (default=auto)])]) + AS_HELP_STRING([--enable-as-needed], + [Turn on as-needed support if available (default=no)]), + [enable_as_needed=$enableval], + [enable_as_needed=$default_as_needed]) if test "x$enable_as_needed" != xno; then saved_before_as_needed_ldflags="$LDFLAGS" for flags in "-Wl,--as-needed" "-Wl,-z,ignore" "-z ignore" ; do @@ -1819,7 +1826,7 @@ if test "x$enable_as_needed" != xno; then done fi -if test x$ld_as_needed_flag_found = xyes ; then +if test x$ld_as_needed_flag_found = xyes -a x$enable_as_needed = xauto ; then # check if ld has bug described in https://bugzilla.samba.org/show_bug.cgi?id=7209#c17 AC_MSG_CHECKING([if $LD_AS_NEEDED_FLAG has explicit external libs bug]) cat > conftest_shb.c <<END |