Module: wine Branch: master Commit: 78bd1948a640af9b90f1b32fcabc1692845ebb54 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=78bd1948a640af9b90f1b32f...
Author: Alexandre Julliard julliard@winehq.org Date: Mon Aug 14 20:42:56 2006 +0200
configure: Suppress multiple definitions warnings from the MacOS linker.
---
configure | 14 +++++++++----- configure.ac | 2 +- 2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/configure b/configure index f61d4d0..d8c326a 100755 --- a/configure +++ b/configure @@ -2422,7 +2422,7 @@ # So ignore a value of `no', otherwise t # in a Makefile. We should not override ac_cv_exeext if it was cached, # so that the user can short-circuit this test for compilers unknown to # Autoconf. -for ac_file in $ac_files +for ac_file in $ac_files '' do test -f "$ac_file" || continue case $ac_file in @@ -2450,6 +2450,12 @@ done test "$ac_cv_exeext" = no && ac_cv_exeext=
else + ac_file='' +fi + +{ echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6; } +if test -z "$ac_file"; then echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5
@@ -2461,8 +2467,6 @@ See `config.log' for more details." >&2 fi
ac_exeext=$ac_cv_exeext -{ echo "$as_me:$LINENO: result: $ac_file" >&5 -echo "${ECHO_T}$ac_file" >&6; }
# Check that the compiler produces executables we can run. If not, either # the compiler is broken, or we cross compile. @@ -17077,7 +17081,7 @@ echo "${ECHO_T}$ac_cv_c_dll_macho" >&6; if test "$ac_cv_c_dll_macho" = "yes" then LIBEXT="dylib" - LDDLLFLAGS="-bundle" + LDDLLFLAGS="-bundle -multiply_defined suppress" LDSHARED="$(CC) -dynamiclib -install_name @executable_path/`$(RELPATH) $(bindir) $(libdir)`/$(DYNAME) $(SOVERSION:%=-compatibility_version %)" STRIP="$STRIP -u -r" COREFOUNDATIONLIB="-framework CoreFoundation" @@ -24801,7 +24805,7 @@ current configuration. Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit - -V, --version print version number, then exit + -V, --version print version number and configuration settings, then exit -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions diff --git a/configure.ac b/configure.ac index de11dfa..c5e6bb4 100644 --- a/configure.ac +++ b/configure.ac @@ -1150,7 +1150,7 @@ case $host_os in if test "$ac_cv_c_dll_macho" = "yes" then LIBEXT="dylib" - LDDLLFLAGS="-bundle" + LDDLLFLAGS="-bundle -multiply_defined suppress" LDSHARED="$(CC) -dynamiclib -install_name @executable_path/`$(RELPATH) $(bindir) $(libdir)`/$(DYNAME) $(SOVERSION:%=-compatibility_version %)" STRIP="$STRIP -u -r" dnl declare needed frameworks