From 7f8694ec3daf5083001b26ec23f65937721339ed Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Sun, 23 May 2010 15:18:49 +0200
Subject: [PATCH] fix for the iconv detection by spigot.. thx!!

---
 CHANGELOG-psyclpc         | 3 +++
 TODO                      | 1 +
 src/autoconf/configure.in | 5 ++++-
 src/configure             | 5 ++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG-psyclpc b/CHANGELOG-psyclpc
index 14f665d..7fb462f 100644
--- a/CHANGELOG-psyclpc
+++ b/CHANGELOG-psyclpc
@@ -1,3 +1,6 @@
+2010-05-23 (lynX) (4.0.13)
+  - added fix for the iconv detection to configure script by spigot. thx!!
+
 2009-05-22 (lynX) (4.0.12)
   + adopted changes in LDMUD 3.3.718:
     - many many many fixes
diff --git a/TODO b/TODO
index d29d94d..5554355 100644
--- a/TODO
+++ b/TODO
@@ -3,6 +3,7 @@ FROM LDMUD
 - examine & apply: 2320, 2334, 2335, 2336, 2340, 2341
 
 BUGS
+- should autoconf to sysmalloc also for osol (OpenSolaris)
 - #define USE_EXPAT und JSON werden trotzdem gesetzt in config.h
   auch wenn configure keine libs gefunden hat (egal, wir verwenden beide nicht)
 - Because of some funny bug the driver will probably not bind properly
diff --git a/src/autoconf/configure.in b/src/autoconf/configure.in
index bc81450..0b72ba5 100644
--- a/src/autoconf/configure.in
+++ b/src/autoconf/configure.in
@@ -1245,7 +1245,10 @@ changequote(,)dnl
 echo "$as_me:$LINENO: checking for broken iconv in glibc 2.0-2.2" >&5
 echo $ECHO_N "checking for broken iconv in glibc 2.0-2.2... $ECHO_C" >&6
 if test -f /usr/sbin/iconvconfig; then
-    if /usr/sbin/iconvconfig -V | egrep ' 2\.[0-2]' >/dev/null 2>&1; then
+    # omg, this was matching 2.10 and higher!
+    # we could probably remove this whole check by now
+    # thanks to spigot for figuring this one out!
+    if /usr/sbin/iconvconfig -V | egrep ' 2\.[0-2]\.' >/dev/null 2>&1; then
         lp_cv_has_broken_iconv="yes"
         lp_cv_has_iconv="no"
     else
diff --git a/src/configure b/src/configure
index 06a7e70..6a9be2b 100755
--- a/src/configure
+++ b/src/configure
@@ -17884,7 +17884,10 @@ fi
 echo "$as_me:$LINENO: checking for broken iconv in glibc 2.0-2.2" >&5
 echo $ECHO_N "checking for broken iconv in glibc 2.0-2.2... $ECHO_C" >&6
 if test -f /usr/sbin/iconvconfig; then
-    if /usr/sbin/iconvconfig -V | egrep ' 2\.[0-2]' >/dev/null 2>&1; then
+    # omg, this was matching 2.10 and higher!
+    # we could probably remove this whole check by now
+    # thanks to spigot for figuring this one out!
+    if /usr/sbin/iconvconfig -V | egrep ' 2\.[0-2]\.' >/dev/null 2>&1; then
         lp_cv_has_broken_iconv="yes"
         lp_cv_has_iconv="no"
     else