Mailing-List: contact commits-help@apr.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@apr.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r591472 - /apr/apr/branches/1.2.x/configure.in
Date: Fri, 02 Nov 2007 21:25:17 -0000
To: commits@apr.apache.org
From: wrowe@apache.org
Message-Id: <20071102212517.777041A9832@eris.apache.org>

Author: wrowe
Date: Fri Nov  2 14:25:16 2007
New Revision: 591472

URL: http://svn.apache.org/viewvc?rev=591472&view=rev
Log:
On Darwin 9.0 the NSLoad... dyld API is deprecated; use dlopen.

On HPUX 64bit PA-RISC or IA64... shl_ API is deprecated; use dlopen.
(Unless we can't in which case we'll jump on shl at the end.)

Heck, we can even shortcircuit os2's detection phase, it's custom.

Backport: 591191


Modified:
    apr/apr/branches/1.2.x/configure.in

Modified: apr/apr/branches/1.2.x/configure.in
URL: http://svn.apache.org/viewvc/apr/apr/branches/1.2.x/configure.in?rev=591472&r1=591471&r2=591472&view=diff
==============================================================================
--- apr/apr/branches/1.2.x/configure.in (original)
+++ apr/apr/branches/1.2.x/configure.in Fri Nov  2 14:25:16 2007
@@ -1447,11 +1447,26 @@
   ], [dsotype=any])
 
 if test "$dsotype" = "any"; then
-    # Darwin:
-    AC_CHECK_FUNC(NSLinkModule, [dsotype=dyld])
     if test "$dsotype" = "any"; then
-      # Original HP-UX:
-      AC_CHECK_LIB(dld, shl_load, [dsotype=shl; APR_ADDTO(LIBS,-ldld)])
+      case $host in
+        *darwin[0-8]\.*) 
+          # Original Darwin, not for 9.0!:
+          AC_CHECK_FUNC(NSLinkModule, [dsotype=dyld]);;
+        *-hpux[1-9]\.*|*-hpux1[01]*)
+          # shl is specific to hpux(?), and is suboptimal for 64 bit builds,
+          # and most unlikely to be the choice of 12.x developers.
+          AC_CHECK_LIB(dld, shl_load, [have_shl=1])
+          if test "$ac_cv_sizeof_voidp$have_shl" = "41"; then
+            dsotype=shl; APR_ADDTO(LIBS,-ldld)
+          fi;;
+        *-os2*)
+          # several 'other's below probably belong up here.  If they always
+          # use a platform implementation and shouldn't test the dlopen/dlfcn
+          # features, then bring them up here.
+          # But if they -should- optionally use dlfcn, and/or need the config
+          # detection of dlopen/dlsym, do not move them up.
+          dsotype=other ;;
+      esac
     fi
     # Normal POSIX:
     if test "$dsotype" = "any"; then
@@ -1475,7 +1490,13 @@
     # Everything else:
     if test "$dsotype" = "any"; then
         case $host in
-        *os390|*-os2*|*os400|*-aix*) dsotype=other ;;
+        *os390|*os400|*-aix*)
+          # Some -aix5 will use dl, no hassles.  Keep that pattern here.
+          dsotype=other ;;
+        *-hpux*)
+          if test "$have_shl" = "1"; then
+            dsotype=shl; APR_ADDTO(LIBS,-ldld)
+          fi;;
         esac
     fi
 fi