diff options
| author | Jan Ziak <0xe2.0x9a.0x9b@gmail.com> | 2020-11-19 20:39:31 +0100 |
|---|---|---|
| committer | Simon Steinbeiß <ochosi@xfce.org> | 2020-11-23 10:35:21 +0100 |
| commit | d7680a8dd74163e00517f5478e1bac7de1ff0d13 (patch) | |
| tree | bf79fe28cd99080285ff648d3c56f2ab1eeb77c1 /configure.ac.in | |
| parent | f8608a394e2ddb4cd8565a8fdb92b4a7389860d6 (diff) | |
| download | libxfce4ui-d7680a8dd74163e00517f5478e1bac7de1ff0d13.tar.gz | |
Avoid checking for epoxy if libgtop is disabled
See also: https://gitlab.xfce.org/xfce/libxfce4ui/-/merge_requests/16#note_19100
Diffstat (limited to 'configure.ac.in')
| -rw-r--r-- | configure.ac.in | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/configure.ac.in b/configure.ac.in index f4c69b6..b483391 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -148,10 +148,14 @@ dnl ************************************************************** dnl *** Optional support for system information based on epoxy *** dnl ************************************************************** EPOXY_FOUND="no" -XDT_CHECK_OPTIONAL_PACKAGE([EPOXY], - [epoxy], - [1.0], [epoxy], - [library for handling OpenGL function pointer management], [yes]) +if test x"$GLIBTOP_FOUND" = x"yes"; then + XDT_CHECK_OPTIONAL_PACKAGE([EPOXY], + [epoxy], + [1.0], [epoxy], + [library for handling OpenGL function pointer management], [yes]) +else + AM_CONDITIONAL([HAVE_EPOXY], [false]) +fi dnl *************************************** dnl *** Check for gobject-introspection *** @@ -398,10 +402,11 @@ else echo "* Vendor: none" fi if test x"$GLIBTOP_FOUND" = x"yes"; then -echo "* System Info (glibtop): yes" +echo "* System Info (libgtop): yes" +echo "* System Info (epoxy): $EPOXY_FOUND" else -echo "* System Info (glibtop): no" +echo "* System Info (libgtop): no" +echo "* System Info (epoxy): no (assumes libgtop)" fi -echo "* System Info (epoxy): $EPOXY_FOUND" echo "* Manual website: $with_manual_website" echo |