Author: ek.kato
Date: Mon Jan  7 01:10:37 2008
New Revision: 5116

Modified:
  trunk/gtk/Makefile.am

Log:
* gtk/Makefile.am : Check existence of gtk-query-immodules-2.0
 before execution.


Modified: trunk/gtk/Makefile.am
==============================================================================
--- trunk/gtk/Makefile.am       (original)
+++ trunk/gtk/Makefile.am       Mon Jan  7 01:10:37 2008
@@ -52,21 +52,34 @@
              echo "******************************************************"; \
            fi \
          else \
-           $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \
- GTK_PATH=$(uim_gtk_im_module_path) gtk-query-immodules-2.0 > $(uim_gtk_im_module_file); \
-           echo "********************************************************"; \
-           echo "You need to set"; \
-           echo "GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
-           echo "environment variable to use this module."; \
-           echo "********************************************************"; \
+           if type gtk-query-immodules-2.0 > /dev/null 2>&1; then \
+             $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \
+ GTK_PATH=$(uim_gtk_im_module_path) gtk-query-immodules-2.0 > $(uim_gtk_im_module_file); \
+             echo "******************************************************"; \
+             echo " You need to set"; \
+             echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
+             echo " environment variable to use this module."; \
+             echo "******************************************************"; \
+           else \
+             echo "********************** Warning ***********************"; \
+             echo " gtk-query-immodules-2.0 not found"; \
+             echo " Please make be sure to update"; \
+             echo " \"$(uim_gtk_im_module_file)\""; \
+             echo " manually, and set"; \
+             echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \
+             echo " environment variable to use this module."; \
+             echo "******************************************************"; \
+           fi \
          fi \
        fi
uninstall-hook:
        if test -z $(DESTDIR); then \
-         if test $(libdir) = $(GTK_LIBDIR); then \
-           gtk-query-immodules-2.0 > `$(GTK_RC_GET_IMMODULE_FILE)`; \
-         else \
- GTK_PATH=$(uim_gtk_im_module_path) gtk-query-immodules-2.0 > $(uim_gtk_im_module_file); \
+         if type gtk-query-immodules-2.0 > /dev/null 2>&1; then \
+           if test $(libdir) = $(GTK_LIBDIR); then \
+             gtk-query-immodules-2.0 > `$(GTK_RC_GET_IMMODULE_FILE)`; \
+           else \
+ GTK_PATH=$(uim_gtk_im_module_path) gtk-query-immodules-2.0 > $(uim_gtk_im_module_file); \
+           fi \
          fi \
        fi
else

Reply via email to