updates for new version:

+ configure displays a summary of things to compile
+ /set toggle_use_colors = yes|no, sets colors on/off in irssi-text
- Some kB/s messages displayed wrong values when resuming DCC
  transfers. Also, kB/s is now displayed with two decimals
- "Day changed to 00-10-2000" .. month was wrong. No Y2K bugs
  however ;)
- List of ircnets was displyed wrong in server dialog.
- Userhost replies didn't handle ircops right..
- Doesn't quit when receives SIGHUP - some window managers send it
  when restarting itself (Afterstep)
- Specifying "source host IP" didn't work (vhosts).
- Using ctrl-b etc. didn't move the cursor forward..
- Don't try to compile GTK parts of plugins if we don't even want
  build GTK irssi
- Doesn't crash when trying to create DCC dialog after being
  disconnected from IRC server


git-svn-id: http://svn.irssi.org/repos/irssi/trunk@104 dbcabf3a-b0e7-0310-adc4-f8d773084564

7 files changed, 136 insertions, 90 deletions

diff --git a/NEWS b/NEWS
index 37845310..0fa4c8ca 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,22 @@
+v0.7.22 2000-01-13  Timo Sirainen <cras@irccrew.org> [stable]
+
+	+ configure displays a summary of things to compile
+	+ /set toggle_use_colors = yes|no, sets colors on/off in irssi-text
+	- Some kB/s messages displayed wrong values when resuming DCC
+	  transfers. Also, kB/s is now displayed with two decimals
+	- "Day changed to 00-10-2000" .. month was wrong. No Y2K bugs
+	  however ;)
+	- List of ircnets was displyed wrong in server dialog.
+	- Userhost replies didn't handle ircops right..
+	- Doesn't quit when receives SIGHUP - some window managers send it
+	  when restarting itself (Afterstep)
+	- Specifying "source host IP" didn't work (vhosts).
+	- Using ctrl-b etc. didn't move the cursor forward..
+	- Don't try to compile GTK parts of plugins if we don't even want
+	  build GTK irssi
+	- Doesn't crash when trying to create DCC dialog after being
+	  disconnected from IRC server
+
 v0.7.21 1999-12-20  Timo Sirainen <cras@irccrew.org> [unstable]
 
 	+ Irssi-text: Channel activities are displayed with different colors
diff --git a/TODO b/TODO
index 8dc5c81b..c8e4e6ff 100644
--- a/TODO
+++ b/TODO
@@ -9,8 +9,6 @@
  - multiple dcc connections from different irc networks from same nick
    doesn't work. Maybe create "server nick" and "refer nick" variables to
    DCC_REC?
- - gfloat doesn't work in formats .. why? In DCC messages kb and kb/s values
-   could be shown as floats..
 
 *** text UI
 
diff --git a/configure.in b/configure.in
index b95cc6c4..2c21ba41 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 AC_INIT(src)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(irssi, 0.7.21)
+AM_INIT_AUTOMAKE(irssi, 0.7.22)
 
 AM_MAINTAINER_MODE
 
@@ -14,7 +14,7 @@ AC_STDC_HEADERS
 AC_ARG_PROGRAM
 AM_PROG_LIBTOOL
 
-AC_CHECK_HEADERS(string.h stdlib.h unistd.h dirent.h sys/ioctl.h)
+AC_CHECK_HEADERS(string.h stdlib.h unistd.h dirent.h sys/ioctl.h libintl.h)
 
 GNOME_INIT
 GNOME_SUPPORT_CHECKS
@@ -153,7 +153,7 @@ AC_ARG_ENABLE(ipv6,
         		want_ipv6=yes
     		fi
 	fi,
-	want_ip6=no)
+	want_ipv6=no)
 
 AC_ARG_ENABLE(gtk-hebrew,
 [  --enable-gtk-hebrew     Enable Hebrew support],
@@ -316,19 +316,23 @@ if test "x$want_textui" = "xyes"; then
 			AC_DEFINE(HAVE_CURSES_IDCOK)
 		],, $CURSES_LIBS)
 	fi
+
+	if test "$has_curses" != "true"; then
+		want_textui=no;
+        fi
 else
 	has_curses=false
 fi
-AM_CONDITIONAL(HAS_CURSES, test "$has_curses" = true)
 
 dnl ** check what we want to build
-AM_CONDITIONAL(BUILD_IRSSIBOT, test "$want_irssibot" = "xyes")
-AM_CONDITIONAL(BUILD_PLUGINS, test "x$want_plugins" = "xyes")
-AM_CONDITIONAL(BUILD_SERVERTEST, test "x$want_servertest" = "xyes")
 AM_CONDITIONAL(BUILD_GNOMEUI, test "x$GUI_LIBS" != "x")
-AM_CONDITIONAL(HAVE_GNOME, test "x$want_gnome" = "xyes")
-AM_CONDITIONAL(HAVE_GNOME_PANEL, test "x$want_gnome_panel" = "xyes")
-AM_CONDITIONAL(HAVE_MYSQL, test "x$want_mysql" = "xyes")
+AM_CONDITIONAL(BUILD_TEXTUI, test "$want_textui" = "yes")
+AM_CONDITIONAL(BUILD_IRSSIBOT, test "$want_irssibot" = "yes")
+AM_CONDITIONAL(BUILD_PLUGINS, test "$want_plugins" = "yes")
+AM_CONDITIONAL(BUILD_SERVERTEST, test "$want_servertest" = "yes")
+AM_CONDITIONAL(HAVE_GNOME, test "$want_gnome" = "yes")
+AM_CONDITIONAL(HAVE_GNOME_PANEL, test "$want_gnome_panel" = "yes")
+AM_CONDITIONAL(HAVE_MYSQL, test "$want_mysql" = "yes")
 
 AC_SUBST(MYSQL_LIBS)
 
@@ -388,3 +392,19 @@ plugins/bot/Makefile
 plugins/sql/Makefile
 stamp.h
 irssi.spec)
+
+echo
+
+if test "$GUI_LIBS" != "x"; then
+  echo Building GTK frontend ...... : yes
+else
+  echo Building GTK frontend ...... : no
+fi
+echo Building with GNOME ........ : $want_gnome
+echo Building with GNOME panel .. : $want_gnome_panel
+
+echo Building text frontend ..... : $want_textui
+echo Building irssi-bot ......... : $want_irssibot
+echo Building with IPv6 support . : $want_ipv6
+echo Install prefix ............. : $prefix
+
diff --git a/po/fi.po b/po/fi.po
index 607827a9..39d65e19 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-20 00:26+0200\n"
+"POT-Creation-Date: 2000-01-13 02:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -98,7 +98,7 @@ msgstr ""
 
 #. ----
 #: src/gui-gnome/dialog-links.c:350 src/gui-gnome/setup-servers.c:257
-#: src/gui-gnome/setup-servers.c:477 src/ui-common/ui-formats.c:39
+#: src/gui-gnome/setup-servers.c:489 src/ui-common/ui-formats.c:39
 msgid "Server"
 msgstr ""
 
@@ -281,7 +281,7 @@ msgstr ""
 #. ----
 #: src/gui-gnome/dialog-dcc.c:169 src/gui-gnome/dialog-notifylist.c:243
 #: src/gui-gnome/gui-event-who.c:255 src/gui-gnome/setup-ircnets.c:197
-#: src/gui-gnome/setup-servers.c:542 src/ui-common/ui-formats.c:88
+#: src/gui-gnome/setup-servers.c:554 src/ui-common/ui-formats.c:88
 msgid "Nick"
 msgstr ""
 
@@ -740,11 +740,11 @@ msgstr ""
 msgid "Plugin %_$1%_ not loaded"
 msgstr ""
 
-#: src/ui-common/ui-printtext.c:836
+#: src/ui-common/ui-printtext.c:835
 msgid "%_Warning:%_ %s"
 msgstr ""
 
-#: src/ui-common/ui-printtext.c:838
+#: src/ui-common/ui-printtext.c:837
 msgid "%_Error:%_ %s"
 msgstr ""
 
@@ -1183,7 +1183,7 @@ msgid "Banlist exceptions"
 msgstr ""
 
 #: src/gui-gnome/dialog-modes.c:575 src/gui-gnome/dialog-modes.c:595
-#: src/gui-gnome/setup-ircnets.c:410 src/gui-gnome/setup-servers.c:505
+#: src/gui-gnome/setup-ircnets.c:410 src/gui-gnome/setup-servers.c:517
 #: src/gui-gnome/setup-session.c:139
 msgid "Remove"
 msgstr ""
@@ -1408,7 +1408,7 @@ msgstr ""
 msgid "Apply"
 msgstr ""
 
-#: src/gui-gnome/gtk-specific.c:68 src/gui-gnome/gui-mainwindows.c:449
+#: src/gui-gnome/gtk-specific.c:68 src/gui-gnome/gui-mainwindows.c:446
 #: src/gui-gnome/setup-colors.c:195
 msgid "Cancel"
 msgstr ""
@@ -1535,7 +1535,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: src/gui-gnome/gui-event-who.c:256 src/gui-gnome/setup-servers.c:554
+#: src/gui-gnome/gui-event-who.c:256 src/gui-gnome/setup-servers.c:566
 msgid "Real name"
 msgstr ""
 
@@ -1587,39 +1587,39 @@ msgstr ""
 msgid "Away: %s"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:781
+#: src/gui-gnome/gui-mainwindows.c:778
 msgid "Nick completion"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:782
+#: src/gui-gnome/gui-mainwindows.c:779
 msgid "Check word replaces"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:784
+#: src/gui-gnome/gui-mainwindows.c:781
 msgid "Previous window"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:785
+#: src/gui-gnome/gui-mainwindows.c:782
 msgid "Next window"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:789
+#: src/gui-gnome/gui-mainwindows.c:786
 msgid "Command history"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:791
+#: src/gui-gnome/gui-mainwindows.c:788
 msgid "Previous page in window"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:792
+#: src/gui-gnome/gui-mainwindows.c:789
 msgid "Next page in window"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:794
+#: src/gui-gnome/gui-mainwindows.c:791
 msgid "Insert special character"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:805
+#: src/gui-gnome/gui-mainwindows.c:802
 msgid "Change window"
 msgstr ""
 
@@ -2307,11 +2307,11 @@ msgstr ""
 msgid "Max msgs per cmd"
 msgstr ""
 
-#: src/gui-gnome/setup-ircnets.c:400 src/gui-gnome/setup-servers.c:497
+#: src/gui-gnome/setup-ircnets.c:400 src/gui-gnome/setup-servers.c:509
 msgid "Add"
 msgstr ""
 
-#: src/gui-gnome/setup-ircnets.c:405 src/gui-gnome/setup-servers.c:501
+#: src/gui-gnome/setup-ircnets.c:405 src/gui-gnome/setup-servers.c:513
 msgid "Edit"
 msgstr ""
 
@@ -2566,7 +2566,7 @@ msgstr ""
 msgid "Clear"
 msgstr ""
 
-#: src/gui-gnome/setup-servers.c:252 src/gui-gnome/setup-servers.c:477
+#: src/gui-gnome/setup-servers.c:252 src/gui-gnome/setup-servers.c:489
 msgid "IRC Net"
 msgstr ""
 
@@ -2578,7 +2578,7 @@ msgstr ""
 msgid "Autoconnect at startup"
 msgstr ""
 
-#: src/gui-gnome/setup-servers.c:361
+#: src/gui-gnome/setup-servers.c:373
 msgid ""
 "You have empty entries!\n"
 "At least IRC Net, Server and Port\n"
@@ -2586,40 +2586,40 @@ msgid ""
 msgstr ""
 
 #. 'IRC servers' frame
-#: src/gui-gnome/setup-servers.c:462
+#: src/gui-gnome/setup-servers.c:474
 msgid "IRC Servers"
 msgstr ""
 
-#: src/gui-gnome/setup-servers.c:477
+#: src/gui-gnome/setup-servers.c:489
 msgid "AC"
 msgstr ""
 
-#: src/gui-gnome/setup-servers.c:509
+#: src/gui-gnome/setup-servers.c:521
 msgid "User information"
 msgstr ""
 
 #. skip motd
-#: src/gui-gnome/setup-servers.c:513
+#: src/gui-gnome/setup-servers.c:525
 msgid "Skip MOTD"
 msgstr ""
 
-#: src/gui-gnome/setup-servers.c:521
+#: src/gui-gnome/setup-servers.c:533
 msgid "Seconds to wait before reconnecting (-1 = never)"
 msgstr ""
 
-#: src/gui-gnome/setup-servers.c:531
+#: src/gui-gnome/setup-servers.c:543
 msgid "Source host (empty=default)"
 msgstr ""
 
-#: src/gui-gnome/setup-servers.c:546
+#: src/gui-gnome/setup-servers.c:558
 msgid "Alternate nick"
 msgstr ""
 
-#: src/gui-gnome/setup-servers.c:550
+#: src/gui-gnome/setup-servers.c:562
 msgid "User name"
 msgstr ""
 
-#: src/gui-gnome/setup-servers.c:563
+#: src/gui-gnome/setup-servers.c:575
 msgid "Servers"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 5c723e0f..e1db3108 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 1999-12-20 00:26+0200\n"
+"POT-Creation-Date: 2000-01-13 02:08+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -98,7 +98,7 @@ msgstr "Zmiana daty na $3.$[2.0]2.$[2.0]1"
 
 #. ----
 #: src/gui-gnome/dialog-links.c:350 src/gui-gnome/setup-servers.c:257
-#: src/gui-gnome/setup-servers.c:477 src/ui-common/ui-formats.c:39
+#: src/gui-gnome/setup-servers.c:489 src/ui-common/ui-formats.c:39
 msgid "Server"
 msgstr "Serwer"
 
@@ -160,7 +160,9 @@ msgstr "Teraz rozmawiasz na kanale %_$1%_"
 #: src/ui-common/ui-formats.c:57
 msgid ""
 "Cannot join to channel %_$1%_ %K(%nYou have joined to too many channels%K)"
-msgstr "Niemożna dołączyć się do kanału %_$1%_ %K(%nJesteś na zbyt dużej liczbie kanałów%K)"
+msgstr ""
+"Niemożna dołączyć się do kanału %_$1%_ %K(%nJesteś na zbyt dużej liczbie "
+"kanałów%K)"
 
 #: src/ui-common/ui-formats.c:58
 msgid "Cannot join to channel %_$1%_ %K(%nChannel is full%K)"
@@ -285,7 +287,7 @@ msgstr ""
 #. ----
 #: src/gui-gnome/dialog-dcc.c:169 src/gui-gnome/dialog-notifylist.c:243
 #: src/gui-gnome/gui-event-who.c:255 src/gui-gnome/setup-ircnets.c:197
-#: src/gui-gnome/setup-servers.c:542 src/ui-common/ui-formats.c:88
+#: src/gui-gnome/setup-servers.c:554 src/ui-common/ui-formats.c:88
 msgid "Nick"
 msgstr "Nick"
 
@@ -746,11 +748,11 @@ msgstr "Wtyczka %_$1%_ jest już załadowana"
 msgid "Plugin %_$1%_ not loaded"
 msgstr "Wtyczka %_$1%_ nie jest załadowana"
 
-#: src/ui-common/ui-printtext.c:836
+#: src/ui-common/ui-printtext.c:835
 msgid "%_Warning:%_ %s"
 msgstr "%_Ostrzeżenie:%_ %s"
 
-#: src/ui-common/ui-printtext.c:838
+#: src/ui-common/ui-printtext.c:837
 msgid "%_Error:%_ %s"
 msgstr "%_Błąd:%_ %s"
 
@@ -935,7 +937,8 @@ msgid ""
 "\n"
 "Stable version %s\n"
 "Unstable version %s"
-msgstr "Zostały ogłoszone nowe\n"
+msgstr ""
+"Zostały ogłoszone nowe\n"
 "wersje Irssi\n"
 "\n"
 "Stabilna wersja %s\n"
@@ -946,7 +949,8 @@ msgstr "Zostały ogłoszone nowe\n"
 msgid ""
 "New stable irssi version %s\n"
 "has been released."
-msgstr "Ogłoszona została nowa\n"
+msgstr ""
+"Ogłoszona została nowa\n"
 "stabilna wersja irssi %s."
 
 #: src/gui-gnome/dialog-irssibot.c:150
@@ -954,7 +958,8 @@ msgstr "Ogłoszona została nowa\n"
 msgid ""
 "New unstable irssi version %s\n"
 "has been released."
-msgstr "Ogłoszona została nowa\n"
+msgstr ""
+"Ogłoszona została nowa\n"
 "niestabilna wersja irssi %s."
 
 #: src/gui-gnome/dialog-irssibot.c:166
@@ -1195,7 +1200,7 @@ msgid "Banlist exceptions"
 msgstr ""
 
 #: src/gui-gnome/dialog-modes.c:575 src/gui-gnome/dialog-modes.c:595
-#: src/gui-gnome/setup-ircnets.c:410 src/gui-gnome/setup-servers.c:505
+#: src/gui-gnome/setup-ircnets.c:410 src/gui-gnome/setup-servers.c:517
 #: src/gui-gnome/setup-session.c:139
 msgid "Remove"
 msgstr "Usuń"
@@ -1420,7 +1425,7 @@ msgstr "Ok"
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: src/gui-gnome/gtk-specific.c:68 src/gui-gnome/gui-mainwindows.c:449
+#: src/gui-gnome/gtk-specific.c:68 src/gui-gnome/gui-mainwindows.c:446
 #: src/gui-gnome/setup-colors.c:195
 msgid "Cancel"
 msgstr "Anuluj"
@@ -1549,7 +1554,7 @@ msgstr ""
 msgid "Status"
 msgstr ""
 
-#: src/gui-gnome/gui-event-who.c:256 src/gui-gnome/setup-servers.c:554
+#: src/gui-gnome/gui-event-who.c:256 src/gui-gnome/setup-servers.c:566
 msgid "Real name"
 msgstr ""
 
@@ -1601,39 +1606,39 @@ msgstr ""
 msgid "Away: %s"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:781
+#: src/gui-gnome/gui-mainwindows.c:778
 msgid "Nick completion"
 msgstr "Uzupełnianie nicków"
 
-#: src/gui-gnome/gui-mainwindows.c:782
+#: src/gui-gnome/gui-mainwindows.c:779
 msgid "Check word replaces"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:784
+#: src/gui-gnome/gui-mainwindows.c:781
 msgid "Previous window"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:785
+#: src/gui-gnome/gui-mainwindows.c:782
 msgid "Next window"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:789
+#: src/gui-gnome/gui-mainwindows.c:786
 msgid "Command history"
 msgstr "Historial poleceń"
 
-#: src/gui-gnome/gui-mainwindows.c:791
+#: src/gui-gnome/gui-mainwindows.c:788
 msgid "Previous page in window"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:792
+#: src/gui-gnome/gui-mainwindows.c:789
 msgid "Next page in window"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:794
+#: src/gui-gnome/gui-mainwindows.c:791
 msgid "Insert special character"
 msgstr ""
 
-#: src/gui-gnome/gui-mainwindows.c:805
+#: src/gui-gnome/gui-mainwindows.c:802
 msgid "Change window"
 msgstr ""
 
@@ -2321,11 +2326,11 @@ msgstr ""
 msgid "Max msgs per cmd"
 msgstr ""
 
-#: src/gui-gnome/setup-ircnets.c:400 src/gui-gnome/setup-servers.c:497
+#: src/gui-gnome/setup-ircnets.c:400 src/gui-gnome/setup-servers.c:509
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/gui-gnome/setup-ircnets.c:405 src/gui-gnome/setup-servers.c:501
+#: src/gui-gnome/setup-ircnets.c:405 src/gui-gnome/setup-servers.c:513
 msgid "Edit"
 msgstr "Edycja"
 
@@ -2580,7 +2585,7 @@ msgstr "t"
 msgid "Clear"
 msgstr "Wyczysć"
 
-#: src/gui-gnome/setup-servers.c:252 src/gui-gnome/setup-servers.c:477
+#: src/gui-gnome/setup-servers.c:252 src/gui-gnome/setup-servers.c:489
 msgid "IRC Net"
 msgstr "Sieć IRC"
 
@@ -2592,7 +2597,7 @@ msgstr ""
 msgid "Autoconnect at startup"
 msgstr "Automatycznie łącz przy starcie"
 
-#: src/gui-gnome/setup-servers.c:361
+#: src/gui-gnome/setup-servers.c:373
 msgid ""
 "You have empty entries!\n"
 "At least IRC Net, Server and Port\n"
@@ -2600,40 +2605,40 @@ msgid ""
 msgstr ""
 
 #. 'IRC servers' frame
-#: src/gui-gnome/setup-servers.c:462
+#: src/gui-gnome/setup-servers.c:474
 msgid "IRC Servers"
 msgstr "Serwery IRC"
 
-#: src/gui-gnome/setup-servers.c:477
+#: src/gui-gnome/setup-servers.c:489
 msgid "AC"
 msgstr ""
 
-#: src/gui-gnome/setup-servers.c:509
+#: src/gui-gnome/setup-servers.c:521
 msgid "User information"
 msgstr ""
 
 #. skip motd
-#: src/gui-gnome/setup-servers.c:513
+#: src/gui-gnome/setup-servers.c:525
 msgid "Skip MOTD"
 msgstr "Pomiń powitanie"
 
-#: src/gui-gnome/setup-servers.c:521
+#: src/gui-gnome/setup-servers.c:533
 msgid "Seconds to wait before reconnecting (-1 = never)"
 msgstr ""
 
-#: src/gui-gnome/setup-servers.c:531
+#: src/gui-gnome/setup-servers.c:543
 msgid "Source host (empty=default)"
 msgstr ""
 
-#: src/gui-gnome/setup-servers.c:546
+#: src/gui-gnome/setup-servers.c:558
 msgid "Alternate nick"
 msgstr ""
 
-#: src/gui-gnome/setup-servers.c:550
+#: src/gui-gnome/setup-servers.c:562
 msgid "User name"
 msgstr ""
 
-#: src/gui-gnome/setup-servers.c:563
+#: src/gui-gnome/setup-servers.c:575
 msgid "Servers"
 msgstr "Serwery"
 
diff --git a/src/Makefile.am b/src/Makefile.am
index b411aab3..c840f340 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-if HAS_CURSES
+if BUILD_TEXTUI
 TEXTUI=gui-text
 endif
 
diff --git a/src/nls.h b/src/nls.h
index 15f89d64..dc52d62c 100644
--- a/src/nls.h
+++ b/src/nls.h
@@ -1,18 +1,22 @@
 #ifdef ENABLE_NLS
+#  ifdef HAVE_LIBINTL_H
 #    include <libintl.h>
-#    define _(String) gettext (String)
-#    ifdef gettext_noop
-#        define N_(String) gettext_noop (String)
-#    else
-#        define N_(String) (String)
-#    endif
+#  else
+#    include "../intl/libgettext.h"
+#  endif
+#  define _(String) gettext (String)
+#  ifdef gettext_noop
+#    define N_(String) gettext_noop (String)
+#  else
+#    define N_(String) (String)
+#  endif
 #else
 /* Stubs that do something close enough.  */
-#    define textdomain(String) (String)
-#    define gettext(String) (String)
-#    define dgettext(Domain,Message) (Message)
-#    define dcgettext(Domain,Message,Type) (Message)
-#    define bindtextdomain(Domain,Directory) (Domain)
-#    define _(String) (String)
-#    define N_(String) (String)
+#  define textdomain(String) (String)
+#  define gettext(String) (String)
+#  define dgettext(Domain,Message) (Message)
+#  define dcgettext(Domain,Message,Type) (Message)
+#  define bindtextdomain(Domain,Directory) (Domain)
+#  define _(String) (String)
+#  define N_(String) (String)
 #endif