compilation fix for wxUSE_DATAOBJ == 0

[wxWidgets.git] / configure.in

diff --git a/configure.in b/configure.in
index 84583ed3347299421285fe358d3ea2d72e6c6173..ae5b076c90337cf255e365f49e5e886e646b2521 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2767,6 +2767,7 @@ equivalent variable and GTK+ is version 1.2.3 or above.
                 )
                 PKG_CHECK_MODULES(PANGOXFT, pangoxft,
                     [
+                        AC_DEFINE(HAVE_PANGO_XFT)
                         CXXFLAGS="$CXXFLAGS $PANGOXFT_CFLAGS"
                         GUI_TK_LIBRARY="$GUI_TK_LIBRARY $PANGOXFT_LIBS"
                     ],
@@ -4662,7 +4663,7 @@ if test "$WXGTK20" = 1; then
                 PKG_CHECK_MODULES(LIBGNOMEPRINTUI, 
                                   [libgnomeprintui-2.2 >= 2.8],
                     [
-                        EXTRALIBS_GNOMEPRINT="$LIBGNOMEPRINTUI_LIBS"
+dnl                     EXTRALIBS_GNOMEPRINT="$LIBGNOMEPRINTUI_LIBS"
                         CXXFLAGS="$CXXFLAGS $LIBGNOMEPRINTUI_CFLAGS"
                         AC_DEFINE(wxUSE_LIBGNOMEPRINT)
                     ],
@@ -6162,8 +6163,8 @@ else
             dnl pragmas:
             GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
             ;;
-        *-*-mingw32* | *-pc-os2_emx | *-pc-os2-emx )
-            dnl MinGW and Innotek's GCC versions >= 3.2 have problems with
+        *-*-mingw32* )
+            dnl MinGW GCC versions >= 3.2 have problems with
             dnl static member of classes derived from templates
             dnl in combination with #pragma interface/implementation
             dnl (the test case uses 4 files)
@@ -6172,7 +6173,23 @@ else
             if test "$wxUSE_STL" = "yes" -o \
                     "$wxUSE_NO_EXCEPTIONS" != "yes" -o \
                     "$wxUSE_NO_RTTI" != "yes"; then
-               AC_MSG_CHECKING([if this compiler version needs -DNO_GCC_PRAGMA])
+               AC_MSG_CHECKING([if this MinGW version needs -DNO_GCC_PRAGMA])
+               AC_TRY_COMPILE([],
+                              [#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
+                               #error "Not GCC 3.2 or greater"
+                               #endif
+                               ],
+                              [GCC_PRAGMA_FLAGS="-DNO_GCC_PRAGMA"
+                               AC_MSG_RESULT([yes])],
+                              [AC_MSG_RESULT([no])])
+            fi
+            ;;
+       *-pc-os2_emx | *-pc-os2-emx )
+            dnl GCC versions ported to OS/2 have similar problems with
+            dnl static member of classes in combination with STL and
+            dnl pragma interface/implementation
+            if test "$wxUSE_STL" = "yes"; then
+               AC_MSG_CHECKING([if this gcc version needs -DNO_GCC_PRAGMA])
                AC_TRY_COMPILE([],
                               [#if !(__GNUC__ > 3 || (__GNUC__ == 3 && __GNUC_MINOR__ >= 2))
                                #error "Not GCC 3.2 or greater"