diff -r 410e4f942ce7 -r 43d6680e6410 src/test/resources/golden-sample/configure --- a/src/test/resources/golden-sample/configure Sun Sep 17 12:34:45 2023 +0200 +++ b/src/test/resources/golden-sample/configure Sun Sep 17 12:39:42 2023 +0200 @@ -1,9 +1,11 @@ #!/bin/sh # create temporary directory -TEMP_DIR=".tmp-$(uname -n)" +TEMP_DIR=".tmp-`uname -n`" rm -Rf "$TEMP_DIR" -if ! mkdir -p "$TEMP_DIR"; then +if mkdir -p "$TEMP_DIR"; then + : +else echo "Cannot create tmp dir $TEMP_DIR" echo "Abort" exit 1 @@ -27,8 +29,8 @@ MANDIR= # custom variables -HOST=$(uname -n) -PREFIX=$(pwd)/work +HOST=`uname -n` +PREFIX=`pwd`/work INSTALL_DIR=$PREFIX # features @@ -102,26 +104,26 @@ # set dir variables -BINDIR=${BINDIR:-"$EPREFIX/bin"} -SBINDIR=${SBINDIR:-"$EPREFIX/sbin"} -LIBDIR=${LIBDIR:-"$EPREFIX/lib"} -LIBEXECDIR=${LIBEXECDIR:-"$EPREFIX/libexec"} -DATADIR=${DATADIR:-"$PREFIX/share"} -SYSCONFDIR=${SYSCONFDIR:-"$PREFIX/etc"} -SHAREDSTATEDIR=${SHAREDSTATEDIR:-"$PREFIX/com"} -LOCALSTATEDIR=${LOCALSTATEDIR:-"$PREFIX/var"} -INCLUDEDIR=${INCLUDEDIR:-"$PREFIX/include"} -INFODIR=${INFODIR:-"$PREFIX/info"} -MANDIR=${MANDIR:-"$PREFIX/man"} +: ${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"} # Test for availability of pkg-config -PKG_CONFIG=$(command -v pkg-config) -PKG_CONFIG=${PKG_CONFIG:-"false"} +PKG_CONFIG=`command -v pkg-config` +: ${PKG_CONFIG:="false"} # Simple uname based platform detection # $PLATFORM is used for platform dependent dependency selection -OS=$(uname -s) -OS_VERSION=$(uname -r) +OS=`uname -s` +OS_VERSION=`uname -r` printf "detect platform... " if [ "$OS" = "SunOS" ]; then PLATFORM="solaris sunos unix svr4" @@ -138,9 +140,9 @@ if echo "$OS" | grep -i "MINGW" > /dev/null; then PLATFORM="windows mingw" fi -PLATFORM=${PLATFORM:-"unix"} +: ${PLATFORM:="unix"} -PLATFORM_NAME=$(echo "$PLATFORM" | cut -f1 -d' ' -) +PLATFORM_NAME=`echo "$PLATFORM" | cut -f1 -d' ' -` echo "$PLATFORM_NAME" isplatform() @@ -153,6 +155,16 @@ done return 1 } +notisplatform() +{ + for p in $PLATFORM + do + if [ "$p" = "$1" ]; then + return 1 + fi + done + return 0 +} # generate config.mk @@ -198,7 +210,7 @@ # create buffer for make variables required by dependencies echo > "$TEMP_DIR/make.mk" -dependency_libpq() +dependency_error_libpq() { printf "checking for libpq... " # dependency libpq @@ -207,19 +219,20 @@ if [ -z "$PKG_CONFIG" ]; then break fi - if ! $PKG_CONFIG libpq ; then + if $PKG_CONFIG libpq ; then + TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags libpq`" + TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs libpq`" + else break fi - TEMP_CFLAGS="$TEMP_CFLAGS $("$PKG_CONFIG" --cflags libpq)" - TEMP_LDFLAGS="$TEMP_LDFLAGS $("$PKG_CONFIG" --libs libpq)" echo yes - return 0 + return 1 done echo no - return 1 + return 0 } -dependency_openssl() +dependency_error_openssl() { printf "checking for openssl... " # dependency openssl @@ -228,50 +241,51 @@ if [ -z "$PKG_CONFIG" ]; then break fi - if ! $PKG_CONFIG openssl ; then + if $PKG_CONFIG openssl ; then + TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags openssl`" + TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs openssl`" + else break fi - TEMP_CFLAGS="$TEMP_CFLAGS $("$PKG_CONFIG" --cflags openssl)" - TEMP_LDFLAGS="$TEMP_LDFLAGS $("$PKG_CONFIG" --libs openssl)" echo yes - return 0 + return 1 done # dependency openssl platform="bsd" while true do - if ! isplatform "bsd"; then + if notisplatform "bsd"; then break fi TEMP_LDFLAGS="$TEMP_LDFLAGS -lssl -lcrypto" echo yes - return 0 + return 1 done echo no - return 1 + return 0 } -dependency_libxml2() +dependency_error_libxml2() { printf "checking for libxml2... " # dependency libxml2 platform="macos" while true do - if ! isplatform "macos"; then + if notisplatform "macos"; then break fi - if tmp_flags=$(xml2-config --cflags) ; then + if tmp_flags=`xml2-config --cflags` ; then TEMP_CFLAGS="$TEMP_CFLAGS $tmp_flags" else break fi - if tmp_flags=$(xml2-config --libs) ; then + if tmp_flags=`xml2-config --libs` ; then TEMP_LDFLAGS="$TEMP_LDFLAGS $tmp_flags" else break fi echo yes - return 0 + return 1 done # dependency libxml2 @@ -280,17 +294,18 @@ if [ -z "$PKG_CONFIG" ]; then break fi - if ! $PKG_CONFIG libxml-2.0 ; then + if $PKG_CONFIG libxml-2.0 ; then + TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags libxml-2.0`" + TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs libxml-2.0`" + else break fi - TEMP_CFLAGS="$TEMP_CFLAGS $("$PKG_CONFIG" --cflags libxml-2.0)" - TEMP_LDFLAGS="$TEMP_LDFLAGS $("$PKG_CONFIG" --libs libxml-2.0)" echo yes - return 0 + return 1 done echo no - return 1 + return 0 } DEPENDENCIES_FAILED= @@ -329,11 +344,11 @@ TEMP_CFLAGS= TEMP_LDFLAGS= -if ! dependency_libxml2; then +if dependency_error_libxml2; then DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED libxml2 " ERROR=1 fi -if ! dependency_openssl; then +if dependency_error_openssl; then DEPENDENCIES_FAILED="$DEPENDENCIES_FAILED openssl " ERROR=1 fi @@ -341,7 +356,7 @@ # Features if [ -n "$FEATURE_PG" ]; then # check dependency - if ! dependency_libpq ; then + if dependency_error_libpq ; then # "auto" features can fail and are just disabled in this case if [ "$FEATURE_PG" = "auto" ]; then unset FEATURE_PG