ascension: comparison configure

-:8796f03aac26
+:237cb9038109
 # help text
 printhelp()
 {
 echo "Usage: $0 [OPTIONS]..."
-cat << __EOF__
+echo 'Configuration:'
-Installation directories:
+if true \
---prefix=PREFIX         path prefix for architecture-independent files
+; then
-[$prefix]
+:
---exec-prefix=EPREFIX   path prefix for architecture-dependent files
+if test -z "$TOOLKIT_HOME__described__"; then
-[PREFIX]
+TOOLKIT_HOME__described__=1
+cat << '__EOF__'
---bindir=DIR            user executables [EPREFIX/bin]
+--toolkit-home          location of the toolkit installation (default: /usr)
---sbindir=DIR           system admin executables [EPREFIX/sbin]
+__EOF__
---libexecdir=DIR        program executables [EPREFIX/libexec]
+fi
---sysconfdir=DIR        system configuration files [PREFIX/etc]
+fi
---sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
+cat << '__EOF__'
---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]
 Build Types:
 --debug                 add extra compile flags for debug builds
 --release               add extra compile flags for release builds
 Optional Features:
 --enable-asan           enable address sanitization
 --enable-tools          enable compilation of tools
 __EOF__
+abort_configure
 }
 # create temporary directory
 TEMP_DIR=".tmp-`uname -n`"
 rm -Rf "$TEMP_DIR"
 exit 1
 fi
 touch "$TEMP_DIR/options"
 touch "$TEMP_DIR/features"
-# define standard variables
+# config 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
 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
 #
 #
 BUILD_TYPE="default"
 for ARG in "$@"
 do
 case "$ARG" in
-"--prefix="*)         prefix=${ARG#--prefix=} ;;
+"--toolkit-home="*) TOOLKIT_HOME=${ARG#--toolkit-home=} ;;
-"--exec-prefix="*)    exec_prefix=${ARG#--exec-prefix=} ;;
+"--help"*) printhelp ;;
-"--bindir="*)         bindir=${ARG#----bindir=} ;;
+"--debug") BUILD_TYPE="debug" ;;
-"--sbindir="*)        sbindir=${ARG#--sbindir=} ;;
+"--release") BUILD_TYPE="release" ;;
-"--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" ;;
 "--enable-asan") FEATURE_ASAN=on ;;
 "--disable-asan") unset FEATURE_ASAN ;;
 "--enable-tools") FEATURE_TOOLS=on ;;
 "--disable-tools") unset FEATURE_TOOLS ;;
 "-"*) echo "unknown option: $ARG"; abort_configure ;;
 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
 : ${exec_prefix:="$prefix"}
 : ${includedir:='${prefix}/include'}
 : ${infodir:='${datarootdir}/info'}
 : ${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"
+if [ -f "$cs" ]; then
-echo ok
+. "$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 [ "$libdir" = '${exec_prefix}/lib' ] ; then
-if [ "$OS" = "SunOS" ]; then
+if [ "$TOOLCHAIN_WSIZE" = "64" ] ; then
-test -d "${exec_prefix}/lib/amd64" && libdir='${exec_prefix}/lib/amd64'
+if [ "$OS" = "SunOS" ]; then
-else
+[ -d "${exec_prefix}/lib/64" ] && libdir='${exec_prefix}/lib/64'
-# check if the standard libdir even exists
-if test -d "${exec_prefix}/lib" ; then
-:
 else
-# if it does not, maybe a lib32 exists
+[ -d "${exec_prefix}/lib64" ] && libdir='${exec_prefix}/lib64'
-test -d "${exec_prefix}/lib32" && libdir='${exec_prefix}/lib32'
 fi
-# now check if there is a special 64bit libdir that we should use
+elif [ "$TOOLCHAIN_WSIZE" = "32" ] ; then
-for i in x86_64 ppc64 s390x aarch64 aarch64_be arm64 ; do
+if [ "$OS" = "SunOS" ]; then
-if [ $ARCH = $i ]; then
+[ -d "${exec_prefix}/lib/32" ] && libdir='${exec_prefix}/lib/32'
-test -d "${exec_prefix}/lib64" && libdir='${exec_prefix}/lib64'
+else
-break
+[ -d "${exec_prefix}/lib32" ] && libdir='${exec_prefix}/lib32'
 fi
-done
 fi
 fi
 fi
 # generate vars.mk
 cat > "$TEMP_DIR/vars.mk" << __EOF__
-prefix=$prefix
+srcdir=$srcdir
-exec_prefix=$exec_prefix
+TOOLKIT_HOME=$TOOLKIT_HOME
-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__
-# 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"
 test_pkg_config()
 ERROR=1
 break
 fi
 TEMP_LDFLAGS="$TEMP_LDFLAGS -lm"
-cat >> "$TEMP_DIR/make.mk" << __EOF__
-srcdir=$SRCDIR
-__EOF__
 break
 done
 break
 done
 abort_configure
 fi
 echo "configure finished"
 echo
-echo "Toolchain"
+echo "Toolchain:"
 echo "  name:           $TOOLCHAIN_NAME"
 if [ -n "$TOOLCHAIN_CC" ]; then
 echo "  cc:             $TOOLCHAIN_CC"
 fi
 if [ -n "$TOOLCHAIN_CXX" ]; then
 fi
 if [ -n "$TOOLCHAIN_CSTD" ]; then
 echo "  default C std:  $TOOLCHAIN_CSTD"
 fi
 echo
-echo "Build Config:"
+echo "Config:"
-echo "  prefix:         $prefix"
+printf '  %-16s' 'toolkit-home:'
-echo "  exec_prefix:    $exec_prefix"
+echo "$TOOLKIT_HOME"
-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
 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
 # generate the config.mk file
 pwd=`pwd`

Mercurial > hg > ascension / file comparison

comparison: configure

configure