From: Francesco M. <fr...@us...> - 2008-01-14 23:30:24
|
Update of /cvsroot/wxlua/wxLua In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv30427 Modified Files: configure Log Message: add to the linker the -rpath flag only under Unix Index: configure =================================================================== RCS file: /cvsroot/wxlua/wxLua/configure,v retrieving revision 1.72 retrieving revision 1.73 diff -C2 -d -r1.72 -r1.73 *** configure 14 Jan 2008 22:28:18 -0000 1.72 --- configure 14 Jan 2008 23:30:20 -0000 1.73 *************** *** 767,770 **** --- 767,771 ---- COND_PLATFORM_MACOSX_1 COND_PLATFORM_MACOSX_1_USE_SOVERSION_1 + COND_PLATFORM_MAC_0 COND_PLATFORM_MAC_1 COND_PLATFORM_OS2_1 *************** *** 4801,4804 **** --- 4802,4811 ---- + # NOTE: -rpath is not supported by Mac's ld linker! + if test "SHARED" = "1" -a "PLATFORM_UNIX" = "1"; then + RPATH_FLAGS="-Wl,-rpath,../lib" + fi + + # check for Lua # *************** *** 10008,10012 **** ! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.2" --- 10015,10019 ---- ! BAKEFILE_AUTOCONF_INC_M4_VERSION="0.2.3" *************** *** 10294,10297 **** --- 10301,10309 ---- fi + COND_PLATFORM_MAC_0="#" + if test "x$PLATFORM_MAC" = "x0" ; then + COND_PLATFORM_MAC_0="" + fi + COND_PLATFORM_MAC_1="#" if test "x$PLATFORM_MAC" = "x1" ; then *************** *** 11428,11431 **** --- 11440,11444 ---- COND_PLATFORM_MACOSX_1!$COND_PLATFORM_MACOSX_1$ac_delim COND_PLATFORM_MACOSX_1_USE_SOVERSION_1!$COND_PLATFORM_MACOSX_1_USE_SOVERSION_1$ac_delim + COND_PLATFORM_MAC_0!$COND_PLATFORM_MAC_0$ac_delim COND_PLATFORM_MAC_1!$COND_PLATFORM_MAC_1$ac_delim COND_PLATFORM_OS2_1!$COND_PLATFORM_OS2_1$ac_delim *************** *** 11469,11473 **** COND_USE_SOVERLINUX_1!$COND_USE_SOVERLINUX_1$ac_delim COND_USE_SOVERSION_0!$COND_USE_SOVERSION_0$ac_delim - COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim _ACEOF --- 11482,11485 ---- *************** *** 11511,11514 **** --- 11523,11527 ---- for ac_last_try in false false false false false :; do cat >conf$$subs.sed <<_ACEOF + COND_USE_SOVERSOLARIS_1!$COND_USE_SOVERSOLARIS_1$ac_delim COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1!$COND_USE_WXBINDSTC_1_USE_WXLUAAPP_1_USE_WXLUADEBUG_1$ac_delim COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1!$COND_USE_WXBINDSTC_1_USE_WXLUAEDITAPP_1$ac_delim *************** *** 11526,11530 **** _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 13; then break elif $ac_last_try; then --- 11539,11543 ---- _ACEOF ! if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 14; then break elif $ac_last_try; then |