fix for build on hardy

git-svn-id: svn://localhost/trunk@40 79bd180b-0a32-48ee-ac55-ada8cae9df61

diff --git a/configure.ac b/configure.ac
index df50777..5c64172 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,8 @@ AM_GNU_GETTEXT([external])
 AM_GNU_GETTEXT_VERSION(0.17)
 
 # Init libtool
-LT_INIT([disable-static])
+LT_INIT
+AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 
 # Checks for programs.
@@ -37,6 +38,11 @@ AC_SUBST(UNIKEY_CURRENT)
 AC_SUBST(UNIKEY_REVISION)
 AC_SUBST(UNIKEY_AGE)
 
+PKG_CHECK_MODULES(GIO, [
+    gio-2.0
+])
+AC_SUBST(GIO)
+
 PKG_CHECK_MODULES(SCIM,[scim >= $SCIM_VERSION])
 AC_SUBST(SCIM_VERSION)
 

diff --git a/setup/Makefile.am b/setup/Makefile.am
index c2b3c3b..3a636a8 100644 (file)
--- a/setup/Makefile.am
+++ b/setup/Makefile.am
@@ -1,12 +1,12 @@
 if SCIM_BUILD_SETUP
 
 INCLUDES = \
-       -I$(top_srcdir)/ukengine \
-       -I$(top_srcdir)/src \
-       -DSCIM_ICONDIR=\"@SCIM_ICONDIR@\" \
-       -DSCIM_UNIKEY_VERSION=\"@PACKAGE_VERSION@\" \
-       -DGLADE_DATA_DIR=\"$(pkgdatadir)/setup\" \
-       -DLOCALEDIR=\"$(localedir)\" \
+    -I$(top_srcdir)/ukengine \
+    -I$(top_srcdir)/src \
+    -DSCIM_ICONDIR=\"@SCIM_ICONDIR@\" \
+    -DSCIM_UNIKEY_VERSION=\"@PACKAGE_VERSION@\" \
+    -DGLADE_DATA_DIR=\"$(pkgdatadir)/setup\" \
+    -DLOCALEDIR=\"$(localedir)\" \
     -DLIBEXECDIR=\"$(libexecdir)\" \
     -Wall
 
@@ -35,12 +35,14 @@ scim_setup_unikey_SOURCES = \
 
 scim_setup_unikey_CXXFLAGS = \
     @SCIM_GTKUTILS_CFLAGS@ \
-    @SCIM_CFLAGS@
+    @SCIM_CFLAGS@ \
+    @GIO_CFLAGS@
 
 scim_setup_unikey_LDFLAGS = \
-       @SCIM_GTKUTILS_LIBS@ \
+    @SCIM_GTKUTILS_LIBS@ \
     @SCIM_LIBS@ \
-       $(top_builddir)/ukengine/libunikey-scim.la
+    @GIO_LIBS@ \
+    $(top_builddir)/ukengine/libunikey-scim.la
 
 
 # helper module: for launch setup

diff --git a/setup/dlg_main_setup.cpp b/setup/dlg_main_setup.cpp
index fc24144..4a40dde 100644 (file)
--- a/setup/dlg_main_setup.cpp
+++ b/setup/dlg_main_setup.cpp
@@ -1,3 +1,4 @@
+#include <gio/gio.h>
 #include <gtk/gtk.h>
 
 #include "dlg_macro_table.h"
@@ -197,7 +198,7 @@ void macro_edit_button_cb(GtkButton* btn, gpointer user_data)
         GFile* f = g_file_get_parent(g_file_new_for_path(macrofile));
         if (g_file_query_exists(f, NULL) == FALSE)
         {
-            g_file_make_directory_with_parents(f, NULL, NULL);
+            g_file_make_directory(f, NULL, NULL);
         }
         g_object_unref(f);