Bug#978831: patch gyoto for autoconf 2.70

2021-09-21 Thread Thibaut Paumard
Thanks for the patch Étienne, very appreciated!



OpenPGP_signature
Description: OpenPGP digital signature


Bug#978831: patch gyoto for autoconf 2.70

2021-09-15 Thread Étienne Mollier
Control: tag -1 patch

Hi Thibaut,

Since version 2.70, autoreconf has become somewhat more picky
about the macro expansions, and they seem to need a bit more
protection.  I adjusted some parts of the configure.ac until it
fixed the configure process, in the patch in attachment.  (Maybe
not all changes of the patch are required, but it works as is.)

In hope this helps,
Have a nice day,  :)
-- 
Étienne Mollier 
Fingerprint:  8f91 b227 c7d6 f2b1 948c  8236 793c f67e 8f0d 11da
Sent from /dev/pts/5, please excuse my verbosity.
--- gyoto-1.4.4.orig/configure.ac
+++ gyoto-1.4.4/configure.ac
@@ -159,14 +159,14 @@
 	[],
 	[with_virtualenv=no])
 AS_IF([test "x$with_virtualenv" != xno],
-	AC_CHECK_PROGS([VIRTUALENV], [virtualenv virtualenv3 virtualenv2], [no])
-	AS_IF([test "x$VIRTUALENV" = xno],
+	[AC_CHECK_PROGS([VIRTUALENV], [virtualenv virtualenv3 virtualenv2], [no])]
+	[AS_IF([test "x$VIRTUALENV" = xno],
 	[AC_MSG_FAILURE(
-		[--with-virtualenv given but virtualenv could not be found])]),
-	AC_SUBST([VIRTUALENV], [no]))
+		[--with-virtualenv given but virtualenv could not be found])])],
+	[AC_SUBST([VIRTUALENV], [no])])
 AC_ARG_VAR([VIRTUALENV_FLAGS], [flags to pass to the virtualenv command])
 
-AX_PKG_SWIG(2.0)
+AX_PKG_SWIG([2.0])
 
 # DONE WITH PYTHON STUFF
 
@@ -184,7 +184,7 @@
 AS_IF([test "x$HAVE_CXX11" != "x1" && test "x$enable_c__11" = "xyes"],
   [AC_MSG_ERROR([C++11 requested but not found])])
 
-AC_ARG_WITH(mpi, [AS_HELP_STRING([--with-mpi],
+AC_ARG_WITH([mpi], [AS_HELP_STRING([--with-mpi],
 [compile with MPI (parallelization) support. If none is found,
 MPI is not used. Default: auto])
 ],,[with_mpi=auto])


signature.asc
Description: PGP signature