diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2021-10-18 05:16:31 +0200 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2021-10-25 00:18:23 +0200 |
| commit | b75bca666a9a4c4ad51c3b119c044c7f62462d85 (patch) | |
| tree | f9890fb016c5ed2167dea03aeab8a88117fa141a | |
| parent | 208a49c2638eaf63d959ea0cba4eac4fec31b0be (diff) | |
| download | libgphoto2-b75bca666a9a4c4ad51c3b119c044c7f62462d85.tar.gz | |
Here document: Use <<EOF everywhere
Using EOF does the job, is well readable, and there is
just no reason to use any other string.
On the contrary, it may cause additional trouble when
using m4_pattern_forbid.
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | gphoto-m4/gp-set.m4 | 17 |
2 files changed, 10 insertions, 11 deletions
diff --git a/configure.ac b/configure.ac index e5abea2c8..da99fccfb 100644 --- a/configure.ac +++ b/configure.ac @@ -677,7 +677,7 @@ dnl Just enabling "foo" often does not make a camera made by dnl manufacturer "Foo" work. GP_CAMLIBS_CONDITIONAL_WARNING -cat<<_GP_EOF +cat<<EOF Please check whether the configuration I have detected matches what you would like to have. E.g. make sure that USB support is there if you intend to use USB cameras with ${PACKAGE_NAME}. @@ -685,4 +685,4 @@ you intend to use USB cameras with ${PACKAGE_NAME}. Please also check that PKG_CONFIG_PATH contains ${pkgconfigdir} before compiling any libgphoto2 frontend. -_GP_EOF +EOF diff --git a/gphoto-m4/gp-set.m4 b/gphoto-m4/gp-set.m4 index 63993e862..56be8bc57 100644 --- a/gphoto-m4/gp-set.m4 +++ b/gphoto-m4/gp-set.m4 @@ -105,7 +105,6 @@ dnl Try catching unexpanded macros in the output. dnl ###################################################################### m4_pattern_forbid([GP_SET_])dnl m4_pattern_forbid([_GP_SET_])dnl -m4_pattern_allow([GP_SET_EOF])dnl dnl dnl dnl ###################################################################### @@ -245,11 +244,11 @@ dnl ###################################################################### AC_DEFUN([GP_SET_ADD_ALL], [dnl AC_REQUIRE([_GP_SET_INIT])dnl _GP_SET_CHECK([$1])dnl -cat>>"_GP_SET_FILENAME([$1])"<<_GP_EOF +cat>>"_GP_SET_FILENAME([$1])"<<EOF m4_foreach([myvar], [m4_shift($@)], [dnl myvar ])dnl -_GP_EOF +EOF ])dnl dnl dnl @@ -327,17 +326,17 @@ AC_REQUIRE([_GP_SET_INIT])dnl AC_REQUIRE([_GP_SET_CHECK_INIT])dnl AC_REQUIRE([_GP_SET_CANONICALIZE_INIT])dnl AC_REQUIRE([GP_PROG_COMM])dnl -cat>confset_a.txt<<GP_EOF +cat>confset_a.txt<<EOF x y -GP_EOF -cat>confset_b.txt<<GP_EOF +EOF +cat>confset_b.txt<<EOF y z -GP_EOF -cat>confset_res_23.txt<<GP_EOF +EOF +cat>confset_res_23.txt<<EOF x -GP_EOF +EOF AC_MSG_CHECKING([whether comm -23 works]) AS_IF([${COMM} -23 confset_a.txt confset_b.txt > confset_diff_23.txt], [dnl AS_IF([${CMP} confset_diff_23.txt confset_res_23.txt > /dev/null 2>&1], [dnl |