From ad7e50a3827e425496c6128f4ce0f0b623b72ad7 Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Wed, 3 Mar 2004 23:37:58 +0000 Subject: [PATCH] * Makefile.in (install): Add ${srcdir} for cln.m4. * m4/gmp.m4: quote macro names. Reported by Ralf Wildenhues . --- ChangeLog | 6 ++++++ Makefile.in | 3 ++- autoconf/aclocal.m4 | 6 +++--- m4/gmp.m4 | 6 +++--- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5fb1b22..76de39a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-03-04 Richard B. Kreckel + + * Makefile.in (install): Add ${srcdir} for cln.m4. + * m4/gmp.m4: quote macro names. + Reported by Ralf Wildenhues . + 2004-01-01 Richard B. Kreckel * Version 1.1.6 released. diff --git a/Makefile.in b/Makefile.in index cd58e51..7a15e7a 100644 --- a/Makefile.in +++ b/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 diff --git a/autoconf/aclocal.m4 b/autoconf/aclocal.m4 index fb0d4ff..28c5d3f 100644 --- a/autoconf/aclocal.m4 +++ b/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 #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 #include diff --git a/m4/gmp.m4 b/m4/gmp.m4 index 4ce5c35..1fb0db9 100644 --- a/m4/gmp.m4 +++ b/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 #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 #include