summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2016-03-04 09:23:44 +0100
committerThomas Haller <thaller@redhat.com>2016-03-04 09:25:23 +0100
commit7e091a230a4dc4813d4d9cd6facd0524dff7de7b (patch)
tree68b12600161bd011686953bd0f8a47e6f69f11cd
parentd17aedf91f4f5cdb8f5399540a730abe57f548d0 (diff)
downloadNetworkManager-7e091a230a4dc4813d4d9cd6facd0524dff7de7b.tar.gz
m4: update introspection.m4 with original file from gobject-introspection
Originally m4/introspection.m4 was copied from gobject-introspection repository. We however modified it in commit f6272144e98c00db18cf67. Reimport the file with latest changes, but still preserving our workaround.
-rw-r--r--m4/introspection.m42
1 files changed, 2 insertions, 0 deletions
diff --git a/m4/introspection.m4 b/m4/introspection.m4
index efe0e9ac76..1dc1556da1 100644
--- a/m4/introspection.m4
+++ b/m4/introspection.m4
@@ -41,6 +41,8 @@ m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
],dnl
[auto],[dnl
PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
+ dnl Canonicalize enable_introspection
+ enable_introspection=$found_introspection
],dnl
[dnl
AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])