[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kde-common/admin
From:       David Faure <faure () kde ! org>
Date:       2005-01-18 9:52:36
Message-ID: 20050118095236.99C241CF9E () office ! kde ! org
[Download RAW message or body]

CVS commit by faure: 

Patch by Benjamin Reed <ranger@befunk.com> for darwin.
"Equivalent code is already in later versions of libtool, just not in the 
version provided with KDE's admin tree."


  M +39 -6     libtool.m4.in   1.85


--- kde-common/admin/libtool.m4.in  #1.84:1.85
@@ -2561,8 +2561,19 @@
     case "$host_os" in
     rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
       ;;
     *) # Darwin 1.3 on
-      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, \
$1)='-flat_namespace -undefined suppress' +      if test -z \
${MACOSX_DEPLOYMENT_TARGET} ; then +        allow_undefined_flag='-Wl,-flat_namespace \
-Wl,-undefined -Wl,suppress' +      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[012])
+            allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+            ;;
+          10.*)
+            allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+            ;;
+        esac
+      fi
       ;;
     esac
@@ -2873,8 +2884,19 @@
     case "$host_os" in
     rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
       ;;
     *) # Darwin 1.3 on
-      test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, \
$1)='-flat_namespace -undefined suppress' +      if test -z \
${MACOSX_DEPLOYMENT_TARGET} ; then +        allow_undefined_flag='-Wl,-flat_namespace \
-Wl,-undefined -Wl,suppress' +      else
+        case ${MACOSX_DEPLOYMENT_TARGET} in
+          10.[012])
+            allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+            ;;
+          10.*)
+            allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+            ;;
+        esac
+      fi
       ;;
     esac
@@ -5313,8 +5335,19 @@
       case "$host_os" in
       rhapsody* | darwin1.[[012]])
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
+        _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
         ;;
       *) # Darwin 1.3 on
-        test -z ${LD_TWOLEVEL_NAMESPACE} && _LT_AC_TAGVAR(allow_undefined_flag, \
$1)='-flat_namespace -undefined suppress' +        if test -z \
${MACOSX_DEPLOYMENT_TARGET} ; then +          \
allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress' +        else
+          case ${MACOSX_DEPLOYMENT_TARGET} in
+            10.[012])
+              allow_undefined_flag='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+              ;;
+            10.*)
+              allow_undefined_flag='-Wl,-undefined -Wl,dynamic_lookup'
+              ;;
+          esac
+        fi
         ;;
       esac


[prev in list] [next in list] [prev in thread] [next in thread]