Since it's gone, I don't want it accidently finding a copy of xf86misc lying outside $prefix

diff --git a/configure.ac b/configure.ac
index 5d4e904..03c2fb4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -78,13 +78,19 @@ else
 fi


-PKG_CHECK_MODULES(DPY_XF86MISC, xxf86misc,
-       [SAVE_CPPFLAGS="$CPPFLAGS"
-       CPPFLAGS="$CPPFLAGS $DPY_XF86MISC_CFLAGS $DPY_X11_CFLAGS"
- AC_CHECK_HEADERS([X11/extensions/xf86misc.h X11/extensions/ xf86mscstr.h],,,
-                         [#include <X11/Xlib.h>
+AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xxf86misc support.]),
+               [USE_XF86MISC="$withval"], [USE_XF86MISC="yes"])
+if test "x$USE_XF86MISC" != "xno" ; then
+       PKG_CHECK_MODULES(DPY_XF86MISC, xxf86misc,
+               [SAVE_CPPFLAGS="$CPPFLAGS"
+               CPPFLAGS="$CPPFLAGS $DPY_XF86MISC_CFLAGS $DPY_X11_CFLAGS"
+ AC_CHECK_HEADERS([X11/extensions/xf86misc.h X11/extensions/ xf86mscstr.h],,,
+                                 [#include <X11/Xlib.h>
 #include <X11/Xproto.h>])
-       CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+               CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"])
+else
+       echo "without xxf86misc"
+fi

 PKG_CHECK_MODULES(DPY_XINPUT, xi,
        [SAVE_CPPFLAGS="$CPPFLAGS"

Attachment: smime.p7s
Description: S/MIME cryptographic signature

_______________________________________________
xorg-devel mailing list
[email protected]
http://lists.x.org/mailman/listinfo/xorg-devel

Reply via email to