[uim-commit] r2292 - in trunk: . uim

[ekato at freedesktop.org]

Author: ekato
Date: 2005-11-30 07:59:59 -0800 (Wed, 30 Nov 2005)
New Revision: 2292

Modified:
   trunk/configure.ac
   trunk/uim/Makefile.am
Log:
* configure.ac : Add NETLIBS for inet_aton() since Solaris 9 needs
  -lresolv for the function.  Cosmetic changes about some
  messages.
* uim/Makefile.am : Add NETLIBS for libuim_skk_la_LIBADD.


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-11-30 08:15:20 UTC (rev 2291)
+++ trunk/configure.ac	2005-11-30 15:59:59 UTC (rev 2292)
@@ -243,10 +243,16 @@
 AC_SEARCH_LIBS(dlfunc,dl,
   [
     AC_DEFINE(HAVE_DLFUNC, 1,
-              [Define to 1 if you have the `dlfunc' function.])
+              [Define to 1 if you have the dlfunc function.])
 
   ])
 
+dnl Solaris 9 needs -lresolv for inet_aton
+NETLIBS=""
+AC_CHECK_FUNC(inet_aton, ,
+  [AC_CHECK_LIB(resolv, inet_aton, [NETLIBS="-lresolv"])])
+AC_SUBST(NETLIBS)
+
 GETTEXT_PACKAGE=uim
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[gettext package name])
@@ -424,7 +430,7 @@
         use_uim_fep="yes"
 	AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
 	  [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
-	    AC_MSG_WARN([fep needs libcurses or libncurses. disabled...]);use_uim_fep="no")])
+	    AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
 	AC_CHECK_FUNCS(forkpty)
 	if test $ac_cv_func_forkpty = no; then
 	  AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
@@ -436,7 +442,7 @@
   [ use_uim_fep="yes"
     AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
       [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
-        AC_MSG_WARN([fep needs libcurses or libncurses. disabled...]);use_uim_fep="no")])
+        AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
     AC_CHECK_FUNCS(forkpty)
     if test $ac_cv_func_forkpty = no; then
       AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])

Modified: trunk/uim/Makefile.am
===================================================================
--- trunk/uim/Makefile.am	2005-11-30 08:15:20 UTC (rev 2291)
+++ trunk/uim/Makefile.am	2005-11-30 15:59:59 UTC (rev 2292)
@@ -84,7 +84,7 @@
 
 uim_plugin_LTLIBRARIES += libuim-skk.la
 libuim_skk_la_SOURCES = skk.c
-libuim_skk_la_LIBADD = libuim.la
+libuim_skk_la_LIBADD = libuim.la @NETLIBS@
 libuim_skk_la_LDFLAGS = -rpath $(uim_plugindir) -avoid-version -module
 libuim_skk_la_CPPFLAGS = -I$(top_srcdir)