Meow meow! Applied patches sent by LadySerenaKitty for improved FreeBSD compatibility.

[citadel.git] / textclient / configure

diff --git a/textclient/configure b/textclient/configure
index d75fd297f8287d89c1eea1e1cce508a92d57f582..d87d078c5654dde417268972db4244dc8530fa9e 100755 (executable)
--- a/textclient/configure
+++ b/textclient/configure
@@ -2,13 +2,15 @@
 
 # CONFIGURE SCRIPT FOR CITADEL TEXT CLIENT
 # This file is part of "conf-IG-ure"
-# Copyright (C) 2016-2018 by Art Cancro
-# Distributed under the terms of the GNU General Public License v3 with the following special exceptions:
-# 1. By using this software you agree that it's called "Linux", not "GNU/Linux"
-# 2. By using this software you agree that it's called "open source", not "free software"
-# 3. By using this software you agree that GNU Autotools are crap, which is why conf-IG-ure exists
-# 4. By using this software you agree that Richard Stallman is a communist.
-# 5. By reading these special exceptions you have already agreed to them.
+# Copyright (C) 2016-2019 by Art Cancro
+#
+# 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 
@@ -29,6 +31,9 @@ do
                --bindir)
                        BINDIR=$v
                ;;
+               --etcdir)
+                       ETCDIR=$v
+               ;;
                --ctdldir)
                        CTDLDIR=$v
                ;;
@@ -44,6 +49,7 @@ do
                        echo Valid options are:
                        echo '  --prefix=PREFIX         Install files in PREFIX [/usr/local]'
                        echo '  --bindir=DIR            Install executables in DIR [PREFIX/bin]'
+                       echo '  --etcdir=DIR            Install citadel.rc in DIR [PREFIX/etc]'
                        echo '  --ctdldir=DIR           Look for Citadel server in DIR [/usr/local/citadel]'
                        echo '  --with-ssl              Force build with OpenSSL support [normally autodetected]'
                        echo '  --without-ssl           Force build without OpenSSL support [normally autodetected]'
@@ -58,7 +64,7 @@ done
 [ "$PREFIX" = "" ]     && PREFIX=/usr/local
 [ "$BINDIR" = "" ]     && BINDIR=${PREFIX}/bin
 [ "$CTDLDIR" = "" ]    && CTDLDIR=/usr/local/citadel
-[ "$CFLAGS" = "" ]     && CFLAGS='-ggdb'
+[ "$CFLAGS" = "" ]     && CFLAGS='-Wformat-truncation=0 -ggdb'
 [ "$LDFLAGS" = "" ]    && LDFLAGS=''
 
 # Test for OpenSSL
@@ -81,14 +87,14 @@ int main(int argc, char **argv) {
 echo SSL: $SSL
 [ "$SSL" = "yes" ] && {
        CFLAGS=${CFLAGS}' -DHAVE_OPENSSL'
-       LDFLAGS=${LDFLAGS}' -lssl -lcrypto'
+       LDFLAGS=${LDFLAGS}' -lssl -lcrypto -lz'
 }
 
 # Output the config.mk
 
 (
        echo "CFLAGS := ${CFLAGS}"
-       echo "LDFLAGS := ${LDFLAGS}"
+       echo "LDFLAGS := ${LDFLAGS} -liconv"
        echo "PREFIX := ${PREFIX}"
        echo "BINDIR := ${BINDIR}"
        echo "CTDLDIR := ${CTDLDIR}"