fix dlen

[citadel.git] / textclient / configure

diff --git a/textclient/configure b/textclient/configure
index d87d078c5654dde417268972db4244dc8530fa9e..eba03f83dafb4a5db738a8e1e3a59cdcba4e3545 100755 (executable)
--- a/textclient/configure
+++ b/textclient/configure
@@ -6,11 +6,6 @@
 #
 # This program is open source software.  Use, duplication, and/or
 # disclosure are subject to the GNU General Purpose License version 3.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
 
 echo 
 echo 
@@ -59,7 +54,10 @@ do
        shift
 done
 
+
+########################################################################
 # Set any missing values
+########################################################################
 
 [ "$PREFIX" = "" ]     && PREFIX=/usr/local
 [ "$BINDIR" = "" ]     && BINDIR=${PREFIX}/bin
@@ -67,7 +65,10 @@ done
 [ "$CFLAGS" = "" ]     && CFLAGS='-Wformat-truncation=0 -ggdb'
 [ "$LDFLAGS" = "" ]    && LDFLAGS=''
 
+
+########################################################################
 # Test for OpenSSL
+########################################################################
 [ "$SSL" != "yes" ] && [ "$SSL" != "no" ] && {
        echo Testing for OpenSSL...
        tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/configure.$$
@@ -90,11 +91,50 @@ echo SSL: $SSL
        LDFLAGS=${LDFLAGS}' -lssl -lcrypto -lz'
 }
 
+
+########################################################################
+# Test for iconv
+########################################################################
+echo Testing for iconv...
+tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/configure.$$
+tempcc=${tempfile}.c
+cat >$tempcc <<!
+#include <stdlib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <iconv.h>
+int main(int argc, char **argv) {
+       size_t wow = iconv(NULL, NULL, NULL, NULL, NULL);
+       return(0);
+}
+!
+
+cc $tempcc -o $tempfile && {
+       ICONV='yes'
+       echo iconv.h is present and requires no additional libraries
+} || {
+       echo Trying again with -liconv...
+       cc $tempcc -liconv -o $tempfile && {
+               ICONV='yes'
+               LDFLAGS=${LDFLAGS}' -liconv'
+       } || {
+               echo Citadel Server requires iconv character set conversion.
+               rm -f $tempfile 2>/dev/null
+               rm -f $tempcc 2>/dev/null
+               exit 1
+       }
+}
+rm -f $tempfile 2>/dev/null
+rm -f $tempcc 2>/dev/null
+
+
+########################################################################
 # Output the config.mk
+########################################################################
 
 (
        echo "CFLAGS := ${CFLAGS}"
-       echo "LDFLAGS := ${LDFLAGS} -liconv"
+       echo "LDFLAGS := ${LDFLAGS}"
        echo "PREFIX := ${PREFIX}"
        echo "BINDIR := ${BINDIR}"
        echo "CTDLDIR := ${CTDLDIR}"