1 --- uim-1.7.0/configure.ac~ 2011-05-12 15:18:18.000000000 +0200
2 +++ uim-1.7.0/configure.ac 2011-07-15 22:52:35.101500283 +0200
3 @@ -714,13 +714,13 @@ AC_ARG_WITH(gtk2,
7 - PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, use_gtk2="yes",use_gtk2="no")
8 - PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0, use_gtk2_4="yes",use_gtk2_4="no")
9 + PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0 x11, use_gtk2="yes",use_gtk2="no")
10 + PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0 x11, use_gtk2_4="yes",use_gtk2_4="no")
14 - [ PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0, use_gtk2="yes",use_gtk2="no")
15 - PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0, use_gtk2_4="yes",use_gtk2_4="no") ])
16 + [ PKG_CHECK_MODULES(GTK2, gtk+-2.0 >= 2.2.0 x11, use_gtk2="yes",use_gtk2="no")
17 + PKG_CHECK_MODULES(GTK2_4, gtk+-2.0 >= 2.4.0 x11, use_gtk2_4="yes",use_gtk2_4="no") ])
19 AC_ARG_ENABLE(gnome-applet,
20 AC_HELP_STRING([--disable-gnome-applet],
24 AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
25 - [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
26 - AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
27 + [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses -ltinfo $FEP_LIBADD",
28 + AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no","-ltinfo")])
29 AC_CHECK_FUNCS(forkpty)
30 if test $ac_cv_func_forkpty = no; then
31 AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
35 AC_CHECK_LIB(curses, setupterm, FEP_LIBADD="-lcurses $FEP_LIBADD",
36 - [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses $FEP_LIBADD",
37 - AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no")])
38 + [AC_CHECK_LIB(ncurses, setupterm, FEP_LIBADD="-lncurses -ltinfo $FEP_LIBADD",
39 + AC_MSG_WARN([fep needs setupterm in libcurses or libncurses. disabled...]);use_uim_fep="no","-ltinfo")])
40 AC_CHECK_FUNCS(forkpty)
41 if test $ac_cv_func_forkpty = no; then
42 AC_CHECK_LIB(util, forkpty, [AC_DEFINE(HAVE_FORKPTY) FEP_LIBADD="-lutil $FEP_LIBADD"])
44 CPPFLAGS="${CPPFLAGS} -I$libedit_path/include"
45 LDFLAGS="${LDFLAGS} -L$libedit_path/lib"
46 AC_CHECK_LIB(curses, tgetent, LIBEDIT_LIBS="-lcurses",
47 - [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses",
48 + [AC_CHECK_LIB(ncurses, tgetent, LIBEDIT_LIBS="-lncurses -ltinfo",
49 AC_MSG_WARN("libedit needs libcurses or libncurses. disabled...")
51 + use_libedit="no","-ltinfo")])
52 if test "x$use_libedit" != "xno"; then
53 AC_CHECK_LIB(edit, el_init,
54 [LIBEDIT_LIBS="-ledit $LIBEDIT_LIBS -L$libedit_path/lib"