about summary refs log tree commit diff
path: root/contrib/Debian/rules
diff options
context:
space:
mode:
authorAlexander Barton <alex@barton.de>2012-10-06 18:25:43 +0200
committerAlexander Barton <alex@barton.de>2012-10-06 18:26:25 +0200
commit46b0eef721b9b3eec37d29aff65b6a7fc488a887 (patch)
treed863ced9e38b1e6e38c8fef3afa984d69984ab45 /contrib/Debian/rules
parent4790d78c980c79abfd71c064be1eb085717210f8 (diff)
parent343a90dc376eb9979151752ec33c64ca45b04802 (diff)
downloadngircd-46b0eef721b9b3eec37d29aff65b6a7fc488a887.tar.gz
ngircd-46b0eef721b9b3eec37d29aff65b6a7fc488a887.zip
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
Diffstat (limited to 'contrib/Debian/rules')
-rwxr-xr-xcontrib/Debian/rules8
1 files changed, 5 insertions, 3 deletions
diff --git a/contrib/Debian/rules b/contrib/Debian/rules
index 868a0425..0aecde56 100755
--- a/contrib/Debian/rules
+++ b/contrib/Debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 #
 # ngIRCd -- The Next Generation IRC Daemon
-# Copyright (c)2001-2009 Alexander Barton <alex@barton.de>
+# Copyright (c)2001-2012 Alexander Barton (alex@barton.de) and Contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -53,7 +53,8 @@ configure-ngircd-full: configure
 	  --sysconfdir=/etc/ngircd \
 	  --mandir=\$${prefix}/share/man \
 	  --with-syslog --with-zlib \
-	  --with-gnutls --with-ident --with-tcp-wrappers --with-pam \
+	  --with-gnutls --with-iconv --with-ident --with-tcp-wrappers \
+	  --with-pam \
 	  --enable-ipv6
 
 configure-ngircd-full-dbg: configure
@@ -66,7 +67,8 @@ configure-ngircd-full-dbg: configure
 	  --mandir=\$${prefix}/share/man \
 	  --enable-debug --enable-sniffer \
 	  --with-syslog --with-zlib \
-	  --with-gnutls --with-ident --with-tcp-wrappers --with-pam \
+	  --with-gnutls --with-iconv --with-ident --with-tcp-wrappers \
+	  --with-pam \
 	  --enable-ipv6
 
 build: