From 59db9d5e4b49a1e2903f023a4358e4d1d1068c1f Mon Sep 17 00:00:00 2001 From: Gaetan Nadon Date: Tue, 1 Sep 2009 09:45:30 -0400 Subject: [PATCH] Fix obsolete macro warnings for AC_HELP_STRING #23628 When checking for warnings in any module using XORG_RELEASE_VERSION one or more warnings on AC_HELP_STRING appears. The macro has been replaced with AS_HELP_STRING --- xorg-macros.m4.in | 6 +++--- xorgversion.m4 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in index 1954714..d1f31d4 100644 --- a/xorg-macros.m4.in +++ b/xorg-macros.m4.in @@ -319,7 +319,7 @@ AC_SUBST(MAKE_HTML) # their AM_CFLAGS (or other appropriate *_CFLAGS) to use them. AC_DEFUN([XORG_CHECK_MALLOC_ZERO],[ AC_ARG_ENABLE(malloc0returnsnull, - AC_HELP_STRING([--enable-malloc0returnsnull], + AS_HELP_STRING([--enable-malloc0returnsnull], [malloc(0) returns NULL (default: auto)]), [MALLOC_ZERO_RETURNS_NULL=$enableval], [MALLOC_ZERO_RETURNS_NULL=auto]) @@ -371,7 +371,7 @@ AC_SUBST([XTMALLOC_ZERO_CFLAGS]) AC_DEFUN([XORG_WITH_LINT],[ # Allow checking code with lint, sparse, etc. -AC_ARG_WITH(lint, [AC_HELP_STRING([--with-lint], +AC_ARG_WITH(lint, [AS_HELP_STRING([--with-lint], [Use a lint-style source code checker (default: disabled)])], [use_lint=$withval], [use_lint=no]) if test "x$use_lint" = "xyes" ; then @@ -412,7 +412,7 @@ AM_CONDITIONAL(LINT, [test x$LINT != xno]) AC_DEFUN([XORG_LINT_LIBRARY],[ AC_REQUIRE([XORG_WITH_LINT]) # Build lint "library" for more indepth checks of programs calling this library -AC_ARG_ENABLE(lint-library, [AC_HELP_STRING([--enable-lint-library], +AC_ARG_ENABLE(lint-library, [AS_HELP_STRING([--enable-lint-library], [Create lint library (default: disabled)])], [make_lint_lib=$enableval], [make_lint_lib=no]) if test "x$make_lint_lib" != "xno" ; then diff --git a/xorgversion.m4 b/xorgversion.m4 index 881955d..761af3d 100644 --- a/xorgversion.m4 +++ b/xorgversion.m4 @@ -32,7 +32,7 @@ dnl AC_DEFUN([XORG_RELEASE_VERSION],[ AC_ARG_WITH(release-version, - AC_HELP_STRING([--with-release-version=STRING], + AS_HELP_STRING([--with-release-version=STRING], [Use release version string in package name]), [RELEASE_VERSION="$withval"], [RELEASE_VERSION=""]) -- 1.6.0.4