ecore-x: Add immodules directory

Signed-off-by: Naruto TAKAHASHI <tnaruto@gmail.com>
git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/ecore@61258 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/configure.ac b/configure.ac
index 5730fb6..1569955 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -161,6 +161,9 @@ want_ecore_evas_directfb="no"
 want_ecore_evas_fb="no"
 want_ecore_evas_software_16_wince="no"
 
+# ecore_imf modules
+want_ecore_imf_xim="no"
+
 case "$host_os" in
    mingw32ce* | cegcc*)
       want_ecore_con="no"
@@ -214,6 +217,7 @@ case "$host_os" in
       want_ecore_evas_gl_sdl="yes"
       want_ecore_evas_directfb="yes"
       want_ecore_evas_fb="yes"
+      want_ecore_imf_xim="yes"
       ;;
 esac
 
@@ -234,6 +238,7 @@ requirements_ecore_sdl=""
 requirements_ecore_x=""
 requirements_ecore_win32=""
 requirements_ecore_wince=""
+requirements_ecore_imf_xim=""
 
 ### Additional options to configure
 
@@ -1174,6 +1179,20 @@ ECORE_CHECK_MODULE([input], [${want_ecore_input}], [Input])
 ECORE_CHECK_MODULE([input-evas], [${want_ecore_input}], [Input_Evas], [${have_evas}],
    [requirements_ecore_input_evas="ecore-input >= 1.0.0 evas >= 1.0.0 ${requirements_ecore_input}"])
 
+# ecore_imf_xim
+AM_CONDITIONAL(BUILD_ECORE_IMF_XIM, false)
+ecore_imf_xim_deps="no"
+echo "have_ecore_x_xlib: ${have_ecore_x_xlib}"
+if test    "x${have_ecore_imf}" = "xyes" \
+        -a "x${have_ecore_x_xlib}" = "xyes" \
+        -a "x${have_ecore_input}" = "xyes" ; then
+   ecore_imf_xim_deps="yes"
+   AC_DEFINE(BUILD_ECORE_IMF_XIM, 1, [Ecore Imf XIM Support])
+fi
+
+ECORE_CHECK_MODULE([imf-xim], [${want_ecore_imf}], [Imf_XIM], [${ecore_imf_xim_deps}],
+   [requirements_ecore_imf_xim="ecore-imf >= 1.0.0 ecore-x >= 1.0.0 ecore-input >= 1.0.0 ${requirements_ecore_imf_xim}"])
+
 ## Graphic systems
 
 # ecore_x{cb}
@@ -1411,6 +1430,7 @@ AC_SUBST(requirements_ecore_sdl)
 AC_SUBST(requirements_ecore_x)
 AC_SUBST(requirements_ecore_win32)
 AC_SUBST(requirements_ecore_wince)
+AC_SUBST(requirements_ecore_imf_xim)
 
 AC_CONFIG_FILES([
 Makefile
@@ -1458,6 +1478,9 @@ src/lib/ecore_x/xlib/Makefile
 src/lib/ecore_x/xcb/Makefile
 src/examples/Makefile
 src/tests/Makefile
+src/modules/Makefile
+src/modules/immodules/Makefile
+src/modules/immodules/xim/Makefile
 README
 ecore.spec
 $po_makefile_in
@@ -1511,6 +1534,7 @@ if test "x$have_ecore_file" = "xyes" ; then
 fi
 #echo "  Ecore_Config.................: $have_ecore_config (deprecated)"
 echo "  Ecore_IMF....................: $have_ecore_imf"
+echo "    XIM........................: $have_ecore_imf_xim"
 echo "  Ecore_IMF_Evas...............: $have_ecore_imf_evas"
 echo "  Ecore_Input..................: $have_ecore_input"
 echo "  Ecore_Input_Evas.............: $have_ecore_input_evas"

diff --git a/src/Makefile.am b/src/Makefile.am
index d98d3b6..4dd36c3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,3 +1,3 @@
 MAINTAINERCLEANFILES = Makefile.in
 
-SUBDIRS = lib bin tests examples
+SUBDIRS = lib bin tests examples modules

diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
new file mode 100644 (file)
index 0000000..99a1469
--- /dev/null
+++ b/src/modules/Makefile.am
@@ -0,0 +1,3 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS = immodules

diff --git a/src/modules/immodules/Makefile.am b/src/modules/immodules/Makefile.am
new file mode 100644 (file)
index 0000000..6978672
--- /dev/null
+++ b/src/modules/immodules/Makefile.am
@@ -0,0 +1,7 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+SUBDIRS =
+
+if BUILD_ECORE_IMF_XIM
+SUBDIRS += xim
+endif