Make the runtime path hack a little more portable, even though it is the

wrong way to check this.

Submitted by:	Justin Erenkrantz

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89076 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/acinclude.m4 b/acinclude.m4
index 01f542401eca8fbba332918bdeef51c312df27ce..755c00aad098d29df4db92ace8b7cd176b7d39dd 100644 (file)
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -444,8 +444,8 @@ if test "x$ap_ssltk_base" = "x"; then
   fi
   if test "x$ap_ssltk_libdir" != "x/usr/lib"; then
     APR_ADDTO(LIBS, [-L$ap_ssltk_libdir])
-    if test "x$ap_platform_needs_R" = "xyes"; then
-      APR_ADDTO(LIBS, [-R$ap_ssltk_libdir])
+    if test "x$ap_platform_runtime_link_flag" != "x"; then
+      APR_ADDTO(LIBS, [$ap_platform_runtime_link_flag$ap_ssltk_libdir])
     fi
   fi
   APR_ADDTO(LIBS, [-lssl -lcrypto])

diff --git a/hints.m4 b/hints.m4
index 3187d05399c322360861e77b654bf386ef21a3a9..2239c5c68488adad0662dd05448d4daaf163deba 100644 (file)
--- a/hints.m4
+++ b/hints.m4
@@ -58,7 +58,8 @@ dnl   ;;
         APR_SETVAR(SINGLE_LISTEN_UNSERIALIZED_ACCEPT, [1])
         ;;
     *-solaris2*)
-        ap_platform_needs_R="yes"
+        dnl  This is a hack -- we should be using AC_TRY_RUN instead
+        ap_platform_runtime_link_flag="-R"
         ;;
   esac