From e982a349116860ba342df10a19fd73787b5fddff Mon Sep 17 00:00:00 2001 From: vsr Date: Wed, 17 Aug 2005 07:05:07 +0000 Subject: [PATCH] Fix check files errors: autoconf 2.59 (Debian 3.1) applies more strict rules for macros definition --- salome_adm/unix/config_files/ac_cxx_bool.m4 | 2 +- .../unix/config_files/ac_cxx_depend_flag.m4 | 2 +- .../unix/config_files/ac_cxx_mutable.m4 | 2 +- .../unix/config_files/ac_cxx_namespaces.m4 | 2 +- .../ac_cxx_partial_specialization.m4 | 2 +- .../unix/config_files/ac_cxx_typename.m4 | 2 +- .../unix/config_files/check_pthreads.m4 | 2 +- salome_adm/unix/config_files/libtool.m4 | 46 +++++++++---------- salome_adm/unix/config_files/production.m4 | 8 ++-- salome_adm/unix/config_files/pyembed.m4 | 4 +- salome_adm/unix/config_files/python.m4 | 2 +- 11 files changed, 37 insertions(+), 37 deletions(-) diff --git a/salome_adm/unix/config_files/ac_cxx_bool.m4 b/salome_adm/unix/config_files/ac_cxx_bool.m4 index d28ee01dc..69da63dec 100644 --- a/salome_adm/unix/config_files/ac_cxx_bool.m4 +++ b/salome_adm/unix/config_files/ac_cxx_bool.m4 @@ -29,7 +29,7 @@ dnl dnl @version $Id$ dnl @author Luc Maisonobe dnl -AC_DEFUN(AC_CXX_BOOL, +AC_DEFUN([AC_CXX_BOOL], [AC_CACHE_CHECK(whether the compiler recognizes bool as a built-in type, ac_cv_cxx_bool, [AC_LANG_SAVE diff --git a/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 b/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 index ee49cd8a3..9dc8b0fd3 100644 --- a/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 +++ b/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 @@ -27,7 +27,7 @@ dnl dnl @version $Id$ dnl @author Marc Tajchman dnl -AC_DEFUN(AC_DEPEND_FLAG, +AC_DEFUN([AC_DEPEND_FLAG], [AC_CACHE_CHECK(which flag for dependency information generation, ac_cv_depend_flag, [AC_LANG_SAVE diff --git a/salome_adm/unix/config_files/ac_cxx_mutable.m4 b/salome_adm/unix/config_files/ac_cxx_mutable.m4 index 86f5fa730..3d87bacb8 100644 --- a/salome_adm/unix/config_files/ac_cxx_mutable.m4 +++ b/salome_adm/unix/config_files/ac_cxx_mutable.m4 @@ -28,7 +28,7 @@ dnl dnl @version $Id$ dnl @author Luc Maisonobe dnl -AC_DEFUN(AC_CXX_MUTABLE, +AC_DEFUN([AC_CXX_MUTABLE], [AC_CACHE_CHECK(whether the compiler supports the mutable keyword, ac_cv_cxx_mutable, [AC_LANG_SAVE diff --git a/salome_adm/unix/config_files/ac_cxx_namespaces.m4 b/salome_adm/unix/config_files/ac_cxx_namespaces.m4 index 53e9317d6..76b815ace 100644 --- a/salome_adm/unix/config_files/ac_cxx_namespaces.m4 +++ b/salome_adm/unix/config_files/ac_cxx_namespaces.m4 @@ -27,7 +27,7 @@ dnl dnl @version $Id$ dnl @author Luc Maisonobe dnl -AC_DEFUN(AC_CXX_NAMESPACES, +AC_DEFUN([AC_CXX_NAMESPACES], [AC_CACHE_CHECK(whether the compiler implements namespaces, ac_cv_cxx_namespaces, [AC_LANG_SAVE diff --git a/salome_adm/unix/config_files/ac_cxx_partial_specialization.m4 b/salome_adm/unix/config_files/ac_cxx_partial_specialization.m4 index 93589ff80..634d3c640 100644 --- a/salome_adm/unix/config_files/ac_cxx_partial_specialization.m4 +++ b/salome_adm/unix/config_files/ac_cxx_partial_specialization.m4 @@ -28,7 +28,7 @@ dnl @version $Id$ dnl @author Luc Maisonobe dnl -AC_DEFUN(AC_CXX_PARTIAL_SPECIALIZATION, +AC_DEFUN([AC_CXX_PARTIAL_SPECIALIZATION], [AC_CACHE_CHECK(whether the compiler supports partial specialization, ac_cv_cxx_partial_specialization, [AC_LANG_SAVE diff --git a/salome_adm/unix/config_files/ac_cxx_typename.m4 b/salome_adm/unix/config_files/ac_cxx_typename.m4 index 7ec2ad39e..bb1424673 100644 --- a/salome_adm/unix/config_files/ac_cxx_typename.m4 +++ b/salome_adm/unix/config_files/ac_cxx_typename.m4 @@ -26,7 +26,7 @@ dnl dnl @version $Id$ dnl @author Luc Maisonobe dnl -AC_DEFUN(AC_CXX_TYPENAME, +AC_DEFUN([AC_CXX_TYPENAME], [AC_CACHE_CHECK(whether the compiler recognizes typename, ac_cv_cxx_typename, [AC_LANG_SAVE diff --git a/salome_adm/unix/config_files/check_pthreads.m4 b/salome_adm/unix/config_files/check_pthreads.m4 index 983bfc200..80aef2aad 100644 --- a/salome_adm/unix/config_files/check_pthreads.m4 +++ b/salome_adm/unix/config_files/check_pthreads.m4 @@ -29,7 +29,7 @@ dnl@author (C) Ruslan Shevchenko , 1998 dnl@id $Id$ dnl ---------------------------------------------------------------- dnl CHECK_PTHREADS -AC_DEFUN(CHECK_PTHREADS,[ +AC_DEFUN([CHECK_PTHREADS],[ AC_CXX_OPTION(-pthread,CPPFLAGS,flag=yes,flag=no) if test $flag = no; then diff --git a/salome_adm/unix/config_files/libtool.m4 b/salome_adm/unix/config_files/libtool.m4 index 8c5cd7d5a..f28545379 100644 --- a/salome_adm/unix/config_files/libtool.m4 +++ b/salome_adm/unix/config_files/libtool.m4 @@ -22,7 +22,7 @@ ## the same distribution terms that you use for the rest of that program. # serial 40 AC_PROG_LIBTOOL -AC_DEFUN(AC_PROG_LIBTOOL, +AC_DEFUN([AC_PROG_LIBTOOL], [AC_REQUIRE([AC_LIBTOOL_SETUP])dnl # Save cache, so that ltconfig can load it @@ -52,7 +52,7 @@ AC_SUBST(LIBTOOL)dnl exec 5>>./config.log ]) -AC_DEFUN(AC_LIBTOOL_SETUP, +AC_DEFUN([AC_LIBTOOL_SETUP], [AC_PREREQ(2.13)dnl AC_REQUIRE([AC_ENABLE_SHARED])dnl AC_REQUIRE([AC_ENABLE_STATIC])dnl @@ -137,16 +137,16 @@ esac ]) # AC_LIBTOOL_DLOPEN - enable checks for dlopen support -AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) +AC_DEFUN([AC_LIBTOOL_DLOPEN], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) # AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's -AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) +AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) # AC_ENABLE_SHARED - implement the --enable-shared flag # Usage: AC_ENABLE_SHARED[(DEFAULT)] # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # `yes'. -AC_DEFUN(AC_ENABLE_SHARED, [dnl +AC_DEFUN([AC_ENABLE_SHARED], [dnl define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(shared, changequote(<<, >>)dnl @@ -172,14 +172,14 @@ enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl ]) # AC_DISABLE_SHARED - set the default shared flag to --disable-shared -AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_DISABLE_SHARED], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_SHARED(no)]) # AC_ENABLE_STATIC - implement the --enable-static flag # Usage: AC_ENABLE_STATIC[(DEFAULT)] # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # `yes'. -AC_DEFUN(AC_ENABLE_STATIC, [dnl +AC_DEFUN([AC_ENABLE_STATIC], [dnl define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(static, changequote(<<, >>)dnl @@ -205,7 +205,7 @@ enable_static=AC_ENABLE_STATIC_DEFAULT)dnl ]) # AC_DISABLE_STATIC - set the default static flag to --disable-static -AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_DISABLE_STATIC], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_STATIC(no)]) @@ -213,7 +213,7 @@ AC_ENABLE_STATIC(no)]) # Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] # Where DEFAULT is either `yes' or `no'. If omitted, it defaults to # `yes'. -AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl +AC_DEFUN([AC_ENABLE_FAST_INSTALL], [dnl define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(fast-install, changequote(<<, >>)dnl @@ -239,11 +239,11 @@ enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl ]) # AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install -AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_DISABLE_FAST_INSTALL], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_ENABLE_FAST_INSTALL(no)]) # AC_PROG_LD - find the path to the GNU or non-GNU linker -AC_DEFUN(AC_PROG_LD, +AC_DEFUN([AC_PROG_LD], [AC_ARG_WITH(gnu-ld, [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) @@ -313,7 +313,7 @@ test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_PROG_LD_GNU ]) -AC_DEFUN(AC_PROG_LD_GNU, +AC_DEFUN([AC_PROG_LD_GNU], [AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_cv_prog_gnu_ld, [# I'd rather use --version here, but apparently some GNU ld's only accept -v. if $LD -v 2>&1 &5; then @@ -324,7 +324,7 @@ fi]) ]) # AC_PROG_NM - find the path to a BSD-compatible name lister -AC_DEFUN(AC_PROG_NM, +AC_DEFUN([AC_PROG_NM], [AC_MSG_CHECKING([for BSD-compatible nm]) AC_CACHE_VAL(ac_cv_path_NM, [if test -n "$NM"; then @@ -358,7 +358,7 @@ AC_MSG_RESULT([$NM]) ]) # AC_CHECK_LIBM - check for math library -AC_DEFUN(AC_CHECK_LIBM, +AC_DEFUN([AC_CHECK_LIBM], [AC_REQUIRE([AC_CANONICAL_HOST])dnl LIBM= case "$lt_target" in @@ -385,7 +385,7 @@ esac # '${top_srcdir}/' (note the single quotes!). If your package is not # flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. -AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl case "$enable_ltdl_convenience" in no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; "") enable_ltdl_convenience=yes @@ -406,7 +406,7 @@ AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl # not flat and you're not using automake, define top_builddir and # top_srcdir appropriately in the Makefiles. # In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl +AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl AC_CHECK_LIB(ltdl, main, [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], [if test x"$enable_ltdl_install" = xno; then @@ -427,13 +427,13 @@ AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl ]) dnl old names -AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl -AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl -AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl -AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl -AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl -AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl -AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl +AC_DEFUN([AM_PROG_LIBTOOL], [indir([AC_PROG_LIBTOOL])])dnl +AC_DEFUN([AM_ENABLE_SHARED], [indir([AC_ENABLE_SHARED], $@)])dnl +AC_DEFUN([AM_ENABLE_STATIC], [indir([AC_ENABLE_STATIC], $@)])dnl +AC_DEFUN([AM_DISABLE_SHARED], [indir([AC_DISABLE_SHARED], $@)])dnl +AC_DEFUN([AM_DISABLE_STATIC], [indir([AC_DISABLE_STATIC], $@)])dnl +AC_DEFUN([AM_PROG_LD], [indir([AC_PROG_LD])])dnl +AC_DEFUN([AM_PROG_NM], [indir([AC_PROG_NM])])dnl dnl This is just to silence aclocal about the macro not being used ifelse([AC_DISABLE_FAST_INSTALL])dnl diff --git a/salome_adm/unix/config_files/production.m4 b/salome_adm/unix/config_files/production.m4 index dfa8b39e9..dd6bce2d1 100644 --- a/salome_adm/unix/config_files/production.m4 +++ b/salome_adm/unix/config_files/production.m4 @@ -29,7 +29,7 @@ dnl author Patrick GOLDBRONN dnl # AC_ENABLE_PRODUCTION -AC_DEFUN(AC_ENABLE_PRODUCTION, [dnl +AC_DEFUN([AC_ENABLE_PRODUCTION], [dnl define([AC_ENABLE_PRODUCTION_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(production, changequote(<<, >>)dnl @@ -68,10 +68,10 @@ fi ]) # AC_DISABLE_PRODUCTION - set the default flag to --disable-production -AC_DEFUN(AC_DISABLE_PRODUCTION, [AC_ENABLE_PRODUCTION(no)]) +AC_DEFUN([AC_DISABLE_PRODUCTION], [AC_ENABLE_PRODUCTION(no)]) # AC_ENABLE_DEBUG -AC_DEFUN(AC_ENABLE_DEBUG, [dnl +AC_DEFUN([AC_ENABLE_DEBUG], [dnl define([AC_ENABLE_DEBUG_DEFAULT], ifelse($1, no, no, yes))dnl AC_ARG_ENABLE(debug, changequote(<<, >>)dnl @@ -102,5 +102,5 @@ fi ]) # AC_DISABLE_DEBUG - set the default flag to --disable-debug -AC_DEFUN(AC_DISABLE_DEBUG, [AC_ENABLE_DEBUG(no)]) +AC_DEFUN([AC_DISABLE_DEBUG], [AC_ENABLE_DEBUG(no)]) diff --git a/salome_adm/unix/config_files/pyembed.m4 b/salome_adm/unix/config_files/pyembed.m4 index 78cf7f8d2..a1a2a34e6 100644 --- a/salome_adm/unix/config_files/pyembed.m4 +++ b/salome_adm/unix/config_files/pyembed.m4 @@ -22,7 +22,7 @@ dnl dnl This macro defines the PYTHON_EMBED_{CFLAGS,LDFLAGS,LIBS} substitutions dnl that should be used when embedding the python interpreter into a program. dnl AM_INIT_PYTHON_EMBED -AC_DEFUN(AM_INIT_PYTHON_EMBED, +AC_DEFUN([AM_INIT_PYTHON_EMBED], [AC_REQUIRE([AM_PATH_PYTHON]) AC_REQUIRE([AM_INIT_PYEXEC_MOD]) @@ -75,7 +75,7 @@ dnl table for python. The first argument should be the output filename. dnl The second argument gives the names of all the modules you want to build dnl into the executable. dnl AM_PYTHON_CREATE_CONFIG_C(CONFIG_C, MODULE ...) -AC_DEFUN(AM_PYTHON_CREATE_CONFIG_C, +AC_DEFUN([AM_PYTHON_CREATE_CONFIG_C], [AC_REQUIRE([AM_INIT_PYTHON_EMBED]) AC_MSG_CHECKING(for config.c.in) changequote(,)dnl diff --git a/salome_adm/unix/config_files/python.m4 b/salome_adm/unix/config_files/python.m4 index b99b9d138..a8013e290 100644 --- a/salome_adm/unix/config_files/python.m4 +++ b/salome_adm/unix/config_files/python.m4 @@ -34,7 +34,7 @@ dnl while those distributed as `classes' are installed under PYTHON_SITE dnl (eg, ./python1.5/site-packages). The default is to install as dnl a `module'. -AC_DEFUN(CHECK_PYTHON, +AC_DEFUN([CHECK_PYTHON], [ AC_ARG_WITH(python, [ --with-python=DIR root directory path of python installation ], -- 2.39.2