diff options
| author |   Tim Harder <radhermit@gentoo.org> | 2017-01-11 14:31:48 -0500 |
|---|---|---|
| committer | Tim Harder <radhermit@gentoo.org> | 2017-01-11 14:33:46 -0500 |
| commit | 63de9941770de42c8c75266faa62c2f41e86f105 (patch) | |
| tree | 3332707eaaec4751fb8cb4d9ac1890ac3b97167a /dev-util | |
| parent | dev-python/locket: switch bracket with quote mark (diff) | |
| download | gentoo-63de9941770de42c8c75266faa62c2f41e86f105.tar.gz gentoo-63de9941770de42c8c75266faa62c2f41e86f105.tar.bz2 gentoo-63de9941770de42c8c75266faa62c2f41e86f105.zip | |
dev-util/ctags: fix autotools conditionals so pkg-config is always found
Fixes bug #604656.
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/ctags/files/ctags-20161028-automagic-deps.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/dev-util/ctags/files/ctags-20161028-automagic-deps.patch b/dev-util/ctags/files/ctags-20161028-automagic-deps.patch index 82daf1472cd6..a22481be7beb 100644 --- a/dev-util/ctags/files/ctags-20161028-automagic-deps.patch +++ b/dev-util/ctags/files/ctags-20161028-automagic-deps.patch @@ -18,12 +18,12 @@ Add options to control libxml2, jansson, and libyaml automagic deps. - [have_libxml=yes - AC_DEFINE(HAVE_LIBXML)], - [have_libxml=no]) -+if test "${enable_xml}" = "yes"; then ++AS_IF([test "${enable_xml}" = "yes"], [ + PKG_CHECK_MODULES(LIBXML, [libxml-2.0 >= 2.7.7], + [have_libxml=yes + AC_DEFINE(HAVE_LIBXML)], + [AC_MSG_ERROR([libxml2 not found])]) -+fi ++]) AM_CONDITIONAL(HAVE_LIBXML, test "x$have_libxml" = xyes) +AC_ARG_ENABLE([json], @@ -36,12 +36,12 @@ Add options to control libxml2, jansson, and libyaml automagic deps. - [have_jansson=yes - AC_DEFINE(HAVE_JANSSON)], - [have_jansson=no]) -+if test "${enable_json}" = "yes"; then ++AS_IF([test "${enable_json}" = "yes"], [ + PKG_CHECK_MODULES(JANSSON, jansson, + [have_jansson=yes + AC_DEFINE(HAVE_JANSSON)], + [AC_MSG_ERROR([jansson not found])]) -+fi ++]) AM_CONDITIONAL(HAVE_JANSSON, test "x$have_jansson" = xyes) +AC_ARG_ENABLE([yaml], @@ -54,12 +54,12 @@ Add options to control libxml2, jansson, and libyaml automagic deps. - [have_libyaml=yes - AC_DEFINE(HAVE_LIBYAML)], - [have_libyaml=no]) -+if test "${enable_yaml}" = "yes"; then ++AS_IF([test "${enable_yaml}" = "yes"], [ + PKG_CHECK_MODULES(LIBYAML, yaml-0.1, + [have_libyaml=yes + AC_DEFINE(HAVE_LIBYAML)], + [AC_MSG_ERROR([libyaml not found])]) -+fi ++]) AM_CONDITIONAL(HAVE_LIBYAML, test "x$have_libyaml" = xyes) |