Apply patch sent by UFarx to support CPPFLAGS

diff --git a/citadel/configure b/citadel/configure
index 9fe4e8819d12eabcf309229bf94c57d4f8b9573b..823a0c5bfe91d8972c65c8bbe2ffef93a4b62141 100755 (executable)
--- a/citadel/configure
+++ b/citadel/configure
@@ -44,14 +44,19 @@ done
 # Set any missing values
 ########################################################################
 
+# GCC is the default C compiler
+[ "${CC}" = "" ]       && export CC=gcc
+
 # Accept PREFIX as a substitute for CTDLDIR, but only if CTDLDIR is not already set
 [ "$CTDLDIR" = "" ] && [ "$PREFIX" != "" ] && CTDLDIR=$PREFIX
 
 # Configure the directory into which Citadel Server will be installed.
-[ "$CTDLDIR" = "" ] && CTDLDIR=/usr/local/citadel
+[ "$CTDLDIR" = "" ]    && CTDLDIR=/usr/local/citadel
+
 
 # Permit override of CFLAGS and LDFLAGS using environment variables
-[ "$CFLAGS" = "" ]     && CFLAGS='-ggdb'
+[ "$CFLAGS" = "" ]     && CFLAGS=''
+[ "$CPPFLAGS" = "" ]   && CPPFLAGS=''
 [ "$LDFLAGS" = "" ]    && LDFLAGS=''
 
 
@@ -68,7 +73,7 @@ int main(int argc, char **argv) {
        exit(0);
 }
 !
-cc $tempcc -lssl -lcrypto -o $tempfile && $tempfile && {
+$CC $CFLAGS $CPPFLAGS $tempcc -o $tempfile $LDFLAGS -lssl -lcrypto && $tempfile && {
        CFLAGS=${CFLAGS}' -DHAVE_OPENSSL'
        LDFLAGS=${LDFLAGS}' -lssl -lcrypto -lz'
 } || {
@@ -94,12 +99,12 @@ int main(int argc, char **argv) {
 }
 !
 
-cc $tempcc -o $tempfile && {
+$CC $CFLAGS $CPPFLAGS $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 && {
+       $CC $CFLAGS $CPPFLAGS $tempcc -o $tempfile $LDFLAGS -liconv && {
                ICONV='yes'
                LDFLAGS=${LDFLAGS}' -liconv'
        } || {
@@ -122,7 +127,7 @@ CFLAGS=${CFLAGS}' -DCTDLDIR=\"'${CTDLDIR}'\"'
 (
        echo '# config.mk is generated by configure'
        echo "CTDLDIR := ${CTDLDIR}"
-       echo "CFLAGS := ${CFLAGS}"
+       echo "CFLAGS := ${CFLAGS} ${CPPFLAGS}"
        echo "LDFLAGS := ${LDFLAGS}"
 ) >config.mk