From 63d798fdb6730707e063c7553d3f4848ed07b442 Mon Sep 17 00:00:00 2001 From: Robert Roebling Date: Thu, 1 Jan 2009 22:04:17 +0000 Subject: [PATCH] Correct wx-config's output of base libs for OSX ports (don't include the _carbon/_cocoa) git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@57707 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- configure.in | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/configure.in b/configure.in index 078d229273..dbd48c51cf 100644 --- a/configure.in +++ b/configure.in @@ -3900,7 +3900,12 @@ fi dnl library link name dnl These just save us from exporting lib_{unicode,debug,flavour}_suffix. dnl If we ever need to do that, we won't need to keep these. -WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" + +if test "$wxUSE_OSX_CARBON" = 1 -o "$wxUSE_OSX_COCOA" = 1 -o "$wxUSE_COCOA" = 1; then + WX_LIBRARY_BASENAME_NOGUI="wx_base${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" +else + WX_LIBRARY_BASENAME_NOGUI="wx_base${WXBASEPORT}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" +fi if test "${TOOLKIT_DIR}" = "os2"; then WX_LIBRARY_BASENAME_GUI="wx_pm${WIDGET_SET}${lib_unicode_suffix}${lib_debug_suffix}${WX_LIB_FLAVOUR}" else -- 2.47.2