From e4b06c0a87ef9fdd1987398d712933cf7e41768d Mon Sep 17 00:00:00 2001 From: bangerth Date: Wed, 5 Nov 2008 20:09:09 +0000 Subject: [PATCH] Use -dynamic -install_name instead of -dylib_install_name on Mac OS X. git-svn-id: https://svn.dealii.org/trunk@17478 0785d39b-7218-0410-832d-ea1e28bc413d --- deal.II/aclocal.m4 | 4 ++-- deal.II/common/Make.global_options.in | 2 +- deal.II/configure | 10 +++++----- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/deal.II/aclocal.m4 b/deal.II/aclocal.m4 index 481a5bf438..660c3cfe94 100644 --- a/deal.II/aclocal.m4 +++ b/deal.II/aclocal.m4 @@ -1733,8 +1733,8 @@ AC_DEFUN(DEAL_II_CHECK_LINK_SONAME, dnl Now try the -dylib_install_name thing OLD_LDFLAGS=$LDFLAGS - LDFLAGS="-Wl,-dylib_install_name -Wl,libbase.so.6.2.1 $LDFLAGS -shared" - AC_MSG_CHECKING([whether compiler understands option -Wl,-dylib_install_name]) + LDFLAGS="-Wl,-dynamic,-install_name -Wl,libbase.so.6.2.1 $LDFLAGS -shared" + AC_MSG_CHECKING([whether compiler understands option -Wl,-dynamic,-install_name]) AC_LINK_IFELSE( [ AC_LANG_PROGRAM([[]],[[]])], [ diff --git a/deal.II/common/Make.global_options.in b/deal.II/common/Make.global_options.in index f6ff549c68..4c316eada2 100644 --- a/deal.II/common/Make.global_options.in +++ b/deal.II/common/Make.global_options.in @@ -121,7 +121,7 @@ ifeq (@DEAL_II_LD_UNDERSTANDS_SONAME@,yes) DEAL_II_ADD_SONAME = -Wl,-soname,$(call DEAL_II_SHLIB_NAME,$(1)) else ifeq (@DEAL_II_LD_UNDERSTANDS_DYLIB_INSTALL_NAME@,yes) - DEAL_II_ADD_SONAME = -Wl,-dylib_install_name -Wl,$(call DEAL_II_SHLIB_NAME,$(1)) + DEAL_II_ADD_SONAME = -Wl,-dynamic,-install_name -Wl,$(call DEAL_II_SHLIB_NAME,$(1)) else DEAL_II_ADD_SONAME = endif diff --git a/deal.II/configure b/deal.II/configure index c299d66003..73ddfd6dc1 100755 --- a/deal.II/configure +++ b/deal.II/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 17397 . +# From configure.in Revision: 17475 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.61 for deal.II 6.2.pre. # @@ -11493,7 +11493,7 @@ if test "x$enableshared" = "xyes" ; then ;; esac - case "${GXX-VERSION}" in + case "${GXX_VERSION}" in ibm_xlc* ) SHLIBFLAGS="-qmkshrobj" ;; @@ -11560,9 +11560,9 @@ rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ OLD_LDFLAGS=$LDFLAGS - LDFLAGS="-Wl,-dylib_install_name -Wl,libbase.so.6.2.1 $LDFLAGS -shared" - { echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-dylib_install_name" >&5 -echo $ECHO_N "checking whether compiler understands option -Wl,-dylib_install_name... $ECHO_C" >&6; } + LDFLAGS="-Wl,-dynamic,-install_name -Wl,libbase.so.6.2.1 $LDFLAGS -shared" + { echo "$as_me:$LINENO: checking whether compiler understands option -Wl,-dynamic,-install_name" >&5 +echo $ECHO_N "checking whether compiler understands option -Wl,-dynamic,-install_name... $ECHO_C" >&6; } cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -- 2.39.5