diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2019-07-16 09:04:55 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2019-07-16 09:06:10 +0300 |
commit | 79d50b4ab53f5ea4de6041a52edf938ec0e9c7fd (patch) | |
tree | 7f16b70bafbf5e2deaee633da94e0ecbb017e44a | |
parent | eb66a000db9b2726411c8c0f132c0278bd18c1a3 (diff) | |
download | grecs-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
-rw-r--r-- | am/grecs.m4 | 6 | ||||
-rw-r--r-- | tests/Makefile.am | 2 |
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 @@ -108,16 +108,16 @@ AC_DEFUN([GRECS_SETUP],[ [Set default preprocessor name]) if test -z "$DEFAULT_PREPROCESSOR" ; then DEFAULT_PREPROCESSOR="m4 -s" 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 DEFAULT_PREPROCESSOR="$PPBIN $PREPROC_OPTIONS" _GRECS_IF_OPTION_SET([std-pp-setup], [PP_SETUP_FILE='pp-setup'], diff --git a/tests/Makefile.am b/tests/Makefile.am index dc999e8..3fed2e1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -157,13 +157,13 @@ noinst_PROGRAMS = \ gcfver 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 WSTEST = $(srcdir)/wstest EXTRA_DIST += wstest wspackage.m4 wordsplit-version.h $(WSTEST): $(top_srcdir)/@GRECS_SUBDIR@/wordsplit/wordsplit.at $(srcdir)/wspackage.m4 |