[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[E-devel] patch to language module



Hi, all.
How do you do?

Attached is a patch to make language module using exml-config for
search EXML.h and link libexml.so.

Thank you,

Takayuki YAMAGUCHI

--- configure.in.old    2006-09-02 11:39:39.000000000 +0900
+++ configure.in    2006-09-03 15:33:12.400960250 +0900
@@ -131,6 +131,21 @@
])
AC_SUBST(edje_cc)

+AC_ARG_WITH(exml-config,
+[  --with-exml-config=EXML_CONFIG      use exml-config specified ],
+[
+  EXML_CONFIG=$withval;
+  echo "using "$EXML_CONFIG" for exml-config";
+/
+],[
+  PROG="exml-config";
+  AC_PATH_PROG(EXML_CONFIG, $PROG, "", $PATH)
+])
+exml_cflags=`$EXML_CONFIG --cflags`
+exml_libs=`$EXML_CONFIG --libs`
+AC_SUBST(exml_cflags)
+AC_SUBST(exml_libs)
+
AC_ARG_WITH(enlightenment-config,
[  --with-enlightenment-config=E_CONFIG    use enlightenment-config
specified ],
[
@@ -147,8 +162,6 @@
AC_SUBST(e_libs)
AC_SUBST(e_modules)--- src/module/Makefile.am.old  2006-05-18
07:26:00.000000000 +0900
+++ src/module/Makefile.am  2006-09-03 15:39:06.675101000 +0900
@@ -1,7 +1,7 @@
INCLUDES       = -I. \
             -I$(top_srcdir) \
             -I$(includedir) \
-             @e_cflags@
+             @e_cflags@ @exml_cflags@

pkgdir         = $(datadir)/$(MODULE_ARCH)
pkg_LTLIBRARIES        = module.la
@@ -13,7 +13,7 @@
             e_mod_keybindings.h \
             e_mod_lang.c \
             e_mod_lang.h
-module_la_LIBADD   = @e_libs@ -lexml -lxkbfile -lX11
+module_la_LIBADD   = @e_libs@ @exml_libs@ -lxkbfile -lX11
module_la_LDFLAGS  = -module -avoid-version
module_la_DEPENDENCIES = $(top_builddir)/config.h


-AC_CHECK_HEADERS(EXML.h,, AC_MSG_ERROR([Cannot find EXML.h. Make sure
your CFLAGS environment variable contains include lines for the
location of this file and EXML lib is installed]))
-
AC_CHECK_HEADERS(X11/XKBlib.h,, AC_MSG_ERROR([Cannot find XKBlib.h.
Make sure your CFLAGS environment variable contains include lines for
the location of this file.]))

AC_CHECK_HEADERS(X11/extensions/XKBrules.h,, AC_MSG_ERROR([Cannot
find XKBrules.h. Make sure your CFLAGS environment variable contains
include lines for the location of this file.]))