[cutter-commit 03728] SF.net SVN: cutter:[3734] cutter/trunk

[<ik...@us...>]

Revision: 3734
          http://cutter.svn.sourceforge.net/cutter/?rev=3734&view=rev
Author:   ikezoe
Date:     2010-06-29 02:54:21 +0000 (Tue, 29 Jun 2010)

Log Message:
-----------
check gio.

Modified Paths:
--------------
    cutter/trunk/configure.ac
    cutter/trunk/gcutter/gcut-process.h

Modified: cutter/trunk/configure.ac
===================================================================
--- cutter/trunk/configure.ac	2010-06-29 02:33:34 UTC (rev 3733)
+++ cutter/trunk/configure.ac	2010-06-29 02:54:21 UTC (rev 3734)
@@ -178,6 +178,13 @@
 AM_CONDITIONAL([GLIB_2_12], [test "$glib_2_12" = "yes"])
 
 dnl **************************************************************
+dnl Check for GIO
+dnl **************************************************************
+GIO_REQUIRED=2.16.0
+PKG_CHECK_MODULES(GIO, gio-2.0 >= $GIO_REQUIRED,
+                  [gio_exists=yes], [gio_exists=no])
+
+dnl **************************************************************
 dnl Check for GdkPixbuf
 dnl **************************************************************
 PKG_CHECK_MODULES(GDK_PIXBUF, gdk-pixbuf-2.0,
@@ -699,6 +706,29 @@
 ])
   fi
 
+AC_CONFIG_COMMANDS([cutter/cut-features.h-gio-header],
+[
+  cat <<\_______EOF >> cutter/cut-features.h
+
+/**
+ * CUT_SUPPORT_GIO:
+ *
+ * Shows GIO support is available.
+ */
+_______EOF
+])
+  if test "$gio_exists" = "yes"; then
+AC_CONFIG_COMMANDS([cutter/cut-features.h-gio-enable],
+[
+    echo "#define CUT_SUPPORT_GIO 1" >> cutter/cut-features.h
+])
+  else
+AC_CONFIG_COMMANDS([cutter/cut-features.h-gio-disable],
+[
+    echo "/* #undef CUT_SUPPORT_GIO */" >> cutter/cut-features.h
+])
+  fi
+
 AC_CONFIG_COMMANDS([cutter/cut-features.h-have-c99-stdint-types-header],
 [
   cat <<\_______EOF >> cutter/cut-features.h

Modified: cutter/trunk/gcutter/gcut-process.h
===================================================================
--- cutter/trunk/gcutter/gcut-process.h	2010-06-29 02:33:34 UTC (rev 3733)
+++ cutter/trunk/gcutter/gcut-process.h	2010-06-29 02:54:21 UTC (rev 3734)
@@ -21,6 +21,7 @@
 #define __GCUT_PROCESS_H__
 
 #include <glib-object.h>
+#include <cutter/cut-features.h>
 #include <cutter/cut-test-result.h>
 
 G_BEGIN_DECLS
@@ -349,7 +350,7 @@
  */
 GIOChannel *gcut_process_get_error_channel (GCutProcess *process);
 
-#if GLIB_CHECK_VERSION(2,16,0)
+#ifdef CUT_SUPPORT_GIO
 #include <gio/gio.h>
 /**
  * gcut_process_get_input_stream:
@@ -393,7 +394,7 @@
  */
 GInputStream   *gcut_process_get_error_stream (GCutProcess *process);
 
-#endif /* GLIB_CHECK_VERSION(2,16,0) */
+#endif /* CUT_SUPPORT_GIO */
 
 G_END_DECLS
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.