From 1d0eaabeffb8130d3d85edd8122df9074ce8e6a0 Mon Sep 17 00:00:00 2001
From: "psyc://loupsycedyglgamf.onion/~lynX"
 <BM-NB7xa9gEpmJgYp9PVnEdACiZcGmmEJcY>
Date: Wed, 10 Aug 2016 17:22:03 +0200
Subject: [PATCH] cheating so -liconv is added on BSD

---
 src/autoconf/configure.ac | 33 ++++++++++++++++-----------------
 src/version.sh            |  2 +-
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/src/autoconf/configure.ac b/src/autoconf/configure.ac
index a5e55c4..c47b34f 100644
--- a/src/autoconf/configure.ac
+++ b/src/autoconf/configure.ac
@@ -1452,27 +1452,26 @@ int main(void)
         lp_cv_need_lib_iconv=no,
         lp_cv_need_lib_iconv=yes
     ))
-#   if test "$lp_cv_need_lib_iconv" = "yes"; then
-#       # Search the libraries
+    if test "$lp_cv_need_lib_iconv" = "yes"; then
+        # Search the libraries
+        tmp=""
+        AC_CHECK_LIB(iconv,libiconv_close, tmp="-liconv")
 
-#       tmp=""
+        if test "x$tmp" = "x"; then
+            CFLAGS="$saveflags -L/usr/local/lib"
+            AC_CHECK_LIB(iconv,libiconv_close, tmp="-L/usr/local/lib -liconv")
+        fi
 
-#       AC_CHECK_LIB(iconv,libiconv_close, tmp="$PKGLIBS -liconv")
-
-#       if test "x$tmp" = "x"; then
-#           CFLAGS="$saveflags -L/usr/local/lib"
-#           AC_CHECK_LIB(iconv,libiconv_close, tmp="$PKGLIBS -L/usr/local/lib -liconv")
-#       fi
-
-#       if test "x$tmp" = "x"; then
+        if test "x$tmp" = "x"; then
 #           echo "iconv library not found."
 #           lp_cv_has_iconv="no"
-#       else
-#           PKGLIBS="$tmp"
-#       fi
-
-#       CFLAGS="$saveflags"
-#   fi
+	    # FIXME: cheating here
+            PKGLIBS="$PKGLIBS -L/usr/local/lib -liconv"
+        else
+            PKGLIBS="$PKGLIBS $tmp"
+        fi
+    fi
+    CFLAGS="$saveflags"
 fi
 
 if test "x$lp_cv_has_iconv" = "xyes"; then
diff --git a/src/version.sh b/src/version.sh
index 725b29d..5a12471 100644
--- a/src/version.sh
+++ b/src/version.sh
@@ -17,7 +17,7 @@ version_longtype="stable"
 # A timestamp, to be used by bumpversion and other scripts.
 # It can be used, for example, to 'touch' this file on every build, thus
 # forcing revision control systems to add it on every checkin automatically.
-version_stamp="Wed Aug 10 16:50:41 CEST 2016"
+version_stamp="Wed Aug 10 17:20:27 CEST 2016"
 
 # Okay, LDMUD is using 3.x.x so to avoid conflicts let's just use 4.x.x
 version_major=4