* Makefile.in (install): Add ${srcdir} for cln.m4.

* m4/gmp.m4: quote macro names.
Reported by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.

ChangeLog

@@ -1,3 +1,9 @@
+2004-03-04  Richard B. Kreckel  <kreckel@ginac.de>
+
+	* Makefile.in (install): Add ${srcdir} for cln.m4.
+	* m4/gmp.m4: quote macro names.
+	Reported by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>.
+
 2004-01-01  Richard B. Kreckel  <kreckel@ginac.de>
 
 	* Version 1.1.6 released.

Makefile.in

@@ -6,6 +6,7 @@
 prefix = @prefix@
 local_prefix = /usr/local
 exec_prefix = @exec_prefix@
+srcdir = @srcdir@
 bindir = @bindir@
 datadir = @datadir@
 libdir = @libdir@
@@ -35,7 +36,7 @@ install : installdirs force
 	cd @subdir@; $(MAKE) install
 	$(INSTALL_PROGRAM) cln-config $(DESTDIR)$(bindir)/cln-config
 	$(INSTALL_DATA) cln-config.1 $(DESTDIR)$(mandir)/man1/cln-config.1
-	$(INSTALL_DATA) cln.m4 $(DESTDIR)$(datadir)/aclocal/cln.m4
+	$(INSTALL_DATA) ${srcdir}/cln.m4 ${DESTDIR}${datadir}/aclocal/cln.m4
 	$(INSTALL_DATA) cln.pc $(DESTDIR)$(libdir)/pkgconfig/cln.pc
 
 installdirs : force

autoconf/aclocal.m4

@@ -4502,7 +4502,7 @@ dnl From Richard B. Kreckel.
 AC_PREREQ(2.13)
 
 dnl Is the gmp header file new enough? (should be implemented with an argument)
-AC_DEFUN(CL_GMP_H_VERSION,
+AC_DEFUN([CL_GMP_H_VERSION],
 [AC_CACHE_CHECK([for recent enough gmp.h], cl_cv_new_gmp_h, [
   AC_TRY_CPP([#include <gmp.h>
 #if !defined(__GNU_MP_VERSION) || (__GNU_MP_VERSION < 3)
@@ -4512,7 +4512,7 @@ cl_cv_new_gmp_h="yes", cl_cv_new_gmp_h="no")
 ])])dnl
 
 dnl Does libgmp provide some functionality introduced in version 3.0?
-AC_DEFUN(CL_GMP_CHECK,
+AC_DEFUN([CL_GMP_CHECK],
 [AC_CACHE_CHECK([for working libgmp], cl_cv_new_libgmp, [
     SAVELIBS=$LIBS
     LIBS="$LIBS -lgmp"
@@ -4521,7 +4521,7 @@ cl_cv_new_libgmp="yes", cl_cv_new_libgmp="no"; LIBS=$SAVELIBS)
 ])])
 
 dnl What is sizeof(mp_limb_t)?  (It has to match sizeof(uintD) later.)
-AC_DEFUN(CL_GMP_SET_UINTD,
+AC_DEFUN([CL_GMP_SET_UINTD],
 [AC_CACHE_CHECK([how large gmp demands uintD to be], cl_cv_gmp_set_uintd, [
     AC_TRY_RUN([#include <stdio.h>
 #include <gmp.h>

m4/gmp.m4

@@ -11,7 +11,7 @@ dnl From Richard B. Kreckel.
 AC_PREREQ(2.13)
 
 dnl Is the gmp header file new enough? (should be implemented with an argument)
-AC_DEFUN(CL_GMP_H_VERSION,
+AC_DEFUN([CL_GMP_H_VERSION],
 [AC_CACHE_CHECK([for recent enough gmp.h], cl_cv_new_gmp_h, [
   AC_TRY_CPP([#include <gmp.h>
 #if !defined(__GNU_MP_VERSION) || (__GNU_MP_VERSION < 3)
@@ -21,7 +21,7 @@ cl_cv_new_gmp_h="yes", cl_cv_new_gmp_h="no")
 ])])dnl
 
 dnl Does libgmp provide some functionality introduced in version 3.0?
-AC_DEFUN(CL_GMP_CHECK,
+AC_DEFUN([CL_GMP_CHECK],
 [AC_CACHE_CHECK([for working libgmp], cl_cv_new_libgmp, [
     SAVELIBS=$LIBS
     LIBS="$LIBS -lgmp"
@@ -30,7 +30,7 @@ cl_cv_new_libgmp="yes", cl_cv_new_libgmp="no"; LIBS=$SAVELIBS)
 ])])
 
 dnl What is sizeof(mp_limb_t)?  (It has to match sizeof(uintD) later.)
-AC_DEFUN(CL_GMP_SET_UINTD,
+AC_DEFUN([CL_GMP_SET_UINTD],
 [AC_CACHE_CHECK([how large gmp demands uintD to be], cl_cv_gmp_set_uintd, [
     AC_TRY_RUN([#include <stdio.h>
 #include <gmp.h>