From 5ec0463f3809bd89410d8aff45b91618e6f02bc6 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Tue, 7 Dec 2004 09:47:31 +0000 Subject: [PATCH] avoid warnings with recent automake versions git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_3_X@9355 a592a061-630c-0410-9148-cb99ea01b6c8 --- config/ChangeLog | 4 +++ config/cygwin.m4 | 2 +- config/gnome--.m4 | 2 +- config/gnome.m4 | 24 +++++++++--------- config/gtk--.m4 | 2 +- config/libtool.m4 | 6 ++--- config/lyxinclude.m4 | 54 ++++++++++++++++++++--------------------- config/lyxinclude213.m4 | 6 ++--- config/lyxinclude25x.m4 | 2 +- config/pkg.m4 | 2 +- config/pspell.m4 | 2 +- config/qt.m4 | 14 +++++------ config/xforms.m4 | 4 +-- lib/ChangeLog | 4 +++ lib/reLyX/acinclude.m4 | 8 +++--- status.13x | 2 ++ 16 files changed, 74 insertions(+), 64 deletions(-) diff --git a/config/ChangeLog b/config/ChangeLog index c4d87d27bd..6e1743fe4b 100644 --- a/config/ChangeLog +++ b/config/ChangeLog @@ -1,3 +1,7 @@ +2004-12-06 Jean-Marc Lasgouttes + + * *.m4: quote the name of the macro in AC_DEFUN + 2004-10-06 Jean-Marc Lasgouttes * configure.in (VERSION): diff --git a/config/cygwin.m4 b/config/cygwin.m4 index 7ff5e60d63..84e39ab460 100644 --- a/config/cygwin.m4 +++ b/config/cygwin.m4 @@ -1,7 +1,7 @@ # Macro added for some Cygwin-specific support -*- sh -*- # @author@: Kayvan Sylvan -AC_DEFUN(CHECK_WITH_CYGWIN, +AC_DEFUN([CHECK_WITH_CYGWIN], [ case $host_os in cygwin* | mingw* | pw32* ) diff --git a/config/gnome--.m4 b/config/gnome--.m4 index 9e13a24fe5..133a7336db 100644 --- a/config/gnome--.m4 +++ b/config/gnome--.m4 @@ -5,7 +5,7 @@ dnl Test for GNOMEMM, and define GNOMEMM_INCLUDEDIR, GNOMEMM_LIBDIR, GNOMEMM_LIB dnl to be used as follows: dnl AM_PATH_GNOMEMM([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl -AC_DEFUN(AM_PATH_GNOMEMM, +AC_DEFUN([AM_PATH_GNOMEMM], [ dnl dnl Get the cflags and libraries from the gtkmm-config script diff --git a/config/gnome.m4 b/config/gnome.m4 index 3c62abf67f..a84f82afe9 100644 --- a/config/gnome.m4 +++ b/config/gnome.m4 @@ -161,7 +161,7 @@ dnl /*=== End new stuff for acconfig.h ===*/ dnl -AC_DEFUN(AC_CHECK_CURSES,[ +AC_DEFUN([AC_CHECK_CURSES],[ search_ncurses=true screen_manager="" has_curses=false @@ -225,7 +225,7 @@ AC_DEFUN(AC_CHECK_CURSES,[ ]) -AC_DEFUN(AC_USE_SUNOS_CURSES, [ +AC_DEFUN([AC_USE_SUNOS_CURSES], [ search_ncurses=false screen_manager="SunOS 4.x /usr/5include curses" AC_MSG_RESULT(Using SunOS 4.x /usr/5include curses) @@ -239,7 +239,7 @@ AC_DEFUN(AC_USE_SUNOS_CURSES, [ AC_MSG_RESULT(Please note that some screen refreshs may fail) ]) -AC_DEFUN(AC_USE_OSF1_CURSES, [ +AC_DEFUN([AC_USE_OSF1_CURSES], [ AC_MSG_RESULT(Using OSF1 curses) search_ncurses=false screen_manager="OSF1 curses" @@ -250,7 +250,7 @@ AC_DEFUN(AC_USE_OSF1_CURSES, [ CURSES_LIBS="-lcurses" ]) -AC_DEFUN(AC_USE_SYSV_CURSES, [ +AC_DEFUN([AC_USE_SYSV_CURSES], [ AC_MSG_RESULT(Using SysV curses) AC_DEFINE(HAS_CURSES, 1, [dummy]) has_curses=true @@ -285,7 +285,7 @@ dnl) dnl dnl Parameters: directory filename cureses_LIBS curses_INCLUDEDIR nicename dnl -AC_DEFUN(AC_NCURSES, [ +AC_DEFUN([AC_NCURSES], [ if $search_ncurses then if test -f $1/$2 @@ -302,7 +302,7 @@ AC_DEFUN(AC_NCURSES, [ fi ]) -AC_DEFUN(AC_SEARCH_NCURSES, [ +AC_DEFUN([AC_SEARCH_NCURSES], [ AC_MSG_NOTICE("checking location of ncurses.h file") AC_NCURSES(/usr/include, ncurses.h, -lncurses,, "ncurses on /usr/include") @@ -1145,7 +1145,7 @@ dnl that we need to #include some other header files on some dnl systems to get some types. dnl AC_LIBGTOP_CHECK_TYPE(TYPE, DEFAULT) -AC_DEFUN(AC_LIBGTOP_CHECK_TYPE, +AC_DEFUN([AC_LIBGTOP_CHECK_TYPE], [AC_REQUIRE([AC_HEADER_STDC])dnl AC_MSG_CHECKING(for $1) AC_CACHE_VAL(ac_cv_type_$1, @@ -1480,7 +1480,7 @@ AC_DEFUN([GNOME_ORBIT_CHECK], [ dnl AM_PATH_GNOME_PRINT([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl Test for GNOME-PRINT, and define GNOME_PRINT_CFLAGS and GNOME_PRINT_LIBS dnl -AC_DEFUN(AM_PATH_GNOME_PRINT, +AC_DEFUN([AM_PATH_GNOME_PRINT], [dnl dnl Get the cflags and libraries from the gnome-config script dnl @@ -2185,7 +2185,7 @@ main () dnl dnl Check for struct linger dnl -AC_DEFUN(AC_STRUCT_LINGER, [ +AC_DEFUN([AC_STRUCT_LINGER], [ av_struct_linger=no AC_MSG_CHECKING(struct linger is available) AC_TRY_RUN([ @@ -2212,7 +2212,7 @@ AC_MSG_RESULT($av_struct_linger) ]) dnl See whether we need a declaration for a function. dnl GCC_NEED_DECLARATION(FUNCTION [, EXTRA-HEADER-FILES]) -AC_DEFUN(GCC_NEED_DECLARATION, +AC_DEFUN([GCC_NEED_DECLARATION], [AC_MSG_CHECKING([whether $1 must be declared]) AC_CACHE_VAL(gcc_cv_decl_needed_$1, [AC_TRY_COMPILE([ @@ -2245,7 +2245,7 @@ fi dnl Check multiple functions to see whether each needs a declaration. dnl GCC_NEED_DECLARATIONS(FUNCTION... [, EXTRA-HEADER-FILES]) -AC_DEFUN(GCC_NEED_DECLARATIONS, +AC_DEFUN([GCC_NEED_DECLARATIONS], [for ac_func in $1 do GCC_NEED_DECLARATION($ac_func, $2) @@ -2258,7 +2258,7 @@ done dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS dnl -AC_DEFUN(AM_PATH_GTK, +AC_DEFUN([AM_PATH_GTK], [dnl dnl Get the cflags and libraries from the gtk-config script dnl diff --git a/config/gtk--.m4 b/config/gtk--.m4 index 65f74acd4a..1682248da3 100644 --- a/config/gtk--.m4 +++ b/config/gtk--.m4 @@ -7,7 +7,7 @@ dnl Test for GTKMM, and define GTKMM_CFLAGS and GTKMM_LIBS dnl to be used as follows: dnl AM_PATH_GTKMM([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) dnl -AC_DEFUN(AM_PATH_GTKMM, +AC_DEFUN([AM_PATH_GTKMM], [dnl dnl Get the cflags and libraries from the gtkmm-config script dnl diff --git a/config/libtool.m4 b/config/libtool.m4 index f1746b9d1b..44547cc1fc 100644 --- a/config/libtool.m4 +++ b/config/libtool.m4 @@ -150,7 +150,7 @@ _LT_AC_LTCONFIG_HACK # _LT_AC_CHECK_DLFCN # -------------------- -AC_DEFUN(_LT_AC_CHECK_DLFCN, +AC_DEFUN([_LT_AC_CHECK_DLFCN], [AC_CHECK_HEADERS(dlfcn.h) ])# _LT_AC_CHECK_DLFCN @@ -505,7 +505,7 @@ AC_DIVERT_POP # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) # ------------------------------------------------------------------ -AC_DEFUN(_LT_AC_TRY_DLOPEN_SELF, +AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF], [if test "$cross_compiling" = yes; then : [$4] else @@ -592,7 +592,7 @@ rm -fr conftest* # AC_LIBTOOL_DLOPEN_SELF # ------------------- -AC_DEFUN(AC_LIBTOOL_DLOPEN_SELF, +AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], [if test "x$enable_dlopen" != xyes; then enable_dlopen=unknown enable_dlopen_self=unknown diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4 index dc4d817b93..7de1050aa6 100644 --- a/config/lyxinclude.m4 +++ b/config/lyxinclude.m4 @@ -6,7 +6,7 @@ dnl Allan Rae (rae@lyx.org) dnl Usage LYX_CHECK_VERSION Displays version of LyX being built and dnl sets variables "lyx_devel_version" and "lyx_prerelease" -AC_DEFUN(LYX_CHECK_VERSION,[ +AC_DEFUN([LYX_CHECK_VERSION],[ changequote(, ) dnl echo "configuring LyX version $VERSION" if echo "$VERSION" | grep 'cvs' >/dev/null ; then @@ -31,7 +31,7 @@ fi]) dnl Define the option to set a LyX version on installed executables and directories dnl dnl -AC_DEFUN(LYX_VERSION_SUFFIX,[ +AC_DEFUN([LYX_VERSION_SUFFIX],[ AC_MSG_CHECKING([for install target ... ]) AC_ARG_WITH(version-suffix, [ --with-version-suffix[=] install lyx files as lyx], @@ -48,7 +48,7 @@ AC_MSG_RESULT([$lyxname]) dnl Usage: LYX_ERROR(message) Displays the warning "message" and sets the dnl flag lyx_error to yes. -AC_DEFUN(LYX_ERROR,[ +AC_DEFUN([LYX_ERROR],[ lyx_error_txt="$lyx_error_txt ** $1 " @@ -57,7 +57,7 @@ lyx_error=yes]) dnl Usage: LYX_WARNING(message) Displays the warning "message" and sets the dnl flag lyx_warning to yes. -AC_DEFUN(LYX_WARNING,[ +AC_DEFUN([LYX_WARNING],[ lyx_warning_txt="$lyx_warning_txt == $1 " @@ -66,14 +66,14 @@ lyx_warning=yes]) dnl Usage: LYX_LIB_ERROR(file,library) Displays an error message indication dnl that 'file' cannot be found because 'lib' may be uncorrectly installed. -AC_DEFUN(LYX_LIB_ERROR,[ +AC_DEFUN([LYX_LIB_ERROR],[ LYX_ERROR([Cannot find $1. Please check that the $2 library is correctly installed on your system.])]) dnl Usage: LYX_CHECK_ERRORS Displays a warning message if a LYX_ERROR dnl has occured previously. -AC_DEFUN(LYX_CHECK_ERRORS,[ +AC_DEFUN([LYX_CHECK_ERRORS],[ if test x$lyx_error = xyes; then cat < @@ -307,7 +307,7 @@ fi]) dnl Usage: LYX_STD_COUNT : checks wherer the C++ library have a conforming dnl count template, if not the old HP version is assumed. -AC_DEFUN(LYX_STD_COUNT,[ +AC_DEFUN([LYX_STD_COUNT],[ AC_CACHE_CHECK(for conforming std::count,lyx_cv_std_count, [AC_TRY_COMPILE([ #include @@ -329,7 +329,7 @@ fi]) dnl Usage: LYX_CXX_STL_MODERN_STREAMS : checks whether the C++ compiler dnl supports modern STL streams -AC_DEFUN(LYX_CXX_STL_MODERN_STREAMS,[ +AC_DEFUN([LYX_CXX_STL_MODERN_STREAMS],[ AC_CACHE_CHECK(for modern STL streams,lyx_cv_modern_streams, [AC_TRY_COMPILE([ #include @@ -347,7 +347,7 @@ fi]) dnl Usage: LYX_CXX_STL_STRING : checks whether the C++ compiler dnl has a std::string that is usable for LyX. LyX does not require this dnl std::string to be standard. -AC_DEFUN(LYX_CXX_STL_STRING,[ +AC_DEFUN([LYX_CXX_STL_STRING],[ AC_REQUIRE([AC_PROG_CXX]) AC_MSG_CHECKING(whether the included std::string should be used) AC_ARG_WITH(included-string, @@ -392,7 +392,7 @@ dnl AC_MSG_RESULT([$with_included_string]) dnl Usage: LYX_CXX_GOOD_STD_STRING : checks whether the C++ compiler dnl has a std::string that is close to the standard. So close that dnl methods not found in "unstandard" std::strings are present here. -AC_DEFUN(LYX_CXX_GOOD_STD_STRING,[ +AC_DEFUN([LYX_CXX_GOOD_STD_STRING],[ AC_REQUIRE([AC_PROG_CXX]) AC_CACHE_CHECK([whether the systems std::string is really good], [lyx_cv_std_string_good], @@ -428,7 +428,7 @@ AC_DEFUN(LYX_CXX_GOOD_STD_STRING,[ dnl NOT USED CURRENTLY************************************* dnl LYX_CXX_PARTIAL -AC_DEFUN(LYX_CXX_PARTIAL, [ +AC_DEFUN([LYX_CXX_PARTIAL], [ AC_REQUIRE([AC_PROG_CXX]) AC_CACHE_CHECK([if C++ compiler supports partial specialization], [lyx_cv_cxx_partial_specialization], @@ -457,7 +457,7 @@ AC_DEFUN(LYX_CXX_PARTIAL, [ dnl Usage: LYX_CXX_CHEADERS : checks whether the C++ compiler dnl provides wrappers for C headers and use our alternate version otherwise. -AC_DEFUN(LYX_CXX_CHEADERS,[ +AC_DEFUN([LYX_CXX_CHEADERS],[ AC_CACHE_CHECK(for C headers wrappers,lyx_cv_cxx_cheaders, [AC_TRY_CPP([ #include @@ -475,7 +475,7 @@ fi]) dnl Usage: LYX_CXX_GLOBAL_CSTD: checks whether C library functions dnl are already in the global namespace -AC_DEFUN(LYX_CXX_GLOBAL_CSTD,[ +AC_DEFUN([LYX_CXX_GLOBAL_CSTD],[ AC_CACHE_CHECK(whether C library functions are already in the global namespace, lyx_cv_cxx_global_cstd, [AC_TRY_COMPILE([ @@ -491,7 +491,7 @@ AC_DEFUN(LYX_CXX_GLOBAL_CSTD,[ ]) dnl Usage LYX_PATH_XPM: Checks for xpm library and header -AC_DEFUN(LYX_PATH_XPM,[ +AC_DEFUN([LYX_PATH_XPM],[ ### Check for Xpm library AC_CHECK_LIB(Xpm, XpmCreateBufferFromImage, XPM_LIB="-lXpm", [LYX_LIB_ERROR(libXpm,Xpm)]) @@ -546,7 +546,7 @@ dnl Usage: LYX_FUNC_PUTENV_ARGTYPE dnl Checks whether putenv() takes 'char const *' or 'char *' as dnl argument. This is needed because Solaris 7 (wrongly?) uses 'char *', dnl while everybody else uses the former... -AC_DEFUN(LYX_FUNC_PUTENV_ARGTYPE, +AC_DEFUN([LYX_FUNC_PUTENV_ARGTYPE], [AC_MSG_CHECKING([type of argument for putenv()]) AC_CACHE_VAL(lyx_cv_func_putenv_arg,dnl [AC_TRY_COMPILE(dnl @@ -563,7 +563,7 @@ dnl Usage: LYX_WITH_DIR(dir-name,desc,dir-var-name,default-value, dnl [default-yes-value]) dnl Adds a --with-'dir-name' option (described by 'desc') and puts the dnl resulting directory name in 'dir-var-name'. -AC_DEFUN(LYX_WITH_DIR,[ +AC_DEFUN([LYX_WITH_DIR],[ AC_ARG_WITH($1,[ --with-$1 specify $2]) AC_MSG_CHECKING([for $2]) if test -z "$with_$3"; then @@ -578,7 +578,7 @@ AC_DEFUN(LYX_WITH_DIR,[ dnl Usage: LYX_LOOP_DIR(value,action) dnl Executes action for values of variable `dir' in `values'. `values' can dnl use ":" as a separator. -AC_DEFUN(LYX_LOOP_DIR,[ +AC_DEFUN([LYX_LOOP_DIR],[ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" for dir in `eval "echo $1"`; do if test ! "$dir" = NONE; then @@ -592,7 +592,7 @@ IFS=$ac_save_ifs dnl Usage: LYX_ADD_LIB_DIR(var-name,dir) Adds a -L directive to variable dnl var-name. -AC_DEFUN(LYX_ADD_LIB_DIR,[ +AC_DEFUN([LYX_ADD_LIB_DIR],[ $1="${$1} -L$2" if test "`(uname) 2>/dev/null`" = SunOS && uname -r | grep '^5' >/dev/null; then @@ -606,7 +606,7 @@ fi]) dnl Usage: LYX_ADD_INC_DIR(var-name,dir) Adds a -I directive to variable dnl var-name. -AC_DEFUN(LYX_ADD_INC_DIR,[$1="${$1} -I$2 "]) +AC_DEFUN([LYX_ADD_INC_DIR],[$1="${$1} -I$2 "]) ### Check for a headers existence and location iff it exists ## This is supposed to be a generalised version of LYX_STL_STRING_FWD @@ -619,7 +619,7 @@ AC_DEFUN(LYX_ADD_INC_DIR,[$1="${$1} -I$2 "]) ## the config.h.in file so we need to write our own entries there -- one for ## each header in the form PATH_HEADER_NAME_H ## -AC_DEFUN(LYX_PATH_HEADER, +AC_DEFUN([LYX_PATH_HEADER], [ AC_CHECK_HEADER($1,[ ac_tr_safe=PATH_`echo $ac_safe | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` ### the only remaining problem is getting the second parameter to this @@ -643,7 +643,7 @@ rm -f conftest*]) ### Check which frontend we want to use. The default is XForms ### -AC_DEFUN(LYX_USE_FRONTEND, +AC_DEFUN([LYX_USE_FRONTEND], [AC_MSG_CHECKING([what frontend should be used as main GUI]) AC_ARG_WITH(frontend, [ --with-frontend=THIS Use THIS frontend as main GUI: @@ -663,7 +663,7 @@ AC_SUBST(FRONTEND_LIBS) ## Find a file (or one of more files in a list of dirs) ## ------------------------------------------------------------------------ ## -AC_DEFUN(AC_FIND_FILE, +AC_DEFUN([AC_FIND_FILE], [ $3=NO for i in $2; @@ -679,7 +679,7 @@ done ]) dnl just a wrapper to clean up configure.in -AC_DEFUN(LYX_PROG_LIBTOOL, +AC_DEFUN([LYX_PROG_LIBTOOL], [ AC_REQUIRE([AC_ENABLE_SHARED]) AC_REQUIRE([AC_ENABLE_STATIC]) diff --git a/config/lyxinclude213.m4 b/config/lyxinclude213.m4 index aa0a8d4057..637fde00e1 100644 --- a/config/lyxinclude213.m4 +++ b/config/lyxinclude213.m4 @@ -1,5 +1,5 @@ dnl We use this until autoconf fixes its version. -AC_DEFUN(LYX_FUNC_SELECT_ARGTYPES, +AC_DEFUN([LYX_FUNC_SELECT_ARGTYPES], [AC_MSG_CHECKING([types of arguments for select()]) AC_CACHE_VAL(ac_cv_func_select_arg234,dnl [AC_CACHE_VAL(ac_cv_func_select_arg1,dnl @@ -44,7 +44,7 @@ extern int select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func dnl Check things are declared in headers to avoid errors or warnings. dnl Called like LYX_CHECK_DECL(function, headerfile) dnl Defines HAVE_DECL_{FUNCTION} -AC_DEFUN(LYX_CHECK_DECL, +AC_DEFUN([LYX_CHECK_DECL], [AC_MSG_CHECKING(if $1 is declared by header $2) tr_func=`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` @@ -60,7 +60,7 @@ fi]) dnl This is the multiple headers version of the LYX_CHECK_DECL macro above. dnl Called like LYX_CHECK_DECL_HDRS(function, file1 file2 file3) -AC_DEFUN(LYX_CHECK_DECL_HDRS, +AC_DEFUN([LYX_CHECK_DECL_HDRS], [ got="no" for I in $2; do tr_hdr=`echo $I | tr . _` diff --git a/config/lyxinclude25x.m4 b/config/lyxinclude25x.m4 index 965b84ffb5..1930f198d6 100644 --- a/config/lyxinclude25x.m4 +++ b/config/lyxinclude25x.m4 @@ -6,7 +6,7 @@ m4_define([LYX_AH_CHECK_DECL], dnl Check things are declared in headers to avoid errors or warnings. dnl Called like LYX_CHECK_DECL(function, header1 header2...) dnl Defines HAVE_DECL_{FUNCTION} -AC_DEFUN(LYX_CHECK_DECL, +AC_DEFUN([LYX_CHECK_DECL], [LYX_AH_CHECK_DECL($1) for ac_header in $2 do diff --git a/config/pkg.m4 b/config/pkg.m4 index e18621b182..fba16b6def 100644 --- a/config/pkg.m4 +++ b/config/pkg.m4 @@ -1,7 +1,7 @@ dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) dnl defines GSTUFF_LIBS, GSTUFF_CFLAGS, see pkg-config man page dnl also defines GSTUFF_PKG_ERRORS on error -AC_DEFUN(PKG_CHECK_MODULES, [ +AC_DEFUN([PKG_CHECK_MODULES], [ succeeded=no if test -z "$PKG_CONFIG"; then diff --git a/config/pspell.m4 b/config/pspell.m4 index cbc018734a..8fe950bf0c 100644 --- a/config/pspell.m4 +++ b/config/pspell.m4 @@ -1,7 +1,7 @@ # Macro to add for using pspell spellchecker libraries! -*- sh -*- # @author@: Jürgen Vigna -AC_DEFUN(CHECK_WITH_PSPELL, +AC_DEFUN([CHECK_WITH_PSPELL], [ USE_PSPELL="no" AC_MSG_CHECKING([for pspell support]) diff --git a/config/qt.m4 b/config/qt.m4 index ed551ea617..c21dc14625 100644 --- a/config/qt.m4 +++ b/config/qt.m4 @@ -1,5 +1,5 @@ dnl find a binary in the path -AC_DEFUN(QT_FIND_PATH, +AC_DEFUN([QT_FIND_PATH], [ AC_MSG_CHECKING([for $1]) AC_CACHE_VAL(qt_cv_path_$1, @@ -43,7 +43,7 @@ AC_DEFUN(QT_FIND_PATH, ]) dnl Find the uic compiler on the path or in qt_cv_dir -AC_DEFUN(QT_FIND_UIC, +AC_DEFUN([QT_FIND_UIC], [ QT_FIND_PATH(uic, ac_uic, $qt_cv_dir/bin) if test -z "$ac_uic" -a "$FATAL" = 1; then @@ -52,7 +52,7 @@ AC_DEFUN(QT_FIND_UIC, ]) dnl Find the right moc in path/qt_cv_dir -AC_DEFUN(QT_FIND_MOC, +AC_DEFUN([QT_FIND_MOC], [ QT_FIND_PATH(moc2, ac_moc2, $qt_cv_dir/bin) QT_FIND_PATH(moc, ac_moc1, $qt_cv_dir/bin) @@ -79,7 +79,7 @@ AC_DEFUN(QT_FIND_MOC, ]) dnl check a particular libname -AC_DEFUN(QT_TRY_LINK, +AC_DEFUN([QT_TRY_LINK], [ SAVE_LIBS="$LIBS" LIBS="$LIBS $1" @@ -99,7 +99,7 @@ AC_DEFUN(QT_TRY_LINK, ]) dnl check we can do a compile -AC_DEFUN(QT_CHECK_COMPILE, +AC_DEFUN([QT_CHECK_COMPILE], [ AC_MSG_CHECKING([for Qt library name]) @@ -131,7 +131,7 @@ AC_DEFUN(QT_CHECK_COMPILE, ]) dnl get Qt version we're using -AC_DEFUN(QT_GET_VERSION, +AC_DEFUN([QT_GET_VERSION], [ AC_CACHE_CHECK([Qt version],lyx_cv_qtversion, [ @@ -157,7 +157,7 @@ EOF ]) dnl start here -AC_DEFUN(QT_DO_IT_ALL, +AC_DEFUN([QT_DO_IT_ALL], [ dnl Please leave this alone. I use this file in dnl oprofile. diff --git a/config/xforms.m4 b/config/xforms.m4 index 2b6a5c00ca..5ad82b6e83 100644 --- a/config/xforms.m4 +++ b/config/xforms.m4 @@ -3,7 +3,7 @@ dnl some macros to test for xforms-related functionality -*- sh -*- dnl Usage LYX_PATH_XFORMS: Checks for xforms library and flags dnl If it is found, the variable XFORMS_LIB is set to the relevant -l flags, dnl and FORMS_H_LOCATION / FLIMAGE_H_LOCATION is also set -AC_DEFUN(LYX_PATH_XFORMS,[ +AC_DEFUN([LYX_PATH_XFORMS],[ AC_REQUIRE([LYX_PATH_XPM]) AC_CHECK_LIB(forms, fl_initialize, XFORMS_LIB="-lforms", @@ -57,7 +57,7 @@ fi dnl Check the details of the xforms image loader -AC_DEFUN(LYX_CHECK_XFORMS_IMAGE_LOADER, +AC_DEFUN([LYX_CHECK_XFORMS_IMAGE_LOADER], [AC_REQUIRE([LYX_PATH_XFORMS]) save_LIBS=$LIBS LIBS="$XFORMS_LIB $XPM_LIB $LIBS" diff --git a/lib/ChangeLog b/lib/ChangeLog index 2ac7a4643e..ef4df0b75e 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,7 @@ +2004-12-07 Jean-Marc Lasgouttes + + * reLyX/acinclude.m4: quote the name of the macro in AC_DEFUN + 2004-11-05 Bennett Helm * bind/mac.bind: use -Tab and -backtab as shortcuts for diff --git a/lib/reLyX/acinclude.m4 b/lib/reLyX/acinclude.m4 index ae92628600..23a02a121f 100644 --- a/lib/reLyX/acinclude.m4 +++ b/lib/reLyX/acinclude.m4 @@ -1,6 +1,6 @@ dnl Usage: RELYX_WARNING(message) Displays the warning "message" and sets dnl the flag lyx_warning to yes. -AC_DEFUN(RELYX_WARNING,[ +AC_DEFUN([RELYX_WARNING],[ relyx_warning_txt="$relyx_warning_txt == $1 " @@ -47,7 +47,7 @@ done dnl Usage RELYX_PROG_PERL_OK -AC_DEFUN(RELYX_PROG_PERL_OK,[ +AC_DEFUN([RELYX_PROG_PERL_OK],[ if echo 'require 5.002;exit' | $ac_dir/$ac_prog 2>&5 then PERL=$ac_dir/$ac_prog @@ -56,7 +56,7 @@ else fi]) dnl Usage RELYX_CHECK_PERL -AC_DEFUN(RELYX_CHECK_PERL,[ +AC_DEFUN([RELYX_CHECK_PERL],[ AC_MSG_CHECKING([for perl >= 5.002]) RELYX_SEARCH_PROG(PERL, perl perl5 perl5.6.1 perl5.6.0 perl5.005 perl5.004 perl5.003 perl5.002, RELYX_PROG_PERL_OK @@ -77,7 +77,7 @@ AC_SUBST(PERL)]) dnl Usage: RELYX_CHECK_ERRORS Displays a warning message if a RELYX_ERROR dnl has occured previously. -AC_DEFUN(RELYX_CHECK_ERRORS,[ +AC_DEFUN([RELYX_CHECK_ERRORS],[ if test x$relyx_error = xyes; then cat <