diff options
| author | Todd Lyons <tlyons@exim.org> | 2014-04-23 05:26:34 -0700 |
|---|---|---|
| committer | Todd Lyons <tlyons@exim.org> | 2014-04-23 05:26:34 -0700 |
| commit | 44649fdb169979af3c5a08b10889d1ecee48a469 (patch) | |
| tree | 2e497be61f6055533eede3de61b777e11f7f8e19 /src/scripts/Configure-Makefile | |
| parent | f9f6757065aab65e0f8ad1497e11b8c7ab83cd69 (diff) | |
| parent | c0c4d23c07e2356baae2bd2c6d72339db117b9e6 (diff) | |
Merge branch 'master' of git://git.exim.org/exim
Diffstat (limited to 'src/scripts/Configure-Makefile')
| -rwxr-xr-x | src/scripts/Configure-Makefile | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/src/scripts/Configure-Makefile b/src/scripts/Configure-Makefile index 5e8a72683..eeb26eeb1 100755 --- a/src/scripts/Configure-Makefile +++ b/src/scripts/Configure-Makefile @@ -142,6 +142,10 @@ then fi if [ ".$need_this" != "." ]; then tls_include=`pkg-config --cflags $pc_value` + if [ $? -ne 0 ]; then + echo >&2 "*** Missing pkg-config for package $pc_value (for Exim $var build option)" + exit 1 + fi tls_libs=`pkg-config --libs $pc_value` echo "TLS_INCLUDE=$tls_include" echo "TLS_LIBS=$tls_libs" @@ -161,6 +165,10 @@ then else # main binary cflags=`pkg-config --cflags $pc_value` + if [ $? -ne 0 ]; then + echo >&2 "*** Missing pkg-config for package $pc_value (for Exim $var build option)" + exit 1 + fi libs=`pkg-config --libs $pc_value` if [ "$var" != "${var#LOOKUP_}" ]; then echo "LOOKUP_INCLUDE += $cflags" @@ -178,6 +186,10 @@ then case $PCRE_CONFIG in yes|YES|y|Y) cflags=`pcre-config --cflags` + if [ $? -ne 0 ]; then + echo >&2 "*** Missing pcre-config for regular expression support" + exit 1 + fi libs=`pcre-config --libs` if [ ".$cflags" != "." ]; then echo "INCLUDE += $cflags" @@ -196,6 +208,10 @@ then echo "# End of pkg-config fixups" echo ) >> $mft + subexit=$? + if [ $subexit -ne 0 ]; then + exit $subexit + fi fi rm -f $mftt |