From f2010568096b811fcbfa4933d82dba399f350820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=A1clav=20Slav=C3=ADk?= <vslavik@fastmail.fm>
Date: Sat, 29 May 2004 13:57:15 +0000
Subject: [PATCH] fixed --disable-rpath handling (patch 956695)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@27497 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 configure    | 2 +-
 configure.in | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
index d3b85bd82d..64649256ac 100755
--- a/configure
+++ b/configure
@@ -3083,7 +3083,7 @@ if test "${enable_rpath+set}" = set; then
 fi
 
 
-if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable"; then
+if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable" -a "$wxRPATH_DIR" != "no"; then
    WXCONFIG_RPATH="-Wl,-rpath -Wl,$wxRPATH_DIR"
 fi
 
diff --git a/configure.in b/configure.in
index ed5bc0b58d..7c56f9c11d 100644
--- a/configure.in
+++ b/configure.in
@@ -758,7 +758,7 @@ WX_ARG_ENABLE(compat22,      [  --disable-compat22      disable wxWindows 2.2 co
 
 AC_ARG_ENABLE(rpath,         [  --enable-rpath=DIR      output the rpath flag from wx-config], [wxRPATH_DIR="$enableval"])
 
-if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable"; then
+if test "$wxRPATH_DIR" != "" -a "$wxRPATH_DIR" != "disable" -a "$wxRPATH_DIR" != "no"; then
    WXCONFIG_RPATH="-Wl,-rpath -Wl,$wxRPATH_DIR"
 fi