summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2019-07-16 06:04:55 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2019-07-16 06:06:10 (GMT)
commit79d50b4ab53f5ea4de6041a52edf938ec0e9c7fd (patch) (side-by-side diff)
tree7f16b70bafbf5e2deaee633da94e0ecbb017e44a
parenteb66a000db9b2726411c8c0f132c0278bd18c1a3 (diff)
downloadgrecs-79d50b4ab53f5ea4de6041a52edf938ec0e9c7fd.tar.gz
grecs-79d50b4ab53f5ea4de6041a52edf938ec0e9c7fd.tar.bz2
Fix in GRECS_SETUP macro
* am/grecs.m4: Quote the use of $DEFAULT_PREPROCESSOR as argument to expr. * tests/Makefile.am: Fix LDADD
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--am/grecs.m46
-rw-r--r--tests/Makefile.am2
2 files changed, 4 insertions, 4 deletions
diff --git a/am/grecs.m4 b/am/grecs.m4
index f453079..2fb51e6 100644
--- a/am/grecs.m4
+++ b/am/grecs.m4
@@ -111,10 +111,10 @@ AC_DEFUN([GRECS_SETUP],[
fi
save_PATH=$PATH
- PREPROC_OPTIONS=`echo $DEFAULT_PREPROCESSOR | sed -n 's/[[^ ]][[^ ]]* //p'`
+ PREPROC_OPTIONS=`echo "$DEFAULT_PREPROCESSOR" | sed -n 's/[[^ ]][[^ ]]* //p'`
case "$DEFAULT_PREPROCESSOR" in
- /*) PATH=`expr $DEFAULT_PREPROCESSOR : '\(.*\)/.*'`:$PATH
- DEFAULT_PREPROCESSOR=`expr $DEFAULT_PREPROCESSOR : '.*/\(.*\)'`;;
+ /*) PATH=`expr "$DEFAULT_PREPROCESSOR" : '\(.*\)/.*'`:$PATH
+ DEFAULT_PREPROCESSOR=`expr "$DEFAULT_PREPROCESSOR" : '.*/\(.*\)'`;;
esac
AC_PATH_PROG(PPBIN, $DEFAULT_PREPROCESSOR)
if test -n "$PPBIN"; then
diff --git a/tests/Makefile.am b/tests/Makefile.am
index dc999e8..3fed2e1 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -160,7 +160,7 @@ if GRECS_COND_JSON
noinst_PROGRAMS += json
endif
-LDADD = @GRECS_LDADD@ $(LIBINTL) @GRECS_HOST_PROJECT_LDADD@
+LDADD = @GRECS_LDADD@ $(LIBINTL) $(LIBICONV) @GRECS_HOST_PROJECT_LDADD@
AM_CPPFLAGS = @GRECS_INCLUDES@ @GRECS_HOST_PROJECT_INCLUDES@ -I$(srcdir)
# Wordsplit testsuite

Return to:

Send suggestions and report system problems to the System administrator.