textclient: test to see whether iconv requires -liconv in ldflags. Now it should...

diff --git a/citadel/bootstrap b/citadel/bootstrap
index 8f3373470bcff71483a25c6d2fad03376745b5de..3908e948c1c2a9a032f98fd9f0cea730af4a2023 100755 (executable)
--- a/citadel/bootstrap
+++ b/citadel/bootstrap
@@ -1,8 +1,5 @@
-#!/bin/sh
+#!/bin/bash
 #
 # run me after checking Citadel out of the source code repository.
 
-echo ... running mk_svn_revision.sh ...
-./scripts/mk_svn_revision.sh
-
-grep '#define REV_LEVEL' citadel.h | sed 's/[^0-9]*//g' >package-version.txt
+grep '#define REV_LEVEL' server/citadel.h | sed 's/[^0-9]*//g' >package-version.txt

diff --git a/citadel/configure b/citadel/configure
index 86fd09822f58d6eb9b434d9ea011e1105ce68dce..7d1b524fc75b1b7fb52382838d5835a37f039c85 100755 (executable)
--- a/citadel/configure
+++ b/citadel/configure
@@ -106,6 +106,7 @@ cc $tempcc -o $tempfile && {
        }
 }
 
+
 # FIXME do a real build id here
 CFLAGS=${CFLAGS}' -DBUILD_ID=\"unknown\"'
 

diff --git a/citadel/packageversion b/citadel/packageversion
deleted file mode 100644 (file)
index b8626c4..0000000
--- a/citadel/packageversion
+++ /dev/null
@@ -1 +0,0 @@
-4

diff --git a/textclient/configure b/textclient/configure
index d87d078c5654dde417268972db4244dc8530fa9e..9a7fbec02cf3015c5d6465f8e1007b1edf187ba4 100755 (executable)
--- a/textclient/configure
+++ b/textclient/configure
@@ -59,7 +59,10 @@ do
        shift
 done
 
+
+########################################################################
 # Set any missing values
+########################################################################
 
 [ "$PREFIX" = "" ]     && PREFIX=/usr/local
 [ "$BINDIR" = "" ]     && BINDIR=${PREFIX}/bin
@@ -67,7 +70,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 +96,46 @@ 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.
+               exit 1
+       }
+}
+
+
+########################################################################
 # Output the config.mk
+########################################################################
 
 (
        echo "CFLAGS := ${CFLAGS}"
-       echo "LDFLAGS := ${LDFLAGS} -liconv"
+       echo "LDFLAGS := ${LDFLAGS}"
        echo "PREFIX := ${PREFIX}"
        echo "BINDIR := ${BINDIR}"
        echo "CTDLDIR := ${CTDLDIR}"