toolkit: comparison configure

-:9b5948aa5b90
+:cc23aad6335e
 # help text
 printhelp()
 {
 echo "Usage: $0 [OPTIONS]..."
-cat << __EOF__
+echo 'Configuration:'
-Installation directories:
+cat << '__EOF__'
---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]
 Build Types:
 --debug                 add extra compile flags for debug builds
 --release               add extra compile flags for release builds
 Options:
---toolkit=(libadwaita|gtk4|gtk3|gtk2|gtk2legacy|qt5|qt4|cocoa|motif)
+--toolkit=(libadwaita|gtk4|gtk3|gtk2|gtk2legacy|qt5|qt4|cocoa|motif|server)
 Optional Features:
 --enable-client
 __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
 # features
 #
 # parse arguments
 #
 BUILD_TYPE="default"
 for ARG in "$@"
 do
 case "$ARG" in
-"--prefix="*)         prefix=${ARG#--prefix=} ;;
+"--help"*) printhelp ;;
-"--exec-prefix="*)    exec_prefix=${ARG#--exec-prefix=} ;;
+"--debug") BUILD_TYPE="debug" ;;
-"--bindir="*)         bindir=${ARG#----bindir=} ;;
+"--release") BUILD_TYPE="release" ;;
-"--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" ;;
 "--toolkit="*) OPT_TOOLKIT=${ARG#--toolkit=} ;;
-"--toolkit")  echo "option '$ARG' needs a value:"; echo "  $ARG=(libadwaita|gtk4|gtk3|gtk2|gtk2legacy|qt5|qt4|cocoa|motif)"; abort_configure ;;
+"--toolkit") echo "option '$ARG' needs a value:"; echo "  $ARG=(libadwaita|gtk4|gtk3|gtk2|gtk2legacy|qt5|qt4|cocoa|motif|server)"; abort_configure ;;
 "--enable-client") FEATURE_CLIENT=on ;;
 "--disable-client") unset FEATURE_CLIENT ;;
 "-"*) echo "unknown option: $ARG"; abort_configure ;;
 esac
 done
+# toolchain detection utilities
+. make/toolchain.sh
+# check languages
+lang_c=
+lang_cpp=
+if detect_cpp_compiler ; then
+lang_cpp=1
+fi
+if detect_c_compiler ; then
+lang_c=1
+fi
 # set defaults for dir variables
 : ${exec_prefix:="$prefix"}
 : ${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'}
+if [ -z "$sysconfdir" ]; then
-: ${runstatedir:='${localstatedir}/run'}
+if [ "$prefix" = '/usr' ]; then
+sysconfdir='/etc'
+else
+sysconfdir='${prefix}/etc'
+fi
+fi
+if [ -z "$localstatedir" ]; then
+if [ "$prefix" = '/usr' ]; then
+localstatedir='/var'
+else
+localstatedir='${prefix}/var'
+fi
+fi
+if [ -z "$runstatedir" ]; then
+if [ "$prefix" = '/usr' ]; then
+runstatedir='/var/run'
+else
+runstatedir='${prefix}/var'
+fi
+fi
 : ${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
+__EOF__
-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__
-# toolchain detection utilities
-. make/toolchain.sh
 #
 # DEPENDENCIES
 #
-# check languages
-lang_c=
-lang_cpp=
-if detect_cpp_compiler ; then
-lang_cpp=1
-fi
-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()
 shift
 printf "$@"
 fi
 }
+dependency_error_server()
+{
+print_check_msg "$dep_checked_server" "checking for server... "
+# dependency server
+while true
+do
+TEMP_CFLAGS="$TEMP_CFLAGS -DUI_SERVER -DUI_WEBVIEW"
+print_check_msg "$dep_checked_server" "yes\n"
+dep_checked_server=1
+return 1
+done
+print_check_msg "$dep_checked_server" "no\n"
+dep_checked_server=1
+return 0
+}
 dependency_error_gtk2legacy()
 {
 print_check_msg "$dep_checked_gtk2legacy" "checking for gtk2legacy... "
 # dependency gtk2legacy
 while true
 break
 fi
 if [ -z "$PKG_CONFIG" ]; then
 break
 fi
-if which qmake-qt5 > /dev/null ; then
+if which qmake-qt5 > /dev/null 2>&1 ; then
 :
 else
 break
 fi
 if test_pkg_config "Qt5Widgets" "" "" "" ; then
 while true
 do
 if [ -z "$PKG_CONFIG" ]; then
 break
 fi
-if pkg-config --atleast-version=2.20 gtk+-2.0 > /dev/null ; then
+if pkg-config --atleast-version=2.20 gtk+-2.0 > /dev/null 2>&1 ; then
 :
 else
 break
 fi
 if test_pkg_config "gtk+-2.0" "" "" "" ; then
 if [ $VERR -ne 0 ]; then
 return 1
 fi
 cat >> "$TEMP_DIR/make.mk" << __EOF__
 TOOLKIT = motif
+__EOF__
+return 0
+}
+checkopt_toolkit_server()
+{
+VERR=0
+if dependency_error_server ; then
+VERR=1
+fi
+if [ $VERR -ne 0 ]; then
+return 1
+fi
+cat >> "$TEMP_DIR/make.mk" << __EOF__
+TOOLKIT = server
 __EOF__
 return 0
 }
 #
 :
 else
 ERROR=1
 DEPENDENCIES_FAILED="option 'toolkit' $DEPENDENCIES_FAILED"
 fi
+elif [ "$OPT_TOOLKIT" = "server" ]; then
+echo "  toolkit: $OPT_TOOLKIT" >> $TEMP_DIR/options
+if checkopt_toolkit_server ; then
+:
+else
+ERROR=1
+DEPENDENCIES_FAILED="option 'toolkit' $DEPENDENCIES_FAILED"
+fi
 else
 echo
 echo "Invalid option value - usage:"
-echo "  --toolkit=(libadwaita|gtk4|gtk3|gtk2|gtk2legacy|qt5|qt4|cocoa|motif)"
+echo "  --toolkit=(libadwaita|gtk4|gtk3|gtk2|gtk2legacy|qt5|qt4|cocoa|motif|server)"
 abort_configure
 fi
 fi
 if [ -n "${TEMP_CFLAGS}" ] && [ -n "$lang_c" ]; then
 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"
-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
 echo "Options:"
 cat "$TEMP_DIR/options"
 echo
 echo "Features:"
+printf '  %-16s' 'client:'
 if [ -n "$FEATURE_CLIENT" ]; then
-echo "  client: on"
+echo 'on'
 else
-echo "  client: off"
+echo 'off'
 fi
 echo
 # generate the config.mk file
 pwd=`pwd`

Mercurial > hg > toolkit / file comparison

comparison: configure

configure