Moved 'setup' to the utils directory and converted the build

[citadel.git] / citadel / configure

diff --git a/citadel/configure b/citadel/configure
index 4f2304d729307a214e3e706a164053bc73965e15..bd354231fe6ce1f37190bf476dacb59e0fb4af78 100755 (executable)
--- a/citadel/configure
+++ b/citadel/configure
@@ -12,7 +12,6 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-echo 
 echo 
 echo Running the configure script to create config.mk
 echo
@@ -28,9 +27,6 @@ do
                --prefix)
                        PREFIX=$v
                ;;
-               --bindir)
-                       BINDIR=$v
-               ;;
                --ctdldir)
                        CTDLDIR=$v
                ;;
@@ -44,9 +40,7 @@ do
                        echo $0 : unknown option $k
                        echo
                        echo Valid options are:
-                       echo '  --prefix=PREFIX         Install files in PREFIX [/usr/local]'
-                       echo '  --bindir=DIR            Install executables in DIR [PREFIX/bin]'
-                       echo '  --ctdldir=DIR           Look for Citadel server in DIR [/usr/local/citadel]'
+                       echo '  --ctdldir=DIR           Install Citadel server to DIR [/usr/local/citadel]'
                        echo '  --with-ssl              Force build with OpenSSL support [normally autodetected]'
                        echo '  --without-ssl           Force build without OpenSSL support [normally autodetected]'
                        exit 1
@@ -57,9 +51,13 @@ done
 
 # Set any missing values (FIXME remove the ultra-fatal -W options when finished converting from autotools)
 
-[ "$PREFIX" = "" ]     && PREFIX=/usr/local/citadel
-[ "$BINDIR" = "" ]     && BINDIR=${PREFIX}
-[ "$CTDLDIR" = "" ]    && CTDLDIR=${PREFIX}
+# 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
+
+# Permit override of CFLAGS and LDFLAGS using environment variables
 [ "$CFLAGS" = "" ]     && CFLAGS='-ggdb -Werror -Wfatal-errors -Wno-discarded-qualifiers'
 [ "$LDFLAGS" = "" ]    && LDFLAGS=''
 
@@ -92,11 +90,10 @@ CFLAGS=${CFLAGS}' -DBUILD_ID=\"unknown\"'
 # Output the config.mk
 
 (
+       echo # config.mk is generated by configure
+       echo "CTDLDIR := ${CTDLDIR}"
        echo "CFLAGS := ${CFLAGS}"
        echo "LDFLAGS := ${LDFLAGS}"
-       echo "PREFIX := ${PREFIX}"
-       echo "BINDIR := ${BINDIR}"
-       echo "CTDLDIR := ${CTDLDIR}"
 ) >config.mk
 
 cat config.mk