toplevel creation respecting wxDefaultPosition again

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index b9a750e3736df5d91f0c78a7713d619e2db63223..5cb9a44fc7379d4f73e8ed820b4d220019bf8739 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3395,8 +3395,8 @@ WX_LIBRARY_BASENAME_GUI="wx_${TOOLKIT_DIR}${TOOLKIT_VERSION}${WIDGET_SET}${lib_u
 if test "$wxUSE_MAC" = 1 -o "$wxUSE_COCOA" = 1; then
     dnl base name of the resource file for wxMac must be the same
     dnl as library installation base name (-install_name)
-    WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${WX_CURRENT}.r"
-    WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${WX_CURRENT}.rsrc"
+    WX_RESOURCES_MACOSX_ASCII="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.r"
+    WX_RESOURCES_MACOSX_DATA="libwx_${TOOLCHAIN_NAME}.${wx_release_number}.rsrc"
 
     dnl add the resources target for wxMac
     LIBWXMACRES="\$(top_builddir)lib/${WX_RESOURCES_MACOSX_ASCII}"
@@ -4586,8 +4586,9 @@ if test "$WXGTK20" = 1; then
         
                 PKG_CHECK_MODULES(LIBGNOMEPRINTUI, libgnomeprintui-2.2,
                     [
+                        EXTRALIBS_GNOMEPRINT="$LIBGNOMEPRINTUI_LIBS"
                         CXXFLAGS="$CXXFLAGS $LIBGNOMEPRINTUI_CFLAGS"
-                        GUI_TK_LIBRARY="$GUI_TK_LIBRARY $LIBGNOMEPRINTUI_LIBS"
+                        AC_DEFINE(wxUSE_LIBGNOMEPRINT)
                     ],
                     [
                         AC_MSG_WARN([libgnomeprintui not found, library will use standard PostScript printing])