--- a/configure Sun Oct 01 14:25:26 2023 +0200
+++ b/configure Tue Oct 10 20:34:51 2023 +0200
@@ -14,19 +14,23 @@
touch "$TEMP_DIR/features"
# define standard variables
-PREFIX=/usr
-EPREFIX=
-BINDIR=
-SBINDIR=
-LIBDIR=
-LIBEXECDIR=
-DATADIR=
-SYSCONFDIR=
-SHAREDSTATEDIR=
-LOCALSTATEDIR=
-INCLUDEDIR=
-INFODIR=
-MANDIR=
+# also define standard prefix (this is where we will search for config.site)
+prefix=/usr
+exec_prefix=
+bindir=
+sbindir=
+libdir=
+libexecdir=
+datarootdir=
+datadir=
+sysconfdir=
+sharedstatedir=
+localstatedir=
+runstatedir=
+includedir=
+infodir=
+localedir=
+mandir=
# custom variables
@@ -56,12 +60,14 @@
--sysconfdir=DIR system configuration files [PREFIX/etc]
--sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com]
--localstatedir=DIR modifiable single-machine data [PREFIX/var]
+ --runstatedir=DIR run-time variable data [LOCALSTATEDIR/run]
--libdir=DIR object code libraries [EPREFIX/lib]
--includedir=DIR C header files [PREFIX/include]
--datarootdir=DIR read-only arch.-independent data root [PREFIX/share]
--datadir=DIR read-only architecture-independent data [DATAROOTDIR]
--infodir=DIR info documentation [DATAROOTDIR/info]
--mandir=DIR man documentation [DATAROOTDIR/man]
+ --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
__EOF__
}
@@ -73,19 +79,21 @@
for ARG in "$@"
do
case "$ARG" in
- "--prefix="*) PREFIX=${ARG#--prefix=} ;;
- "--exec-prefix="*) EPREFIX=${ARG#--exec-prefix=} ;;
- "--bindir="*) BINDIR=${ARG#----bindir=} ;;
- "--sbindir="*) SBINDIR=${ARG#--sbindir=} ;;
- "--libdir="*) LIBDIR=${ARG#--libdir=} ;;
- "--libexecdir="*) LIBEXECDIR=${ARG#--libexecdir=} ;;
- "--datadir="*) DATADIR=${ARG#--datadir=} ;;
- "--sysconfdir="*) SYSCONFDIR=${ARG#--sysconfdir=} ;;
- "--sharedstatedir="*) SHAREDSTATEDIR=${ARG#--sharedstatedir=} ;;
- "--localstatedir="*) LOCALSTATEDIR=${ARG#--localstatedir=} ;;
- "--includedir="*) INCLUDEDIR=${ARG#--includedir=} ;;
- "--infodir="*) INFODIR=${ARG#--infodir=} ;;
- "--mandir"*) MANDIR=${ARG#--mandir} ;;
+ "--prefix="*) prefix=${ARG#--prefix=} ;;
+ "--exec-prefix="*) exec_prefix=${ARG#--exec-prefix=} ;;
+ "--bindir="*) bindir=${ARG#----bindir=} ;;
+ "--sbindir="*) sbindir=${ARG#--sbindir=} ;;
+ "--libdir="*) libdir=${ARG#--libdir=} ;;
+ "--libexecdir="*) libexecdir=${ARG#--libexecdir=} ;;
+ "--datarootdir="*) datarootdir=${ARG#--datarootdir=} ;;
+ "--datadir="*) datadir=${ARG#--datadir=} ;;
+ "--sysconfdir="*) sysconfdir=${ARG#--sysconfdir=} ;;
+ "--sharedstatedir="*) sharedstatedir=${ARG#--sharedstatedir=} ;;
+ "--localstatedir="*) localstatedir=${ARG#--localstatedir=} ;;
+ "--includedir="*) includedir=${ARG#--includedir=} ;;
+ "--infodir="*) infodir=${ARG#--infodir=} ;;
+ "--mandir"*) mandir=${ARG#--mandir} ;;
+ "--localedir"*) localedir=${ARG#--localedir} ;;
"--help"*) printhelp; abort_configure ;;
"--debug") BUILD_TYPE="debug" ;;
"--release") BUILD_TYPE="release" ;;
@@ -94,19 +102,41 @@
done
-# set dir variables
-: ${EPREFIX:="$PREFIX"}
-: ${BINDIR:="$EPREFIX/bin"}
-: ${SBINDIR:="$EPREFIX/sbin"}
-: ${LIBDIR:="$EPREFIX/lib"}
-: ${LIBEXECDIR:="$EPREFIX/libexec"}
-: ${DATADIR:="$PREFIX/share"}
-: ${SYSCONFDIR:="$PREFIX/etc"}
-: ${SHAREDSTATEDIR:="$PREFIX/com"}
-: ${LOCALSTATEDIR:="$PREFIX/var"}
-: ${INCLUDEDIR:="$PREFIX/include"}
-: ${INFODIR:="$PREFIX/info"}
-: ${MANDIR:="$PREFIX/man"}
+
+# set defaults for dir variables
+: ${exec_prefix:="$prefix"}
+: ${bindir:='${exec_prefix}/bin'}
+: ${sbindir:='${exec_prefix}/sbin'}
+: ${libdir:='${exec_prefix}/lib'}
+: ${libexecdir:='${exec_prefix}/libexec'}
+: ${datarootdir:='${prefix}/share'}
+: ${datadir:='${datarootdir}'}
+: ${sysconfdir:='${prefix}/etc'}
+: ${sharedstatedir:='${prefix}/com'}
+: ${localstatedir:='${prefix}/var'}
+: ${runstatedir:='${localstatedir}/run'}
+: ${includedir:='${prefix}/include'}
+: ${infodir:='${datarootdir}/info'}
+: ${mandir:='${datarootdir}/man'}
+: ${localedir:='${datarootdir}/locale'}
+
+# check if a config.site exists and load it
+if [ -n "$CONFIG_SITE" ]; then
+ # CONFIG_SITE may contain space separated file names
+ for cs in $CONFIG_SITE; do
+ printf "loading defaults from $cs... "
+ . "$cs"
+ echo ok
+ done
+elif [ -f "$prefix/share/config.site" ]; then
+ printf "loading site defaults... "
+ . "$prefix/share/config.site"
+ echo ok
+elif [ -f "$prefix/etc/config.site" ]; then
+ printf "loading site defaults... "
+ . "$prefix/etc/config.site"
+ echo ok
+fi
# Test for availability of pkg-config
PKG_CONFIG=`command -v pkg-config`
@@ -161,22 +191,23 @@
# generate vars.mk
cat > "$TEMP_DIR/vars.mk" << __EOF__
-PREFIX=$PREFIX
-EPREFIX=$EPREFIX
-BINDIR=$BINDIR
-SBINDIR=$SBINDIR
-LIBDIR=$LIBDIR
-LIBEXECDIR=$LIBEXECDIR
-DATADIR=$DATADIR
-SYSCONFDIR=$SYSCONFDIR
-SHAREDSTATEDIR=$SHAREDSTATEDIR
-LOCALSTATEDIR=$LOCALSTATEDIR
-INCLUDEDIR=$INCLUDEDIR
-INFODIR=$INFODIR
-MANDIR=$MANDIR
+prefix="$prefix"
+exec_prefix="$exec_prefix"
+bindir="$bindir"
+sbindir="$sbindir"
+libdir="$libdir"
+libexecdir="$libexecdir"
+datarootdir="$datarootdir"
+datadir="$datadir"
+sysconfdir="$sysconfdir"
+sharedstatedir="$sharedstatedir"
+localstatedir="$localstatedir"
+runstatedir="$runstatedir"
+includedir="$includedir"
+infodir="$infodir"
+mandir="$mandir"
+localedir="$localedir"
__EOF__
-sort -u -o "$TEMP_DIR/vars.mk" "$TEMP_DIR/vars.mk"
-
# toolchain detection utilities
. make/toolchain.sh
@@ -237,10 +268,10 @@
# add general dependency flags to flags.mk
echo "# general flags" >> "$TEMP_DIR/flags.mk"
-if [ -n "${TEMP_CFLAGS}" ]; then
+if [ -n "${TEMP_CFLAGS}" -a -n "$lang_c" ]; then
echo "CFLAGS += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk"
fi
-if [ -n "${TEMP_CXXFLAGS}" ]; then
+if [ -n "${TEMP_CXXFLAGS}" -a -n "$lang_cpp" ]; then
echo "CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk"
fi
if [ -n "${TEMP_LDFLAGS}" ]; then
@@ -256,7 +287,7 @@
#
echo >> "$TEMP_DIR/flags.mk"
-# Target: default
+echo "configuring target: default"
echo "# flags for target default" >> "$TEMP_DIR/flags.mk"
TEMP_CFLAGS=
TEMP_CXXFLAGS=
@@ -266,19 +297,27 @@
# Features
-if [ -n "${TEMP_CFLAGS}" ]; then
+if [ -n "${TEMP_CFLAGS}" -a -n "$lang_c" ]; then
echo "CFLAGS += $TEMP_CFLAGS" >> "$TEMP_DIR/flags.mk"
fi
-if [ -n "${TEMP_CXXFLAGS}" ]; then
+if [ -n "${TEMP_CXXFLAGS}" -a -n "$lang_cpp" ]; then
echo "CXXFLAGS += $TEMP_CXXFLAGS" >> "$TEMP_DIR/flags.mk"
fi
if [ "$BUILD_TYPE" = "debug" ]; then
- echo 'CFLAGS += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
- echo 'CXXFLAGS += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+ if [ -n "$lang_c" ]; then
+ echo 'CFLAGS += ${DEBUG_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+ fi
+ if [ -n "$lang_cpp" ]; then
+ echo 'CXXFLAGS += ${DEBUG_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+ fi
fi
if [ "$BUILD_TYPE" = "release" ]; then
- echo 'CFLAGS += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
- echo 'CXXFLAGS += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+ if [ -n "$lang_c" ]; then
+ echo 'CFLAGS += ${RELEASE_CC_FLAGS}' >> "$TEMP_DIR/flags.mk"
+ fi
+ if [ -n "$lang_cpp" ]; then
+ echo 'CXXFLAGS += ${RELEASE_CXX_FLAGS}' >> "$TEMP_DIR/flags.mk"
+ fi
fi
if [ -n "${TEMP_LDFLAGS}" ]; then
echo "LDFLAGS += $TEMP_LDFLAGS" >> "$TEMP_DIR/flags.mk"
@@ -296,8 +335,8 @@
echo "configure finished"
echo
echo "Build Config:"
-echo " PREFIX: $PREFIX"
-echo " TOOLCHAIN: $TOOLCHAIN_NAME"
+echo " PREFIX: $prefix"
+echo " TOOLCHAIN: $TOOLCHAIN_NAME"
echo
# generate the config.mk file