diff options
| author | David Smith <dsmith@redhat.com> | 2009-09-23 16:14:46 -0500 |
|---|---|---|
| committer | David Smith <dsmith@redhat.com> | 2009-09-23 16:14:46 -0500 |
| commit | c3f070d9ef42f9b8ceea7ddb9c69496872f7f44c (patch) | |
| tree | 6fc5f2d2b65bba8e7e9ac0a7af4ee5e241d51896 /configure.ac | |
| parent | 29b694a70f0720649c3335a6efe23613d6ef8d79 (diff) | |
| download | systemtap-steved-c3f070d9ef42f9b8ceea7ddb9c69496872f7f44c.tar.gz systemtap-steved-c3f070d9ef42f9b8ceea7ddb9c69496872f7f44c.tar.xz systemtap-steved-c3f070d9ef42f9b8ceea7ddb9c69496872f7f44c.zip | |
Better grapher option handling.
* configure.ac: Don't check for gtkmm if '--disable-grapher' was used.
Also, error if '--enable-grapher' was used but gtkmm isn't installed.
* configure: Regenerated.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index 6136b48d..5d2a010d 100644 --- a/configure.ac +++ b/configure.ac @@ -274,9 +274,18 @@ dnl Handle the optional grapher AC_ARG_ENABLE([grapher], AS_HELP_STRING([--enable-grapher], [enable building of grapher (default on if gtkmm is found).]), - [enable_grapher=$enableval], - [enable_grapher="check"]) -PKG_CHECK_MODULES([GRAPHER], [gtkmm-2.4 >= 2.8.0],have_gtkmm=yes,have_gtkmm=no) + [], dnl ACTION-IF-GIVEN + [enable_grapher="check"]) dnl ACTION-IF-NOT-GIVEN +dnl If the user didn't disable the grapher, check for gtkmm. +AS_IF([test "x$enable_grapher" != xno], + [PKG_CHECK_MODULES([gtkmm], [gtkmm-2.4 >= 2.8.0], + have_gtkmm="yes", have_gtkmm="no")]) +dnl If the user explicitly said to enable the grapher, but we can't +dnl (since gtkmm isn't installed), error. +AS_IF([test "x${have_gtkmm}" == "xno" -a x"$enable_grapher" == "xyes"], + AC_MSG_ERROR([systemtap cannot find required gtkmm-2.4 libs (gtkmm24-devel may need to be installed)])) +dnl If the user didn't say to disable the grapher, and gtkmm is +dnl installed, enable the grapher. AM_CONDITIONAL([BUILD_GRAPHER], [test "x${have_gtkmm}" == "xyes" -a x"$enable_grapher" != "xno"]) |