--- a/configure Sun Nov 16 23:02:11 2025 +0100
+++ b/configure Sun Nov 30 16:52:33 2025 +0100
@@ -85,27 +85,18 @@
printhelp()
{
echo "Usage: $0 [OPTIONS]..."
- cat << __EOF__
-Installation directories:
- --prefix=PREFIX path prefix for architecture-independent files
- [$prefix]
- --exec-prefix=EPREFIX path prefix for architecture-dependent files
- [PREFIX]
-
- --bindir=DIR user executables [EPREFIX/bin]
- --sbindir=DIR system admin executables [EPREFIX/sbin]
- --libexecdir=DIR program executables [EPREFIX/libexec]
- --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]
+ echo 'Configuration:'
+if true \
+ ; then
+ :
+ if test -z "$TOOLKIT_HOME__described__"; then
+ TOOLKIT_HOME__described__=1
+ cat << '__EOF__'
+ --toolkit-home location of the toolkit installation (default: /usr)
+__EOF__
+ fi
+fi
+ cat << '__EOF__'
Build Types:
--debug add extra compile flags for debug builds
@@ -116,6 +107,7 @@
--enable-tools enable compilation of tools
__EOF__
+ abort_configure
}
# create temporary directory
@@ -131,30 +123,18 @@
touch "$TEMP_DIR/options"
touch "$TEMP_DIR/features"
-# define standard variables
-# 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
+# config variables
if true \
; then
- SRCDIR=`pwd`
- TOOLKIT_HOME="${TOOLKIT_HOME:=/usr}"
+ :
+ if test -z "$srcdir__initialized__"; then
+ srcdir__initialized__=1
+ srcdir=`pwd`
+ fi
+ if test -z "$TOOLKIT_HOME__initialized__"; then
+ TOOLKIT_HOME__initialized__=1
+ TOOLKIT_HOME='/usr'
+ fi
fi
# features
@@ -166,25 +146,10 @@
for ARG in "$@"
do
case "$ARG" in
- "--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=} ;;
- "--runstatedir="*) runstatedir=${ARG#--runstatedir=} ;;
- "--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" ;;
+ "--toolkit-home="*) TOOLKIT_HOME=${ARG#--toolkit-home=} ;;
+ "--help"*) printhelp ;;
+ "--debug") BUILD_TYPE="debug" ;;
+ "--release") BUILD_TYPE="release" ;;
"--enable-asan") FEATURE_ASAN=on ;;
"--disable-asan") unset FEATURE_ASAN ;;
"--enable-tools") FEATURE_TOOLS=on ;;
@@ -193,6 +158,16 @@
esac
done
+# toolchain detection utilities
+. make/toolchain.sh
+
+# check languages
+lang_c=
+lang_cpp=
+if detect_c_compiler ; then
+ lang_c=1
+fi
+
# set defaults for dir variables
@@ -230,58 +205,49 @@
: ${mandir:='${datarootdir}/man'}
: ${localedir:='${datarootdir}/locale'}
-# remember the above values and compare them later
-orig_bindir="$bindir"
-orig_sbindir="$sbindir"
-orig_libdir="$libdir"
-orig_libexecdir="$libexecdir"
-orig_datarootdir="$datarootdir"
-orig_datadir="$datadir"
-orig_sysconfdir="$sysconfdir"
-orig_sharedstatedir="$sharedstatedir"
-orig_localstatedir="$localstatedir"
-orig_runstatedir="$runstatedir"
-orig_includedir="$includedir"
-orig_infodir="$infodir"
-orig_mandir="$mandir"
-orig_localedir="$localedir"
# check if a config.site exists and load it
+CONFIG_SITE_OK=0
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
+ if [ -f "$cs" ]; then
+ . "$cs"
+ echo ok
+ CONFIG_SITE_OK=1
+ break
+ else
+ echo "not found"
+ fi
done
elif [ -f "$prefix/share/config.site" ]; then
printf "loading site defaults... "
. "$prefix/share/config.site"
echo ok
+ CONFIG_SITE_OK=1
elif [ -f "$prefix/etc/config.site" ]; then
printf "loading site defaults... "
. "$prefix/etc/config.site"
echo ok
-else
+ CONFIG_SITE_OK=1
+fi
+
+if [ $CONFIG_SITE_OK -eq 0 ]; then
# try to detect the correct libdir on our own, except it was changed by the user
- if test "$libdir" = '${exec_prefix}/lib'; then
- if [ "$OS" = "SunOS" ]; then
- test -d "${exec_prefix}/lib/amd64" && libdir='${exec_prefix}/lib/amd64'
- else
- # check if the standard libdir even exists
- if test -d "${exec_prefix}/lib" ; then
- :
+ if [ "$libdir" = '${exec_prefix}/lib' ] ; then
+ if [ "$TOOLCHAIN_WSIZE" = "64" ] ; then
+ if [ "$OS" = "SunOS" ]; then
+ [ -d "${exec_prefix}/lib/64" ] && libdir='${exec_prefix}/lib/64'
else
- # if it does not, maybe a lib32 exists
- test -d "${exec_prefix}/lib32" && libdir='${exec_prefix}/lib32'
+ [ -d "${exec_prefix}/lib64" ] && libdir='${exec_prefix}/lib64'
fi
- # now check if there is a special 64bit libdir that we should use
- for i in x86_64 ppc64 s390x aarch64 aarch64_be arm64 ; do
- if [ $ARCH = $i ]; then
- test -d "${exec_prefix}/lib64" && libdir='${exec_prefix}/lib64'
- break
- fi
- done
+ elif [ "$TOOLCHAIN_WSIZE" = "32" ] ; then
+ if [ "$OS" = "SunOS" ]; then
+ [ -d "${exec_prefix}/lib/32" ] && libdir='${exec_prefix}/lib/32'
+ else
+ [ -d "${exec_prefix}/lib32" ] && libdir='${exec_prefix}/lib32'
+ fi
fi
fi
fi
@@ -289,37 +255,16 @@
# generate vars.mk
cat > "$TEMP_DIR/vars.mk" << __EOF__
-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
+srcdir=$srcdir
+TOOLKIT_HOME=$TOOLKIT_HOME
__EOF__
-# toolchain detection utilities
-. make/toolchain.sh
#
# DEPENDENCIES
#
-# check languages
-lang_c=
-lang_cpp=
-if detect_c_compiler ; then
- lang_c=1
-fi
+
# create buffer for make variables required by dependencies
echo > "$TEMP_DIR/make.mk"
@@ -563,9 +508,6 @@
fi
TEMP_LDFLAGS="$TEMP_LDFLAGS -lm"
- cat >> "$TEMP_DIR/make.mk" << __EOF__
-srcdir=$SRCDIR
-__EOF__
break
done
break
@@ -737,7 +679,7 @@
echo "configure finished"
echo
-echo "Toolchain"
+echo "Toolchain:"
echo " name: $TOOLCHAIN_NAME"
if [ -n "$TOOLCHAIN_CC" ]; then
echo " cc: $TOOLCHAIN_CC"
@@ -752,62 +694,22 @@
echo " default C std: $TOOLCHAIN_CSTD"
fi
echo
-echo "Build Config:"
-echo " prefix: $prefix"
-echo " exec_prefix: $exec_prefix"
-if [ "$orig_bindir" != "$bindir" ]; then
- echo " bindir: $bindir"
-fi
-if [ "$orig_sbindir" != "$sbindir" ]; then
- echo " sbindir: $sbindir"
-fi
-if [ "$orig_libdir" != "$libdir" ]; then
- echo " libdir: $libdir"
-fi
-if [ "$orig_libexecdir" != "$libexecdir" ]; then
- echo " libexecdir: $libexecdir"
-fi
-if [ "$orig_datarootdir" != "$datarootdir" ]; then
- echo " datarootdir: $datarootdir"
-fi
-if [ "$orig_datadir" != "$datadir" ]; then
- echo " datadir: $datadir"
-fi
-if [ "$orig_sysconfdir" != "$sysconfdir" ]; then
- echo " sysconfdir: $sysconfdir"
-fi
-if [ "$orig_sharedstatedir" != "$sharedstatedir" ]; then
- echo " sharedstatedir: $sharedstatedir"
-fi
-if [ "$orig_localstatedir" != "$localstatedir" ]; then
- echo " localstatedir: $localstatedir"
-fi
-if [ "$orig_runstatedir" != "$runstatedir" ]; then
- echo " runstatedir: $runstatedir"
-fi
-if [ "$orig_includedir" != "$includedir" ]; then
- echo " includedir: $includedir"
-fi
-if [ "$orig_infodir" != "$infodir" ]; then
- echo " infodir: $infodir"
-fi
-if [ "$orig_mandir" != "$mandir" ]; then
- echo " mandir: $mandir"
-fi
-if [ "$orig_localedir" != "$localedir" ]; then
- echo " localedir: $localedir"
-fi
+echo "Config:"
+ printf ' %-16s' 'toolkit-home:'
+ echo "$TOOLKIT_HOME"
echo
echo "Features:"
+printf ' %-16s' 'asan:'
if [ -n "$FEATURE_ASAN" ]; then
-echo " asan: on"
+ echo 'on'
else
-echo " asan: off"
+ echo 'off'
fi
+printf ' %-16s' 'tools:'
if [ -n "$FEATURE_TOOLS" ]; then
-echo " tools: on"
+ echo 'on'
else
-echo " tools: off"
+ echo 'off'
fi
echo
