From dd9708a7ac34a25ee6a82332b495c4d4a7141d08 Mon Sep 17 00:00:00 2001 From: Frank Mori Hess Date: Mon, 12 Jan 2004 00:45:38 +0000 Subject: [PATCH] added some more m4 quoting to get rid of automake1.8 warnings --- m4/as-linux.m4 | 26 +++++++++++++------------- m4/as-modtool.m4 | 4 ++-- m4/rtai.m4 | 2 +- m4/rtlinux.m4 | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/m4/as-linux.m4 b/m4/as-linux.m4 index 9c98d282..6c6da5b0 100644 --- a/m4/as-linux.m4 +++ b/m4/as-linux.m4 @@ -46,7 +46,7 @@ dnl End of search list. dnl check if we can find a source dir for the Linux kernel dnl defines LINUX_DIR to the absolute location of a usable kernel source tree -AC_DEFUN(AS_LINUX_DIR, +AC_DEFUN([AS_LINUX_DIR], [ AC_ARG_WITH([linuxdir], [AC_HELP_STRING([--with-linuxdir=DIR], @@ -79,7 +79,7 @@ AC_DEFUN(AS_LINUX_DIR, ]) dnl check if the given candidate path for a linux source tree is usable -AC_DEFUN(AS_TRY_LINUX_DIR, +AC_DEFUN([AS_TRY_LINUX_DIR], [AC_MSG_CHECKING(for Linux in $1) if test -f "$1/Makefile" ; then @@ -96,7 +96,7 @@ AC_DEFUN(AS_TRY_LINUX_DIR, dnl check if we can find a config file for the Linux kernel dnl defines CONFIG_FILE to the absolute location of a usable kernel source tree dnl uses LINUX_DIR to find either .config or decent configs in configs/ -AC_DEFUN(AS_CONFIG_FILE, +AC_DEFUN([AS_CONFIG_FILE], [ AC_ARG_WITH([linux-config], [AC_HELP_STRING([--with-linux-config=FILE], @@ -141,7 +141,7 @@ Fix before continuing or specify a config file using --with-linux-config.]) ]) dnl check if the given candidate config file is usable -AC_DEFUN(AS_TRY_CONFIG_FILE, +AC_DEFUN([AS_TRY_CONFIG_FILE], [AC_MSG_CHECKING(for configuration in $1) if test -f "$1" ; then @@ -160,7 +160,7 @@ dnl RH/Fedora defines this in linux/rhconfig.h, included from linux/version.h dnl if this is present, a few extra defines need to be present to make sure dnl symbol versioning is correct dnl uses LINUX_DIR to find rhconfig.h -AC_DEFUN(AS_CHECK_REDHAT, +AC_DEFUN([AS_CHECK_REDHAT], [ AC_MSG_CHECKING(Red Hat/Fedora kernel) HAVE_REDHAT_KERNEL=false @@ -169,7 +169,7 @@ AC_DEFUN(AS_CHECK_REDHAT, AC_COMPILE_IFELSE(AC_LANG_PROGRAM([ #include "rhconfig.h" int code = RED_HAT_LINUX_KERNEL; - ]), + ]), AC_MSG_RESULT(found); HAVE_REDHAT_KERNEL=true, AC_MSG_RESULT(not found)) dnl restore CFLAGS @@ -222,7 +222,7 @@ int code = RED_HAT_LINUX_KERNEL; dnl main entry point dnl checks the version, and figures out all flags to use to make modules. -AC_DEFUN(AS_LINUX, +AC_DEFUN([AS_LINUX], [ AS_LINUX_DIR() AS_CONFIG_FILE() @@ -282,7 +282,7 @@ int code = LINUX_VERSION_CODE; esac ]) -AC_DEFUN(AS_LINUX_2_6, +AC_DEFUN([AS_LINUX_2_6], [ AC_MSG_CHECKING(for Linux CFLAGS) @@ -335,7 +335,7 @@ EOF ]) -AC_DEFUN(AS_LINUX_2_4, +AC_DEFUN([AS_LINUX_2_4], [ AC_MSG_CHECKING(for Linux 2.4 make flags) dnl we try to figure out the CFLAGS by invoking the Makefile on @@ -353,7 +353,7 @@ You need to run 'make dep' on the kernel source before continuing.]) POPDIR=`(pwd)` cd ${LINUX_DIR} ( sed "s|\.config|${CONFIG_FILE}|g" Makefile && cat < ${TMPFILE} - + get_cflags: @echo LINUX_ARCH=\"\$(ARCH)\" @echo LINUX_AFLAGS=\"\$(AFLAGS)\" | sed 's_Iinclude_I\"\$(LINUXDIR)/include\"_g' @@ -400,7 +400,7 @@ EOF AC_MSG_RESULT($LINUX_LDFLAGS) ]) -AC_DEFUN(AS_CHECK_LINUX_CONFIG_OPTION, +AC_DEFUN([AS_CHECK_LINUX_CONFIG_OPTION], [ AC_MSG_CHECKING([Linux config option $1]) @@ -419,7 +419,7 @@ AC_DEFUN(AS_CHECK_LINUX_CONFIG_OPTION, AC_MSG_RESULT([$result]) ]) -AC_DEFUN(AS_LINUX_CONFIG_OPTION, +AC_DEFUN([AS_LINUX_CONFIG_OPTION], [ AS_CHECK_LINUX_CONFIG_OPTION([$1], [$1=yes], @@ -429,7 +429,7 @@ AC_DEFUN(AS_LINUX_CONFIG_OPTION, AM_CONDITIONAL([$1],[test "${$1}" = yes]) ]) -AC_DEFUN(AS_LINUX_CONFIG_OPTION_MODULE, +AC_DEFUN([AS_LINUX_CONFIG_OPTION_MODULE], [ AS_CHECK_LINUX_CONFIG_OPTION([$1], [$1=yes], diff --git a/m4/as-modtool.m4 b/m4/as-modtool.m4 index 7ceba421..d4a0487b 100644 --- a/m4/as-modtool.m4 +++ b/m4/as-modtool.m4 @@ -12,7 +12,7 @@ dnl this macro defines: dnl moduledir dnl modulePROGRAMS_INSTALL dnl modulePROGRAMS_UNINSTALL -dnl +dnl dnl End of search list. dnl @@ -21,7 +21,7 @@ dnl How do you specify that the building of modtool should go to the dnl end of the configure script? dnl -AC_DEFUN(AS_LINUX_MODTOOL, +AC_DEFUN([AS_LINUX_MODTOOL], [ #AS_LINUX() diff --git a/m4/rtai.m4 b/m4/rtai.m4 index d3e108f5..7da6c7ac 100644 --- a/m4/rtai.m4 +++ b/m4/rtai.m4 @@ -1,5 +1,5 @@ -AC_DEFUN(DS_RTAI, +AC_DEFUN([DS_RTAI], [ AC_ARG_WITH([rtaidir], [AC_HELP_STRING([--with-rtaidir=DIR], diff --git a/m4/rtlinux.m4 b/m4/rtlinux.m4 index 3aade1e8..6f4c8ff4 100644 --- a/m4/rtlinux.m4 +++ b/m4/rtlinux.m4 @@ -1,5 +1,5 @@ -AC_DEFUN(DS_RTLINUX, +AC_DEFUN([DS_RTLINUX], [ AC_ARG_WITH([rtlinuxdir], [AC_HELP_STRING([--with-rtlinuxdir=DIR], -- 2.26.2