[uim-commit] r1128 - branches/r5rs
tkng at freedesktop.org
tkng at freedesktop.org
Sat Aug 6 06:46:43 EST 2005
Author: tkng
Date: 2005-08-05 13:46:40 -0700 (Fri, 05 Aug 2005)
New Revision: 1128
Modified:
branches/r5rs/configure.ac
Log:
* configure.ac: Do not stop when libedit is not found.
Modified: branches/r5rs/configure.ac
===================================================================
--- branches/r5rs/configure.ac 2005-08-05 20:04:08 UTC (rev 1127)
+++ branches/r5rs/configure.ac 2005-08-05 20:46:40 UTC (rev 1128)
@@ -485,22 +485,35 @@
AC_SUBST(EBLIB_LIBS)
-dnl Check whether user wants libedit support
-dnl This code was based on openssh-4.1p1
+# Check whether user wants libedit support
+# This code was based on openssh-4.1p1
+
AC_ARG_WITH(libedit,
- [ --with-libedit[[=DIR]] Enable libedit support],
- [ if test "x$withval" != "xno" -a "x$withval" != "xyes"; then
- CPPFLAGS="${CPPFLAGS} -I$withval/include"
- LDFLAGS="${LDFLAGS} -L$withval/lib"
- fi ])
+AC_HELP_STRING([--with-libedit[=DIR], Enable libedit support]),
+ [
+ if test "x$with_libedit" != "xno"; then
+ use_libedit="yes"
+ libedit_path="$withval"
+ fi
+ ],
+ [use_libedit="yes"])
-AC_CHECK_LIB(edit, el_init,
- [
- LIBEDIT_LIBS="-ledit -lcurses"
- AC_SUBST(LIBEDIT_LIBS)
- ], [ AC_MSG_ERROR(libedit not found) ],
- [ -lcurses ]
-)
+ 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
+fi
AM_CONDITIONAL(M17NLIB, test x$use_m17nlib = xyes)
AM_CONDITIONAL(SCIM, test x$use_scim = xyes)
@@ -518,6 +531,7 @@
AM_CONDITIONAL(XIM, test x$use_xim = xyes)
AM_CONDITIONAL(DICT, test x$use_dict = xyes)
AM_CONDITIONAL(EB, test x$use_eb = xyes)
+AM_CONDITIONAL(LIBEDIT, test x$use_libedit = xyes)
AM_CONDITIONAL(DEBUG, test x$enable_debug = xyes)
AM_CONDITIONAL(COMPAT_SCM, test x$enable_compat_scm = xyes)
AM_CONDITIONAL(COMPAT_TABLE, test x$enable_compat_table = xyes)
@@ -781,6 +795,7 @@
XIM : ${use_xim}
DICT : ${use_dict}
EB : ${use_eb}
+ libedit : ${use_libedit}
Default toolkit : ${default_toolkit}
])
More information about the uim-commit
mailing list