[uim-commit] r218 - in trunk: . fep

[ekato@freedesktop.org]

Author: ekato
Date: 2005-01-10 03:56:27 -0800 (Mon, 10 Jan 2005)
New Revision: 218

Modified:
   trunk/configure.ac
   trunk/fep/Makefile.am
Log:
* configure.ac : Separate uim-fep specific dependent library into
  FEP_LIBADD from LIBS.
* fep/Makefile.am (uim_fep_LDADD) : Use FEP_LIBADD.


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-01-10 09:52:59 UTC (rev 217)
+++ trunk/configure.ac	2005-01-10 11:56:27 UTC (rev 218)
@@ -133,12 +133,15 @@
 # Checks for library
 AC_CHECK_LIB(dl,dlopen)
 AC_CHECK_LIB(socket,socket)
-AC_CHECK_LIB([curses], [setupterm])
-AC_CHECK_LIB([ncurses], [setupterm])
-AC_CHECK_LIB([util], [forkpty])
+AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD")
+AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD")
 
 # Checks for function
-AC_CHECK_FUNCS([forkpty])
+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"])
+fi
+AC_SUBST(FEP_LIBADD)
 AC_CHECK_FUNCS([cfmakeraw])
 AC_CHECK_FUNCS([wcswidth])
 AC_CHECK_FUNCS(getpeereid asprintf vasprintf setenv unsetenv strsep)

Modified: trunk/fep/Makefile.am
===================================================================
--- trunk/fep/Makefile.am	2005-01-10 09:52:59 UTC (rev 217)
+++ trunk/fep/Makefile.am	2005-01-10 11:56:27 UTC (rev 218)
@@ -8,7 +8,7 @@
 uim_fep_SOURCES = uim-fep.c uim-fep.h udsock.c udsock.h str.c str.h callbacks.c callbacks.h draw.c draw.h escseq.c escseq.h key.c key.h read.c read.h
 uim_fep_CPPFLAGS = -I$(top_srcdir)
 uim_fep_CFLAGS =
-uim_fep_LDADD = $(top_builddir)/uim/libuim.la @LIBICONV@
+uim_fep_LDADD = $(top_builddir)/uim/libuim.la @LIBICONV@ @FEP_LIBADD@
 
 uim_fep_tick_SOURCES = uim-fep-tick.c uim-fep.h udsock.c udsock.h