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
This commit is contained in:
2
configure
vendored
2
configure
vendored
@@ -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
|
||||
|
||||
|
@@ -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
|
||||
|
||||
|
Reference in New Issue
Block a user