Revision: 6781
Author: nogu.dev
Date: Sat Sep 18 03:20:56 2010
Log: * Merge r6747 from trunk.
http://code.google.com/p/uim/source/detail?r=6781
Modified:
/branches/1.6/configure.ac
=======================================
--- /branches/1.6/configure.ac Fri Aug 13 02:22:41 2010
+++ /branches/1.6/configure.ac Sat Sep 18 03:20:56 2010
@@ -1121,21 +1121,24 @@
],
[use_libedit="yes"])
- if test "x$use_libedit" != "xno"; then
- saved_CPPFLAGS=$CPPFLAGS
- saved_LDFLAGS=$LDFLAGS
- CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
- LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
- AC_CHECK_LIB(edit, el_init,
- [
- LIBEDIT_LIBS="-ledit -lcurses -L$libedit_path/lib"
- AC_SUBST(LIBEDIT_LIBS)
- ], [
- AC_MSG_WARN("libedit not found. Disabled...")
- use_libedit="no"
- ])
- CPPFLAGS=$saved_CPPFLAGS
- LDFLAGS=$saved_LDFLAGS
+if test "x$use_libedit" != "xno"; then
+ saved_CPPFLAGS=$CPPFLAGS
+ saved_LDFLAGS=$LDFLAGS
+ CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
+ LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
+ AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
+ [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
+ AC_MSG_WARN("libedit needs libcurses or libncurses.
disabled...")
+ use_libedit="no")])
+ if test "x$use_libedit" != "xno"; then
+ AC_CHECK_LIB(edit, el_init,
+ [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib"
+ AC_SUBST(LIBEDIT_LIBS)],
+ [AC_MSG_WARN("libedit not found. Disabled...")
+ use_libedit="no"])
+ fi
+ CPPFLAGS=$saved_CPPFLAGS
+ LDFLAGS=$saved_LDFLAGS
fi
dnl for uim-dict.xml.in
