[uim-commit] r648 - trunk

[yamamoto at freedesktop.org]

Author: yamamoto
Date: 2005-02-14 02:51:35 -0800 (Mon, 14 Feb 2005)
New Revision: 648

Modified:
   trunk/configure.ac
Log:
 * configure.ac: Check libcurses first, if libcurses is not found
   check libncurses.


Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2005-02-14 08:46:54 UTC (rev 647)
+++ trunk/configure.ac	2005-02-14 10:51:35 UTC (rev 648)
@@ -377,9 +377,9 @@
       ;;
       yes|*)
         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 libncurses. disabled...]);use_uim_fep="no")
+	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_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"])
@@ -389,9 +389,9 @@
     esac
   ],
   [ 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 libncurses. disabled...]);use_uim_fep="no")
+    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_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"])