dany/libwebp
1
0
Fork 0
mirror of https://github.com/webmproject/libwebp.git synced 2024-12-27 06:08:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge "configure: AC_ARG_* use AS_HELP_STRING"

Browse Source
This commit is contained in:
James Zern 2012-04-24 10:54:39 -07:00 committed by Gerrit Code Review
commit 1349edade1
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
configure.ac
View File

@ -11,8 +11,8 @@ dnl === If an older aclocal exits with an error comment these lines out.
m4_define_default([AM_SILENT_RULES], []) m4_define_default([AM_SILENT_RULES], [])
AM_SILENT_RULES AM_SILENT_RULES
AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=PATH], AC_ARG_WITH([pkgconfigdir], AS_HELP_STRING([--with-pkgconfigdir=DIR],
[Path to the pkgconfig directory [[LIBDIR/pkgconfig]]]), [Path to the pkgconfig directory @<:@LIBDIR/pkgconfig@:>@]),
[pkgconfigdir="$withval"], [pkgconfigdir='${libdir}/pkgconfig']) [pkgconfigdir="$withval"], [pkgconfigdir='${libdir}/pkgconfig'])
AC_SUBST([pkgconfigdir]) AC_SUBST([pkgconfigdir])
@ -34,11 +34,13 @@ if test -n "$LIBPNG_CONFIG"; then
fi fi
fi fi
AC_ARG_WITH(pngincludedir, AC_ARG_WITH([pngincludedir],
[--with-pngincludedir=DIR use PNG includes from DIR], AS_HELP_STRING([--with-pngincludedir=DIR],
[use PNG includes from DIR]),
PNG_INCLUDES="-I$withval") PNG_INCLUDES="-I$withval")
AC_ARG_WITH(pnglibdir, AC_ARG_WITH([pnglibdir],
[--with-pnglibdir=DIR use PNG libraries from DIR], AS_HELP_STRING([--with-pnglibdir=DIR],
[use PNG libraries from DIR]),
[PNG_LIBS="-L$withval"]) [PNG_LIBS="-L$withval"])
SAVED_CPPFLAGS=$CPPFLAGS SAVED_CPPFLAGS=$CPPFLAGS
@ -66,11 +68,13 @@ dnl === check for JPEG support ===
JPEG_INCLUDES="" JPEG_INCLUDES=""
JPEG_LIBS="" JPEG_LIBS=""
AC_ARG_WITH(jpegincludedir, AC_ARG_WITH([jpegincludedir],
[--with-jpegincludedir=DIR use JPEG includes from DIR], [AS_HELP_STRING([--with-jpegincludedir=DIR],
[use JPEG includes from DIR])],
JPEG_INCLUDES="-I$withval") JPEG_INCLUDES="-I$withval")
AC_ARG_WITH(jpeglibdir, AC_ARG_WITH([jpeglibdir],
[--with-jpeglibdir=DIR use JPEG libraries from DIR], AS_HELP_STRING([--with-jpeglibdir=DIR],
[use JPEG libraries from DIR]),
[JPEG_LIBS="-L$withval"]) [JPEG_LIBS="-L$withval"])
SAVED_CPPFLAGS=$CPPFLAGS SAVED_CPPFLAGS=$CPPFLAGS
@ -141,7 +145,8 @@ dnl === If --enable-experimental is defined, add the flag WEBP_EXPERIMENTAL_FEAT
USE_EXPERIMENTAL_CODE="" USE_EXPERIMENTAL_CODE=""
AC_MSG_CHECKING(if --enable-experimental option is specified) 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 if test "$enable_experimental" = "yes"; then
AC_DEFINE(EXPERIMENTAL,,[Enable experimental code]) AC_DEFINE(EXPERIMENTAL,,[Enable experimental code])
USE_EXPERIMENTAL_CODE="-DWEBP_EXPERIMENTAL_FEATURES" USE_EXPERIMENTAL_CODE="-DWEBP_EXPERIMENTAL_FEATURES"