[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Patch] Fix automake warnings

John H. Robinson, IV wrote:
> John H. Robinson, IV wrote:
>> Since there have been no complaints, I have committed the patches from
>> the patch set I posted a few days ago. I have also bumped up the version
>> number to 0.92.1pre.
>>
>> I would be very grateful if people would download and test.
>>
>> http://hg.windowmaker.info/wmaker/archive/wm_0_92.tar.bz2
> 
> It looks like we may need to bump up our dependent version of automake:
> 
> automake-1.4:
>
> [...]

> automake-1.7 is clean
> 
> automake-1.9:
> 
> acinclude.m4:6: warning: underquoted definition of WM_CHECK_LIB
>   run info '(automake)Extending aclocal'
>   or see http://sources.redhat.com/automake/automake.html#Extending-aclocal
> acinclude.m4:18: warning: underquoted definition of WM_CHECK_HEADER
> acinclude.m4:33: warning: underquoted definition of WM_CHECK_XFT_VERSION
> acinclude.m4:67: warning: underquoted definition of WM_CHECK_REDCRAP_BUGS
> acinclude.m4:191: warning: underquoted definition of WM_PRINT_REDCRAP_BUG_STATUS
> 
> 
> automake-1.10:
> 
> acinclude.m4:6: warning: underquoted definition of WM_CHECK_LIB
> acinclude.m4:6:   run info '(automake)Extending aclocal'
> acinclude.m4:6:   or see http://sources.redhat.com/automake/automake.html#Extending-aclocal
> 
> 
> Looks like we may want to use automake-1.7.
> 

I think it would be good to try to be "modern" and avoid warnings from higher
versions of automake.

So I made a patch which cleans up the warnings from versions >= 1.8 of automake.

It fixed the warnings from the wmaker setup. Now there is a warning from

/usr/share/aclocal/gtkextra.m4:8: warning: underquoted definition of AM_PATH_GTK_EXTRA
/usr/share/aclocal/gtkextra.m4:8:   run info '(automake)Extending aclocal'
/usr/share/aclocal/gtkextra.m4:8:   or see http://sources.redhat.com/automake/automake.html#Extending-aclocal

but we can't fix it from inside wmaker.

I did not test this patch using versions < 1.10, but I guess there will be no problems.
I am not an expert, so please review the patch.

Patch inlined below (and also attached to avoid whitespace damage from thunderbird).

# HG changeset patch
# User Carlos R. Mafra <crmafra@aei.mpg.de>
# Date 1225522923 -3600
# Node ID d9069b88dd69db472fc644fbbc3016918c0dc5e2
# Parent  be392fd85635001243fb45fa7d18c294e3f85b5a
automake: Fix warnings about underquoted calls to AC_DEFUN

This patch fixes warnings from automake (>=1.8) about underquoted calls to
AC_DEFUN.

I followed the recommended modifications of
http://sources.redhat.com/automake/automake.html#Extending-aclocal

diff -r be392fd85635 -r d9069b88dd69 acinclude.m4
--- a/acinclude.m4	Sun Oct 26 01:58:08 2008 -0700
+++ b/acinclude.m4	Sat Nov 01 08:02:03 2008 +0100
@@ -3,7 +3,7 @@
 dnl
 dnl WM_CHECK_LIB(NAME, FUNCTION, EXTRALIBS)
 dnl
-AC_DEFUN(WM_CHECK_LIB,
+AC_DEFUN([WM_CHECK_LIB],
 [
 LDFLAGS_old="$LDFLAGS"
 LDFLAGS="$LDFLAGS $lib_search_path"
@@ -11,11 +11,10 @@
 LDFLAGS="$LDFLAGS_old"
 ])

-
 dnl
 dnl WM_CHECK_HEADER(NAME)
 dnl
-AC_DEFUN(WM_CHECK_HEADER,
+AC_DEFUN([WM_CHECK_HEADER],
 [
 CPPFLAGS_old="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $inc_search_path"
@@ -30,7 +29,7 @@
 dnl # $XFTFLAGS should be defined before calling this macro,
 dnl # else it will not be able to find Xft.h
 dnl
-AC_DEFUN(WM_CHECK_XFT_VERSION,
+AC_DEFUN([WM_CHECK_XFT_VERSION],
 [
 CPPFLAGS_old="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $XFTFLAGS $inc_search_path"
@@ -64,7 +63,7 @@
 dnl
 dnl WM_CHECK_REDCRAP_BUGS(prefix,bindir,libdir)
 dnl
-AC_DEFUN(WM_CHECK_REDCRAP_BUGS,
+AC_DEFUN([WM_CHECK_REDCRAP_BUGS],
 [
 AC_MSG_CHECKING(for RedHat system)
 wm_check_flag='no :)'
@@ -188,7 +187,7 @@
 dnl
 dnl WM_PRINT_REDCRAP_BUG_STATUS()
 dnl
-AC_DEFUN(WM_PRINT_REDCRAP_BUG_STATUS,
+AC_DEFUN([WM_PRINT_REDCRAP_BUG_STATUS],
 [
 if test "$rh_is_redhat" = yes; then
 if test "$mins_found" = yes -o "$bugs_found" = yes; then



# HG changeset patch
# User Carlos R. Mafra <crmafra@aei.mpg.de>
# Date 1225522923 -3600
# Node ID d9069b88dd69db472fc644fbbc3016918c0dc5e2
# Parent  be392fd85635001243fb45fa7d18c294e3f85b5a
automake: Fix warnings about underquoted calls to AC_DEFUN

This patch fixes warnings from automake (>=1.8) about underquoted calls to
AC_DEFUN.

I followed the recommended modifications of
http://sources.redhat.com/automake/automake.html#Extending-aclocal

diff -r be392fd85635 -r d9069b88dd69 acinclude.m4
--- a/acinclude.m4	Sun Oct 26 01:58:08 2008 -0700
+++ b/acinclude.m4	Sat Nov 01 08:02:03 2008 +0100
@@ -3,7 +3,7 @@
 dnl
 dnl WM_CHECK_LIB(NAME, FUNCTION, EXTRALIBS)
 dnl
-AC_DEFUN(WM_CHECK_LIB,
+AC_DEFUN([WM_CHECK_LIB],
 [
 LDFLAGS_old="$LDFLAGS"
 LDFLAGS="$LDFLAGS $lib_search_path"
@@ -11,11 +11,10 @@
 LDFLAGS="$LDFLAGS_old"
 ])
 
-
 dnl
 dnl WM_CHECK_HEADER(NAME)
 dnl
-AC_DEFUN(WM_CHECK_HEADER,
+AC_DEFUN([WM_CHECK_HEADER],
 [
 CPPFLAGS_old="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $inc_search_path"
@@ -30,7 +29,7 @@
 dnl # $XFTFLAGS should be defined before calling this macro,
 dnl # else it will not be able to find Xft.h
 dnl
-AC_DEFUN(WM_CHECK_XFT_VERSION,
+AC_DEFUN([WM_CHECK_XFT_VERSION],
 [
 CPPFLAGS_old="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $XFTFLAGS $inc_search_path"
@@ -64,7 +63,7 @@
 dnl
 dnl WM_CHECK_REDCRAP_BUGS(prefix,bindir,libdir)
 dnl
-AC_DEFUN(WM_CHECK_REDCRAP_BUGS,
+AC_DEFUN([WM_CHECK_REDCRAP_BUGS],
 [
 AC_MSG_CHECKING(for RedHat system)
 wm_check_flag='no :)'
@@ -188,7 +187,7 @@
 dnl
 dnl WM_PRINT_REDCRAP_BUG_STATUS()
 dnl
-AC_DEFUN(WM_PRINT_REDCRAP_BUG_STATUS,
+AC_DEFUN([WM_PRINT_REDCRAP_BUG_STATUS],
 [
 if test "$rh_is_redhat" = yes; then
 if test "$mins_found" = yes -o "$bugs_found" = yes; then