Changeset 4966712a


Ignore:
Timestamp:
2015-07-29T22:43:15Z (4 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
adec749
Parents:
24de9fa
Message:

Replace backticks with $(something better) in configure script.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • configure

    r24de9fa r4966712a  
    5151pie=1
    5252
    53 arch=`uname -s`
    54 cpu=`uname -m`
     53arch=$(uname -s)
     54cpu=$(uname -m)
    5555
    5656GLIB_MIN_VERSION=2.16
     
    103103
    104104while [ -n "$1" ]; do
    105         e="`expr "X$1" : 'X--\(.*=.*\)'`"
     105        e="$(expr "X$1" : 'X--\(.*=.*\)')"
    106106        if [ -z "$e" ]; then
    107107                cat<<EOF
     
    157157
    158158# Expand $prefix and get rid of double slashes
    159 bindir=`eval echo "$bindir/" | sed 's/\/\{1,\}/\//g'`
    160 sbindir=`eval echo "$sbindir/" | sed 's/\/\{1,\}/\//g'`
    161 etcdir=`eval echo "$etcdir/" | sed 's/\/\{1,\}/\//g'`
    162 mandir=`eval echo "$mandir/" | sed 's/\/\{1,\}/\//g'`
    163 datadir=`eval echo "$datadir/" | sed 's/\/\{1,\}/\//g'`
    164 config=`eval echo "$config/" | sed 's/\/\{1,\}/\//g'`
    165 plugindir=`eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g'`
    166 includedir=`eval echo "$includedir"/ | sed 's/\/\{1,\}/\//g'`
    167 libevent=`eval echo "$libevent"/ | sed 's/\/\{1,\}/\//g'`
    168 
    169 pidfile=`eval echo "$pidfile" | sed 's/\/\{1,\}/\//g'`
    170 ipcsocket=`eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g'`
    171 pcdir=`eval echo "$pcdir" | sed 's/\/\{1,\}/\//g'`
     159bindir=$(eval echo "$bindir/" | sed 's/\/\{1,\}/\//g')
     160sbindir=$(eval echo "$sbindir/" | sed 's/\/\{1,\}/\//g')
     161etcdir=$(eval echo "$etcdir/" | sed 's/\/\{1,\}/\//g')
     162mandir=$(eval echo "$mandir/" | sed 's/\/\{1,\}/\//g')
     163datadir=$(eval echo "$datadir/" | sed 's/\/\{1,\}/\//g')
     164config=$(eval echo "$config/" | sed 's/\/\{1,\}/\//g')
     165plugindir=$(eval echo "$plugindir/" | sed 's/\/\{1,\}/\//g')
     166includedir=$(eval echo "$includedir"/ | sed 's/\/\{1,\}/\//g')
     167libevent=$(eval echo "$libevent"/ | sed 's/\/\{1,\}/\//g')
     168
     169pidfile=$(eval echo "$pidfile" | sed 's/\/\{1,\}/\//g')
     170ipcsocket=$(eval echo "$ipcsocket" | sed 's/\/\{1,\}/\//g')
     171pcdir=$(eval echo "$pcdir" | sed 's/\/\{1,\}/\//g')
    172172
    173173protocols_mods=""
     
    308308        if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; then
    309309                cat<<EOF >>Makefile.settings
    310 EFLAGS+=`$PKG_CONFIG --libs glib-2.0 gmodule-2.0`
    311 CFLAGS+=`$PKG_CONFIG --cflags glib-2.0 gmodule-2.0`
     310EFLAGS+=$($PKG_CONFIG --libs glib-2.0 gmodule-2.0)
     311CFLAGS+=$($PKG_CONFIG --cflags glib-2.0 gmodule-2.0)
    312312EOF
    313313        else
    314314                echo
    315                 echo 'Found glib2 '`$PKG_CONFIG glib-2.0 --modversion`', but version '$GLIB_MIN_VERSION' or newer is required.'
     315                echo 'Found glib2 '$($PKG_CONFIG glib-2.0 --modversion)', but version '$GLIB_MIN_VERSION' or newer is required.'
    316316                exit 1
    317317        fi
     
    349349        if $PKG_CONFIG --exists gnutls; then
    350350                cat <<EOF >>Makefile.settings
    351 EFLAGS+=`$PKG_CONFIG --libs gnutls` `libgcrypt-config --libs`
    352 CFLAGS+=`$PKG_CONFIG --cflags gnutls` `libgcrypt-config --cflags`
     351EFLAGS+=$($PKG_CONFIG --libs gnutls) $(libgcrypt-config --libs)
     352CFLAGS+=$($PKG_CONFIG --cflags gnutls) $(libgcrypt-config --cflags)
    353353EOF
    354354                ssl=gnutls
     
    360360        elif libgnutls-config --version > /dev/null 2> /dev/null; then
    361361                cat <<EOF >>Makefile.settings
    362 EFLAGS+=`libgnutls-config --libs` `libgcrypt-config --libs`
    363 CFLAGS+=`libgnutls-config --cflags` `libgcrypt-config --cflags`
     362EFLAGS+=$(libgnutls-config --libs) $(libgcrypt-config --libs)
     363CFLAGS+=$(libgnutls-config --cflags) $(libgcrypt-config --cflags)
    364364EOF
    365365               
     
    375375        if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG nss; then
    376376                cat<<EOF >>Makefile.settings
    377 EFLAGS+=`$PKG_CONFIG --libs nss`
    378 CFLAGS+=`$PKG_CONFIG --cflags nss`
     377EFLAGS+=$($PKG_CONFIG --libs nss)
     378CFLAGS+=$($PKG_CONFIG --cflags nss)
    379379EOF
    380380               
     
    621621if [ -z "$systemdsystemunitdir" ]; then
    622622        if $PKG_CONFIG --exists systemd; then
    623                 systemdsystemunitdir=`$PKG_CONFIG --variable=systemdsystemunitdir systemd`
     623                systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)
    624624        fi
    625625fi
Note: See TracChangeset for help on using the changeset viewer.