revert command substitution syntax change (relates to #283) configure-evo

Fri, 15 Sep 2023 11:33:35 +0200

author
Olaf Wintermann <olaf.wintermann@gmail.com>
date
Fri, 15 Sep 2023 11:33:35 +0200
branch
configure-evo
changeset 53
704368f1bb23
parent 52
afcb57893858
child 54
2b8f40c58944

revert command substitution syntax change (relates to #283)

test/configure file | annotate | diff | comparison | revisions
test/make/configure.vm file | annotate | diff | comparison | revisions
--- a/test/configure	Thu Sep 14 22:59:05 2023 +0200
+++ b/test/configure	Fri Sep 15 11:33:35 2023 +0200
@@ -1,7 +1,7 @@
 #!/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
     echo "Cannot create tmp dir $TEMP_DIR"
@@ -27,7 +27,7 @@
 MANDIR=
 
 # custom variables
-HOST=$(uname -n)
+HOST=`uname -n`
 PREFIX=$(pwd)/work
 INSTALL_DIR=$PREFIX
 
@@ -115,13 +115,13 @@
 MANDIR=${MANDIR:-"$PREFIX/man"}
 
 # Test for availability of pkg-config
-PKG_CONFIG=$(command -v pkg-config)
+PKG_CONFIG=`command -v pkg-config`
 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"
@@ -140,7 +140,7 @@
 fi
 PLATFORM=${PLATFORM:-"unix"}
 
-PLATFORM_NAME=$(echo "$PLATFORM" | cut -f1 -d' ' -)
+PLATFORM_NAME=`echo "$PLATFORM" | cut -f1 -d' ' -`
 echo "$PLATFORM_NAME"
 
 isplatform()
@@ -210,8 +210,8 @@
         if ! $PKG_CONFIG libpq ; then
             break
         fi
-        TEMP_CFLAGS="$TEMP_CFLAGS $("$PKG_CONFIG" --cflags libpq)"
-        TEMP_LDFLAGS="$TEMP_LDFLAGS $("$PKG_CONFIG" --libs libpq)"
+        TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags libpq`"
+        TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs libpq`"
         echo yes
         return 0
     done
@@ -231,8 +231,8 @@
         if ! $PKG_CONFIG openssl ; then
             break
         fi
-        TEMP_CFLAGS="$TEMP_CFLAGS $("$PKG_CONFIG" --cflags openssl)"
-        TEMP_LDFLAGS="$TEMP_LDFLAGS $("$PKG_CONFIG" --libs openssl)"
+        TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags openssl`"
+        TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs openssl`"
         echo yes
         return 0
     done
@@ -260,12 +260,12 @@
         if ! isplatform "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
@@ -283,8 +283,8 @@
         if ! $PKG_CONFIG libxml-2.0 ; then
             break
         fi
-        TEMP_CFLAGS="$TEMP_CFLAGS $("$PKG_CONFIG" --cflags libxml-2.0)"
-        TEMP_LDFLAGS="$TEMP_LDFLAGS $("$PKG_CONFIG" --libs libxml-2.0)"
+        TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags libxml-2.0`"
+        TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs libxml-2.0`"
         echo yes
         return 0
     done
--- a/test/make/configure.vm	Thu Sep 14 22:59:05 2023 +0200
+++ b/test/make/configure.vm	Fri Sep 15 11:33:35 2023 +0200
@@ -1,7 +1,7 @@
 #!/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
     echo "Cannot create tmp dir $TEMP_DIR"
@@ -29,7 +29,7 @@
 # custom variables
 #foreach( $var in $vars )
 #if( $var.exec )
-${var.varName}=$(${var.value})
+${var.varName}=`${var.value}`
 #else
 ${var.varName}=${var.value}
 #end
@@ -147,13 +147,13 @@
 MANDIR=${MANDIR:-"$PREFIX/man"}
 
 # Test for availability of pkg-config
-PKG_CONFIG=$(command -v pkg-config)
+PKG_CONFIG=`command -v pkg-config`
 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"
@@ -172,7 +172,7 @@
 fi
 PLATFORM=${PLATFORM:-"unix"}
 
-PLATFORM_NAME=$(echo "$PLATFORM" | cut -f1 -d' ' -)
+PLATFORM_NAME=`echo "$PLATFORM" | cut -f1 -d' ' -`
 echo "$PLATFORM_NAME"
 
 isplatform()
@@ -263,12 +263,12 @@
         if ! $pkg.getPkgConfigTestQuery() ; then
             break
         fi
-        TEMP_CFLAGS="$TEMP_CFLAGS $("$PKG_CONFIG" --cflags $pkg.name)"
-        TEMP_LDFLAGS="$TEMP_LDFLAGS $("$PKG_CONFIG" --libs $pkg.name)"
+        TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags $pkg.name`"
+        TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs $pkg.name`"
         #end
         #foreach( $flags in $sub.flags )
         #if( $flags.exec )
-        if tmp_flags=$($flags.value) ; then
+        if tmp_flags=`$flags.value` ; then
             TEMP_$flags.varName="$TEMP_$flags.varName $tmp_flags"
         else
             break
@@ -328,14 +328,14 @@
             break
         fi
         echo yes
-        TEMP_CFLAGS="$TEMP_CFLAGS $("$PKG_CONFIG" --cflags $pkg.name)"
-        TEMP_LDFLAGS="$TEMP_LDFLAGS $("$PKG_CONFIG" --libs $pkg.name)"
+        TEMP_CFLAGS="$TEMP_CFLAGS `"$PKG_CONFIG" --cflags $pkg.name`"
+        TEMP_LDFLAGS="$TEMP_LDFLAGS `"$PKG_CONFIG" --libs $pkg.name`"
         #end
 
         #foreach( $flags in $dependency.flags )
         #if( $flags.exec )
         $flags.value > /dev/null
-        if tmp_flags=$($flags.value) ; then
+        if tmp_flags=`$flags.value` ; then
             TEMP_$flags.varName="$TEMP_$flags.varName $tmp_flags"
         else
             ERROR=1

mercurial