Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added --enable-rpath=dir that will cause the -rpath linker commands to

Browse Source 
be output by wx-config --libs


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16333 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robin Dunn
2002-07-31 02:50:40 +00:00
parent 79683a1326
commit 3bd8fb5f02
3 changed files with 740 additions and 716 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1416
configure vendored
View File

File diff suppressed because it is too large Load Diff

8
configure.in
View File

@@ -737,6 +737,13 @@ WX_ARG_ENABLE(no_deps, [ --enable-no_deps create code without depe
WX_ARG_ENABLE(compat20, [ --enable-compat20 enable wxWindows 2.0 compatibility], WXWIN_COMPATIBILITY_2) WX_ARG_ENABLE(compat20, [ --enable-compat20 enable wxWindows 2.0 compatibility], WXWIN_COMPATIBILITY_2)
WX_ARG_ENABLE(compat22, [ --disable-compat22 disable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2) WX_ARG_ENABLE(compat22, [ --disable-compat22 disable wxWindows 2.2 compatibility], WXWIN_COMPATIBILITY_2_2)
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
WXCONFIG_RPATH="-Wl,-rpath -Wl,$wxRPATH_DIR"
fi
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
dnl (small) optional non GUI classes dnl (small) optional non GUI classes
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
@@ -4973,6 +4980,7 @@ AC_SUBST(WXCONFIG_LIBS_GL)
AC_SUBST(WXCONFIG_LIBS_STATIC) AC_SUBST(WXCONFIG_LIBS_STATIC)
AC_SUBST(WXCONFIG_LIBS_STATIC_GL) AC_SUBST(WXCONFIG_LIBS_STATIC_GL)
AC_SUBST(WXCONFIG_INCLUDE) AC_SUBST(WXCONFIG_INCLUDE)
AC_SUBST(WXCONFIG_RPATH)
dnl the list of files to compile/install dnl the list of files to compile/install
AC_SUBST(ALL_OBJECTS) AC_SUBST(ALL_OBJECTS)

4
wx-config.in
View File

@@ -104,9 +104,9 @@ while test $# -gt 0; do
fi fi
if test $static_flag = yes ; then if test $static_flag = yes ; then
echo "$libs @LDFLAGS@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@" echo "$libs @LDFLAGS@ @WXCONFIG_RPATH@ @libdir@/@WXCONFIG_LIBS_STATIC@ @LIBS@ @DMALLOC_LIBS@"
else else
echo $libs @LDFLAGS@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@ echo $libs @LDFLAGS@ @WXCONFIG_RPATH@ @WXCONFIG_LIBS@ @DMALLOC_LIBS@
fi fi
;; ;;