From 7dbaec1abf5ec1c7a6ae61439a615c48106013e6 Mon Sep 17 00:00:00 2001 From: Sebastien Helleu Date: Sun, 2 Jan 2005 13:07:19 +0000 Subject: [PATCH] Replaced "curses" by "ncurses" --- configure.in | 30 ++++++++++++++-------------- src/gui/Makefile.am | 2 +- src/gui/curses/Makefile.am | 2 +- src/gui/curses/gui-display.c | 2 +- src/gui/curses/gui-input.c | 2 +- weechat/configure.in | 30 ++++++++++++++-------------- weechat/src/gui/Makefile.am | 2 +- weechat/src/gui/curses/Makefile.am | 2 +- weechat/src/gui/curses/gui-display.c | 2 +- weechat/src/gui/curses/gui-input.c | 2 +- 10 files changed, 38 insertions(+), 38 deletions(-) diff --git a/configure.in b/configure.in index 6e41c589b..bc0af24ae 100644 --- a/configure.in +++ b/configure.in @@ -34,7 +34,7 @@ ALL_LINGUAS="fr" AM_GNU_GETTEXT # Checks for libraries. -AC_CHECK_LIB([curses], [initscr], LIBCURSES_FOUND=1, LIBCURSES_FOUND=0) +AC_CHECK_LIB([ncurses], [initscr], LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0) # Checks for header files. AC_HEADER_STDC @@ -55,11 +55,11 @@ AH_VERBATIM([PLUGINS], [#undef PLUGINS]) AH_VERBATIM([PLUGIN_PERL], [#undef PLUGIN_PERL]) AH_VERBATIM([DEBUG], [#undef DEBUG]) -AC_ARG_ENABLE(curses, [ --disable-curses Turn off Curses interface (default=auto)],,enable_curses=yes) -AC_ARG_ENABLE(gtk, [ --enable-gtk Turn on Gtk+ interface (default=no)],enable_gtk=yes,enable_gtk=no) -AC_ARG_ENABLE(qt, [ --enable-qt Turn on Qt interface (default=no)],enable_qt=yes,enable_qt=no) -AC_ARG_ENABLE(perl, [ --enable-perl Turn on Perl plugins (default=no)],enable_perl=yes,enable_perl=no) -AC_ARG_WITH(debug, [ --with-debug Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=0)],debug=$withval,debug=0) +AC_ARG_ENABLE(ncurses, [ --disable-ncurses Turn off NCurses interface (default=auto)],,enable_ncurses=yes) +AC_ARG_ENABLE(gtk, [ --enable-gtk Turn on Gtk+ interface (default=no)],enable_gtk=yes,enable_gtk=no) +AC_ARG_ENABLE(qt, [ --enable-qt Turn on Qt interface (default=no)],enable_qt=yes,enable_qt=no) +AC_ARG_ENABLE(perl, [ --enable-perl Turn on Perl plugins (default=no)],enable_perl=yes,enable_perl=no) +AC_ARG_WITH(debug, [ --with-debug Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=0)],debug=$withval,debug=0) enable_plugins="no" enable_python="no" @@ -67,19 +67,19 @@ PYTHON_CFLAGS= enable_ruby="no" RUBY_CFLAGS= -AM_CONDITIONAL(GUI_CURSES, test "$enable_curses" = "yes") +AM_CONDITIONAL(GUI_NCURSES, test "$enable_ncurses" = "yes") AM_CONDITIONAL(GUI_GTK, test "$enable_gtk" = "yes") AM_CONDITIONAL(GUI_QT, test "$enable_qt" = "yes") AM_CONDITIONAL(PLUGIN_PERL, test "$enable_perl" = "yes") # AM_CONDITIONAL(PLUGIN_PYTHON, test "$enable_python" = "yes") # AM_CONDITIONAL(PLUGIN_RUBY, test "$enable_ruby" = "yes") -if test "x$enable_curses" = "xyes" ; then - if test "$LIBCURSES_FOUND" = "0" ; then - AC_MSG_ERROR([Curses library not found! Install Curses library or run ./configure with --disable-curses parameter.]) +if test "x$enable_ncurses" = "xyes" ; then + if test "$LIBNCURSES_FOUND" = "0" ; then + AC_MSG_ERROR([NCurses library not found! Install NCurses library or run ./configure with --disable-ncurses parameter.]) fi - CURSES_LIBS="-lcurses" - AC_SUBST(CURSES_LIBS) + NCURSES_LIBS="-lncurses" + AC_SUBST(NCURSES_LIBS) fi if test "x$enable_gtk" = "xyes" ; then @@ -139,8 +139,8 @@ echo echo $PACKAGE $VERSION listgui= -if test "x$enable_curses" = "xyes" ; then - listgui="$listgui Curses" +if test "x$enable_ncurses" = "xyes" ; then + listgui="$listgui NCurses" fi if test "x$enable_gtk" = "xyes" ; then listgui="$listgui Gtk+" @@ -150,7 +150,7 @@ if test "x$enable_qt" = "xyes" ; then fi if test "x$listgui" = "x" ; then - AC_MSG_ERROR([No interface specified... Please specify at least Curses, Gtk or Qt.]) + AC_MSG_ERROR([No interface specified... Please specify at least NCurses, Gtk or Qt.]) fi msg_debug_compiler="No" diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index cbc4122e8..8e869046a 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -15,7 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -if GUI_CURSES +if GUI_NCURSES curses_dir=curses endif diff --git a/src/gui/curses/Makefile.am b/src/gui/curses/Makefile.am index cb8e5a72f..771ece40d 100644 --- a/src/gui/curses/Makefile.am +++ b/src/gui/curses/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = weechat-curses weechat_curses_LDADD = ../../common/lib_weechat_main.a \ ../../irc/lib_weechat_irc.a \ - $(CURSES_LIBS) \ + $(NCURSES_LIBS) \ ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS) weechat_curses_SOURCES = ../gui.h \ diff --git a/src/gui/curses/gui-display.c b/src/gui/curses/gui-display.c index 46638edcc..935afa8c4 100644 --- a/src/gui/curses/gui-display.c +++ b/src/gui/curses/gui-display.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "../../common/weechat.h" #include "../gui.h" diff --git a/src/gui/curses/gui-input.c b/src/gui/curses/gui-input.c index 377290b3a..54ed0dccc 100644 --- a/src/gui/curses/gui-input.c +++ b/src/gui/curses/gui-input.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include "../../common/weechat.h" #include "../gui.h" diff --git a/weechat/configure.in b/weechat/configure.in index 6e41c589b..bc0af24ae 100644 --- a/weechat/configure.in +++ b/weechat/configure.in @@ -34,7 +34,7 @@ ALL_LINGUAS="fr" AM_GNU_GETTEXT # Checks for libraries. -AC_CHECK_LIB([curses], [initscr], LIBCURSES_FOUND=1, LIBCURSES_FOUND=0) +AC_CHECK_LIB([ncurses], [initscr], LIBNCURSES_FOUND=1, LIBNCURSES_FOUND=0) # Checks for header files. AC_HEADER_STDC @@ -55,11 +55,11 @@ AH_VERBATIM([PLUGINS], [#undef PLUGINS]) AH_VERBATIM([PLUGIN_PERL], [#undef PLUGIN_PERL]) AH_VERBATIM([DEBUG], [#undef DEBUG]) -AC_ARG_ENABLE(curses, [ --disable-curses Turn off Curses interface (default=auto)],,enable_curses=yes) -AC_ARG_ENABLE(gtk, [ --enable-gtk Turn on Gtk+ interface (default=no)],enable_gtk=yes,enable_gtk=no) -AC_ARG_ENABLE(qt, [ --enable-qt Turn on Qt interface (default=no)],enable_qt=yes,enable_qt=no) -AC_ARG_ENABLE(perl, [ --enable-perl Turn on Perl plugins (default=no)],enable_perl=yes,enable_perl=no) -AC_ARG_WITH(debug, [ --with-debug Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=0)],debug=$withval,debug=0) +AC_ARG_ENABLE(ncurses, [ --disable-ncurses Turn off NCurses interface (default=auto)],,enable_ncurses=yes) +AC_ARG_ENABLE(gtk, [ --enable-gtk Turn on Gtk+ interface (default=no)],enable_gtk=yes,enable_gtk=no) +AC_ARG_ENABLE(qt, [ --enable-qt Turn on Qt interface (default=no)],enable_qt=yes,enable_qt=no) +AC_ARG_ENABLE(perl, [ --enable-perl Turn on Perl plugins (default=no)],enable_perl=yes,enable_perl=no) +AC_ARG_WITH(debug, [ --with-debug Debugging: 0=no debug, 1=debug compilation, 2=debug compilation + verbose msgs (default=0)],debug=$withval,debug=0) enable_plugins="no" enable_python="no" @@ -67,19 +67,19 @@ PYTHON_CFLAGS= enable_ruby="no" RUBY_CFLAGS= -AM_CONDITIONAL(GUI_CURSES, test "$enable_curses" = "yes") +AM_CONDITIONAL(GUI_NCURSES, test "$enable_ncurses" = "yes") AM_CONDITIONAL(GUI_GTK, test "$enable_gtk" = "yes") AM_CONDITIONAL(GUI_QT, test "$enable_qt" = "yes") AM_CONDITIONAL(PLUGIN_PERL, test "$enable_perl" = "yes") # AM_CONDITIONAL(PLUGIN_PYTHON, test "$enable_python" = "yes") # AM_CONDITIONAL(PLUGIN_RUBY, test "$enable_ruby" = "yes") -if test "x$enable_curses" = "xyes" ; then - if test "$LIBCURSES_FOUND" = "0" ; then - AC_MSG_ERROR([Curses library not found! Install Curses library or run ./configure with --disable-curses parameter.]) +if test "x$enable_ncurses" = "xyes" ; then + if test "$LIBNCURSES_FOUND" = "0" ; then + AC_MSG_ERROR([NCurses library not found! Install NCurses library or run ./configure with --disable-ncurses parameter.]) fi - CURSES_LIBS="-lcurses" - AC_SUBST(CURSES_LIBS) + NCURSES_LIBS="-lncurses" + AC_SUBST(NCURSES_LIBS) fi if test "x$enable_gtk" = "xyes" ; then @@ -139,8 +139,8 @@ echo echo $PACKAGE $VERSION listgui= -if test "x$enable_curses" = "xyes" ; then - listgui="$listgui Curses" +if test "x$enable_ncurses" = "xyes" ; then + listgui="$listgui NCurses" fi if test "x$enable_gtk" = "xyes" ; then listgui="$listgui Gtk+" @@ -150,7 +150,7 @@ if test "x$enable_qt" = "xyes" ; then fi if test "x$listgui" = "x" ; then - AC_MSG_ERROR([No interface specified... Please specify at least Curses, Gtk or Qt.]) + AC_MSG_ERROR([No interface specified... Please specify at least NCurses, Gtk or Qt.]) fi msg_debug_compiler="No" diff --git a/weechat/src/gui/Makefile.am b/weechat/src/gui/Makefile.am index cbc4122e8..8e869046a 100644 --- a/weechat/src/gui/Makefile.am +++ b/weechat/src/gui/Makefile.am @@ -15,7 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -if GUI_CURSES +if GUI_NCURSES curses_dir=curses endif diff --git a/weechat/src/gui/curses/Makefile.am b/weechat/src/gui/curses/Makefile.am index cb8e5a72f..771ece40d 100644 --- a/weechat/src/gui/curses/Makefile.am +++ b/weechat/src/gui/curses/Makefile.am @@ -21,7 +21,7 @@ bin_PROGRAMS = weechat-curses weechat_curses_LDADD = ../../common/lib_weechat_main.a \ ../../irc/lib_weechat_irc.a \ - $(CURSES_LIBS) \ + $(NCURSES_LIBS) \ ../../plugins/lib_weechat_plugins.a $(PLUGINS_LIBS) weechat_curses_SOURCES = ../gui.h \ diff --git a/weechat/src/gui/curses/gui-display.c b/weechat/src/gui/curses/gui-display.c index 46638edcc..935afa8c4 100644 --- a/weechat/src/gui/curses/gui-display.c +++ b/weechat/src/gui/curses/gui-display.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "../../common/weechat.h" #include "../gui.h" diff --git a/weechat/src/gui/curses/gui-input.c b/weechat/src/gui/curses/gui-input.c index 377290b3a..54ed0dccc 100644 --- a/weechat/src/gui/curses/gui-input.c +++ b/weechat/src/gui/curses/gui-input.c @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include "../../common/weechat.h" #include "../gui.h"