]> git.saurik.com Git - wxWidgets.git/blobdiff - configure.in
rebaked after adding src/tiff/tif_color.c
[wxWidgets.git] / configure.in
index 8883bbb10eb222d6cb071c19189857984ee9a0ea..31f0dbad54734fc2d8393df8d9796a8ed09c844f 100644 (file)
@@ -1737,6 +1737,10 @@ AC_CACHE_CHECK([for va_copy],
                 va_copy(ap2, ap1);
                 va_end(ap2);
                 va_end(ap1);
+            }
+            int main()
+            {
+                return foo("hi", 17);
             }],
             wx_cv_func_va_copy=yes,
             wx_cv_func_va_copy=no
@@ -2539,7 +2543,27 @@ equivalent variable and GTK+ is version 1.2.3 or above.
             save_LIBS="$LIBS"
             CFLAGS="$CFLAGS $GTK_CFLAGS"
             LIBS="$LIBS $GTK_LIBS"
+            
             AC_CHECK_FUNCS([pango_font_family_is_monospace])
+            
+            dnl test if we have at least GTK+ 2.4:
+            AC_MSG_CHECKING([if GTK+ is version >= 2.4])
+            AC_TRY_COMPILE([
+                            #include <gtk/gtk.h>
+                           ],
+                           [
+                            #if !GTK_CHECK_VERSION(2,4,0)
+                            #error "Not GTK+ 2.4"
+                            #endif
+                           ],
+                           [
+                            AC_DEFINE(__WXGTK24__)
+                            AC_MSG_RESULT([yes])
+                           ],
+                           [
+                            AC_MSG_RESULT([no])
+                           ])
+            
             CFLAGS="$save_CFLAGS"
             LIBS="$save_LIBS"
         else
@@ -4635,7 +4659,8 @@ if test "$WXGTK20" = 1; then
     if test "$wxUSE_PRINTING_ARCHITECTURE" = "yes" ; then
         if test "$wxUSE_LIBGNOMEPRINT" = "yes" ; then
         
-                PKG_CHECK_MODULES(LIBGNOMEPRINTUI, libgnomeprintui-2.2,
+                PKG_CHECK_MODULES(LIBGNOMEPRINTUI, 
+                                  [libgnomeprintui-2.2 >= 2.8],
                     [
                         EXTRALIBS_GNOMEPRINT="$LIBGNOMEPRINTUI_LIBS"
                         CXXFLAGS="$CXXFLAGS $LIBGNOMEPRINTUI_CFLAGS"