disable rpath option.

git-svn-id: file:///svn/unbound/trunk@674 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/configure.ac b/configure.ac
index 0c3f895010b96b081b5ea2a183d5fffc6d271827..2210f5bc7f9ab482448f48cba79d2b87e19b8ac0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -365,6 +365,12 @@ fi
 
 CHECK_YYUNPUT
 
+# add option to disable the evil rpath
+dnl Check whether to use rpath or not
+AC_ARG_ENABLE(rpath,
+        [  --disable-rpath         disable hardcoded rpath (default=enabled)],
+       enable_rpath=$enableval, enable_rpath=yes)
+
 # Checks for libraries.
 AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname],
                                     [enable SSL (will check /usr/local/ssl
@@ -392,7 +398,9 @@ AC_ARG_WITH(ssl, AC_HELP_STRING([--with-ssl=pathname],
             AC_MSG_RESULT(found in $ssldir)
             HAVE_SSL=yes
             LDFLAGS="$LDFLAGS -L$ssldir/lib";
-           RUNTIME_PATH="$RUNTIME_PATH -R$ssldir/lib"
+           if test "x$enable_rpath" = xyes; then
+               RUNTIME_PATH="$RUNTIME_PATH -R$ssldir/lib"
+           fi
             AC_CHECK_LIB(crypto, HMAC_CTX_init,, [
                     AC_MSG_ERROR([OpenSSL found in $ssldir, but version 0.9.7 or higher is required])
                 ])
@@ -473,7 +481,9 @@ many outgoing ports.  ])
         else
             AC_MSG_RESULT(found in $thedir)
             LDFLAGS="$LDFLAGS -L$thedir/lib";
-           RUNTIME_PATH="$RUNTIME_PATH -R$thedir/lib"
+           if test "x$enable_rpath" = xyes; then
+               RUNTIME_PATH="$RUNTIME_PATH -R$thedir/lib"
+           fi
         fi
        AC_SUBST(RUNTIME_PATH)
        AC_SEARCH_LIBS(event_set, [event])

diff --git a/doc/Changelog b/doc/Changelog
index fa92e53361e644bf81420cd7664d72139a8c0149..918540252e2f84b7a1dbc7e7e485919d777da2b4 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,7 @@
+8 October 2007: Wouter
+       - --disable-rpath option in configure for 64bit systems with
+         several dynamic lib dirs.
+
 7 October 2007: Wouter
        - fixup tests for no AD bit in non-DO queries.
        - test that makes sure AD bit is not set on non-DO query.