[Freeswitch-trunk] [commit] r6373 - freeswitch/trunk

[Freeswitch SVN]

Author: anthm
Date: Thu Nov 22 01:24:24 2007
New Revision: 6373

Modified:
   freeswitch/trunk/Makefile.am
   freeswitch/trunk/configure.in

Log:
detect ncurses or curses instead of hardcoding ncurses, fixing libedit build on some platforms

Modified: freeswitch/trunk/Makefile.am
==============================================================================
--- freeswitch/trunk/Makefile.am	(original)
+++ freeswitch/trunk/Makefile.am	Thu Nov 22 01:24:24 2007
@@ -134,7 +134,6 @@
 if ADD_LIBEDIT
 CORE_CFLAGS    += -Ilibs/libedit/src -DSWITCH_HAVE_LIBEDIT
 CORE_LIBS      += libs/libedit/src/.libs/libedit.a
-freeswitch_LDADD += -lcurses
 endif
 
 if ADD_ODBC

Modified: freeswitch/trunk/configure.in
==============================================================================
--- freeswitch/trunk/configure.in	(original)
+++ freeswitch/trunk/configure.in	Thu Nov 22 01:24:24 2007
@@ -393,6 +393,12 @@
 AC_ARG_ENABLE(core-libedit-support,     
 	[  --enable-core-libedit-support         Compile with libedit Support],,[enable_core_libedit_support="no"])
 
+if test "$enable_core_libedit_support" = "yes" ; then
+    AC_CHECK_LIB(ncurses, tgetent,,
+       [AC_CHECK_LIB(curses, tgetent,,
+          [AC_MSG_ERROR([libtermcap, libcurses or libncurses are required!])] )] )
+fi
+
 #AX_LIB_MYSQL([MINIMUM-VERSION]) 
 AX_LIB_MYSQL
 AX_CHECK_JAVA