Merge branch 'bug109-CHARCONV'

This closes bug #109.

* bug109-CHARCONV:
  Debian: require "telnet" or "telnet-ssl" for building
  Debian ngircd-full[-dbg]: enable CHARCONV
  Add "CHARCONV" to "feature string" when enabled
  Implement new IRC+ "CHARCONV" command
  Added new configure option "--with-iconv"

Conflicts:
	src/ngircd/messages.h

diff --cc configure.ng
index 8b47ad15dfdded9638be714f46df4b150c099522,cccda866592e826e87893798097cfdafe7be51b8..a3cab6aee2a77b31cc901aa92ca5795ea5b5e415
--- 1/configure.ng
--- 2/configure.in
+++ b/configure.ng
@@@ -683,14 -696,9 +707,17 @@@ test "$x_pam_on" = "yes" 
  echo $ECHO_N "        SSL support: $ECHO_C"
  echo "$x_ssl_lib"
  
+ echo $ECHO_N "   libiconv support: $ECHO_C"
+       echo "$x_iconv_on"
+ 
  echo
  
 +if ! grep "^AUTOMAKE_OPTIONS = ../portab/ansi2knr" src/ngircd/Makefile.am >/dev/null 2>&1; then
 +      echo "WARNING:"
 +      echo "This GNU automake generated build system does not support \"de-ANSI-fication\","
 +      echo "therefore don't use it to generate \"official\" distribution archives!"
 +      echo "(Most probably you want to use GNU automake 1.11.x for this purpose ...)"
 +      echo
 +fi
 +
  # -eof-

diff --cc contrib/MacOSX/config.h
Simple merge

diff --cc src/ngircd/Makefile.ng
Simple merge

diff --cc src/ngircd/messages.h
index efc7524e11d35b22479c3726ac700844abd798f5,99d258284eb4624e173b0e8576959f1ff368e2ee..35d621a6e685f988007325f54974623093b54215
--- 1/src/ngircd/messages.h
--- 2/src/ngircd/messages.h
+++ b/src/ngircd/messages.h
@@@ -21,7 -21,7 +21,7 @@@
  #define RPL_YOURHOST_MSG              "002 %s :Your host is %s, running version ngircd-%s (%s/%s/%s)"
  #define RPL_CREATED_MSG                       "003 %s :This server has been started %s"
  #define RPL_MYINFO_MSG                        "004 %s %s ngircd-%s %s %s"
- #define RPL_ISUPPORT1_MSG             "005 %s RFC2812 IRCD=ngIRCd CASEMAPPING=ascii PREFIX=(qaohv)~&@%%+ CHANTYPES=#&+ CHANMODES=beI,k,l,imMnOPRstz CHANLIMIT=#&+:%d :are supported on this server"
 -#define RPL_ISUPPORT1_MSG             "005 %s RFC2812 IRCD=ngIRCd CHARSET=UTF-8 CASEMAPPING=ascii PREFIX=(ov)@+ CHANTYPES=#&+ CHANMODES=beI,k,l,imMnOPRstz CHANLIMIT=#&+:%d :are supported on this server"
++#define RPL_ISUPPORT1_MSG             "005 %s RFC2812 IRCD=ngIRCd CHARSET=UTF-8 CASEMAPPING=ascii PREFIX=(qaohv)~&@%%+ CHANTYPES=#&+ CHANMODES=beI,k,l,imMnOPRstz CHANLIMIT=#&+:%d :are supported on this server"
  #define RPL_ISUPPORT2_MSG             "005 %s CHANNELLEN=%d NICKLEN=%d TOPICLEN=%d AWAYLEN=%d KICKLEN=%d MODES=%d MAXLIST=beI:%d EXCEPTS=e INVEX=I PENALTY :are supported on this server"
  
  #define RPL_TRACELINK_MSG             "200 %s Link %s-%s %s %s V%s %ld %d %d"

diff --cc src/ngircd/ngircd.c
Simple merge