ariadne
/
pkgconf
3
6
Fork 4
Code Issues 6 Pull Requests 2 Projects Releases 2 Wiki Activity

Clean up our comments to match the new upstream style.

pull/116/head
Dag-Erling Smørgrav 2017-03-07 12:05:15 +01:00
parent 93f39efde8
commit 7a2ad2465c
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg.m4
View File

@ -212,12 +212,11 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl
dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES, dnl PKG_WITH_MODULES(VARIABLE-PREFIX, MODULES,
dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND], dnl [ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND],
dnl [DESCRIPTION], [DEFAULT]) dnl [DESCRIPTION], [DEFAULT])
dnl ------------------------------------------
dnl dnl
dnl Prepare a "--with-" configure option using the lowercase [VARIABLE-PREFIX] dnl Prepare a "--with-" configure option using the lowercase
dnl name, merging the behaviour of AC_ARG_WITH and PKG_CHECK_MODULES in a single dnl [VARIABLE-PREFIX] name, merging the behaviour of AC_ARG_WITH and
dnl macro dnl PKG_CHECK_MODULES in a single macro.
dnl
dnl --------------------------------------------------------------
AC_DEFUN([PKG_WITH_MODULES], AC_DEFUN([PKG_WITH_MODULES],
[ [
m4_pushdef([with_arg], m4_tolower([$1])) m4_pushdef([with_arg], m4_tolower([$1]))
@ -251,34 +250,29 @@ m4_popdef([def_arg])
dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES, dnl PKG_HAVE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
dnl [DESCRIPTION], [DEFAULT]) dnl [DESCRIPTION], [DEFAULT])
dnl -----------------------------------------------
dnl dnl
dnl Convenience macro to trigger AM_CONDITIONAL after dnl Convenience macro to trigger AM_CONDITIONAL after PKG_WITH_MODULES
dnl PKG_WITH_MODULES check. dnl check._[VARIABLE-PREFIX] is exported as make variable.
dnl
dnl HAVE_[VARIABLE-PREFIX] is exported as make variable.
dnl
dnl --------------------------------------------------------------
AC_DEFUN([PKG_HAVE_WITH_MODULES], AC_DEFUN([PKG_HAVE_WITH_MODULES],
[ [
PKG_WITH_MODULES([$1],[$2],,,[$3],[$4]) PKG_WITH_MODULES([$1],[$2],,,[$3],[$4])
AM_CONDITIONAL([HAVE_][$1], AM_CONDITIONAL([HAVE_][$1],
[test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"]) [test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"])
]) ])dnl PKG_HAVE_WITH_MODULES
dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES, dnl PKG_HAVE_DEFINE_WITH_MODULES(VARIABLE-PREFIX, MODULES,
dnl [DESCRIPTION], [DEFAULT]) dnl [DESCRIPTION], [DEFAULT])
dnl ------------------------------------------------------
dnl dnl
dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after dnl Convenience macro to run AM_CONDITIONAL and AC_DEFINE after
dnl PKG_WITH_MODULES check. dnl PKG_WITH_MODULES check. HAVE_[VARIABLE-PREFIX] is exported as make
dnl dnl and preprocessor variable.
dnl HAVE_[VARIABLE-PREFIX] is exported as make and preprocessor variable.
dnl
dnl --------------------------------------------------------------
AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES], AC_DEFUN([PKG_HAVE_DEFINE_WITH_MODULES],
[ [
PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4]) PKG_HAVE_WITH_MODULES([$1],[$2],[$3],[$4])
AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"], AS_IF([test "$AS_TR_SH([with_]m4_tolower([$1]))" = "yes"],
[AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])]) [AC_DEFINE([HAVE_][$1], 1, [Enable ]m4_tolower([$1])[ support])])
]) ])dnl PKG_HAVE_DEFINE_WITH_MODULES