Author: ek.kato
Date: Sun Mar 9 08:40:35 2008
New Revision: 5287
Modified:
trunk/m4/wnn.m4
trunk/uim/Makefile.am
Log:
* m4/wnn.m4 (WNN_LIBADD) : New.
* uim/Makefile.am (libuim_wnn_la_LIBADD) : Add WNN_LIBADD.
Modified: trunk/m4/wnn.m4
==============================================================================
--- trunk/m4/wnn.m4 (original)
+++ trunk/m4/wnn.m4 Sun Mar 9 08:40:35 2008
@@ -35,7 +35,7 @@
if test x"$use_wnn" = "xno"; then
AC_CHECKING(libwnn requires libcrypt)
AC_CHECK_HEADERS([jllib.h],
- [AC_CHECK_LIB(wnn, jl_connect_lang, use_wnn=yes, use_wnn=no, -lcrypt)
+ [AC_CHECK_LIB(wnn, jl_connect_lang, [use_wnn=yes
WNN_LIBADD="-lcrypt"], use_wnn=no, -lcrypt)
], [use_wnn="no"], [])
fi
@@ -51,4 +51,5 @@
AC_DEFINE_UNQUOTED(WNNLIBDIR, "$wnn_libraries", [wnn library dir])
AC_SUBST(WNN_CPPFLAGS)
AC_SUBST(WNN_LIBS)
+ AC_SUBST(WNN_LIBADD)
])
Modified: trunk/uim/Makefile.am
==============================================================================
--- trunk/uim/Makefile.am (original)
+++ trunk/uim/Makefile.am Sun Mar 9 08:40:35 2008
@@ -85,7 +85,7 @@
if WNN
uim_plugin_LTLIBRARIES += libuim-wnn.la
libuim_wnn_la_SOURCES = wnnlib.h wnnlib.c
-libuim_wnn_la_LIBADD = libuim.la $(WNN_LIBS) -lwnn
+libuim_wnn_la_LIBADD = libuim.la $(WNN_LIBS) -lwnn @WNN_LIBADD@
libuim_wnn_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
libuim_wnn_la_CPPFLAGS = -I$(top_srcdir) $(WNN_CPPFLAGS)
endif
