From bfbcc60a18d0800e47d353c2d36239bcf5b0acee Mon Sep 17 00:00:00 2001
From: James Zern <jzern@google.com>
Date: Mon, 23 Apr 2012 17:57:12 -0700
Subject: [PATCH] configure: AC_ARG_* use AS_HELP_STRING
properly formats --help output
Change-Id: I18fad9039400df8415ef192a41c0295019c52775
---
configure.ac | 27 ++++++++++++++++-----------
1 file changed, 16 insertions(+), 11 deletions(-)
diff --git a/configure.ac b/configure.ac
index a92fca0c..ac0963bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,8 +11,8 @@ dnl === If an older aclocal exits with an error comment these lines out.
m4_define_default([AM_SILENT_RULES], [])
AM_SILENT_RULES
-AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH],
- [Path to the pkgconfig directory [[LIBDIR/pkgconfig]]]),
+AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=DIR],
+ [Path to the pkgconfig directory @<:@LIBDIR/pkgconfig@:>@]),
[pkgconfigdir="$withval"], [pkgconfigdir='${libdir}/pkgconfig'])
AC_SUBST([pkgconfigdir])
@@ -34,11 +34,13 @@ if test -n "$LIBPNG_CONFIG"; then
fi
fi
-AC_ARG_WITH(pngincludedir,
- [--with-pngincludedir=DIR use PNG includes from DIR],
+AC_ARG_WITH([pngincludedir],
+ AS_HELP_STRING([--with-pngincludedir=DIR],
+ [use PNG includes from DIR]),
PNG_INCLUDES="-I$withval")
-AC_ARG_WITH(pnglibdir,
- [--with-pnglibdir=DIR use PNG libraries from DIR],
+AC_ARG_WITH([pnglibdir],
+ AS_HELP_STRING([--with-pnglibdir=DIR],
+ [use PNG libraries from DIR]),
[PNG_LIBS="-L$withval"])
SAVED_CPPFLAGS=$CPPFLAGS
@@ -66,11 +68,13 @@ dnl === check for JPEG support ===
JPEG_INCLUDES=""
JPEG_LIBS=""
-AC_ARG_WITH(jpegincludedir,
- [--with-jpegincludedir=DIR use JPEG includes from DIR],
+AC_ARG_WITH([jpegincludedir],
+ [AS_HELP_STRING([--with-jpegincludedir=DIR],
+ [use JPEG includes from DIR])],
JPEG_INCLUDES="-I$withval")
-AC_ARG_WITH(jpeglibdir,
- [--with-jpeglibdir=DIR use JPEG libraries from DIR],
+AC_ARG_WITH([jpeglibdir],
+ AS_HELP_STRING([--with-jpeglibdir=DIR],
+ [use JPEG libraries from DIR]),
[JPEG_LIBS="-L$withval"])
SAVED_CPPFLAGS=$CPPFLAGS
@@ -141,7 +145,8 @@ dnl === If --enable-experimental is defined, add the flag WEBP_EXPERIMENTAL_FEAT
USE_EXPERIMENTAL_CODE=""
AC_MSG_CHECKING(if --enable-experimental option is specified)
-AC_ARG_ENABLE(experimental, [ --enable-experimental Activate experimental features])
+AC_ARG_ENABLE([experimental], AS_HELP_STRING([--enable-experimental],
+ [Activate experimental features]))
if test "$enable_experimental" = "yes"; then
AC_DEFINE(EXPERIMENTAL,,[Enable experimental code])
USE_EXPERIMENTAL_CODE="-DWEBP_EXPERIMENTAL_FEATURES"