--- configure	2017-10-17 22:10:41.684538677 -0400
+++ configure.with-maybe	2017-10-17 22:10:20.768469411 -0400
@@ -2370,7 +2370,7 @@
                           oss, bsd-ossaudio, no; default yes). Only for
                           GNU/Linux, FreeBSD, NetBSD, MinGW, Cygwin.
   --with-x-toolkit=KIT    use an X toolkit (KIT one of: yes or gtk, gtk2,
-                          gtk3, lucid or athena, motif, no)
+                          gtk3, lucid or athena, motif, maybe, no)
   --with-wide-int         prefer wide Emacs integers (typically 62-bit);
                           allows buffer and string size up to 2GB on 32-bit
                           hosts, at the cost of 10% to 30% slowdown of Lisp
@@ -4168,7 +4168,7 @@
   withval=$with_mailutils;
 else
   with_mailutils=$with_features
-   if test "$with_mailutils" = yes; then
+   if test "$with_mailutils" != no; then
      (movemail --version) >/dev/null 2>&1 || with_mailutils=no
    fi
 fi
@@ -4269,9 +4269,9 @@
 # Check whether --with-sound was given.
 if test "${with_sound+set}" = set; then :
   withval=$with_sound;  case "${withval}" in
-      yes|no|alsa|oss|bsd-ossaudio) val=$withval ;;
+      yes|no|maybe|alsa|oss|bsd-ossaudio) val=$withval ;;
       *) as_fn_error $? "'--with-sound=$withval' is invalid;
-this option's value should be 'yes', 'no', 'alsa', 'oss', or 'bsd-ossaudio'." "$LINENO" 5
+this option's value should be 'yes', 'no', 'maybe', 'alsa', 'oss', or 'bsd-ossaudio'." "$LINENO" 5
       ;;
     esac
     with_sound=$val
@@ -4287,6 +4287,7 @@
   withval=$with_x_toolkit; 	  case "${withval}" in
 	    y | ye | yes )	val=gtk ;;
 	    n | no )		val=no  ;;
+            maybe )             val=maybe ;;
 	    l | lu | luc | luci | lucid )	val=lucid ;;
 	    a | at | ath | athe | athen | athena )	val=athena ;;
 	    m | mo | mot | moti | motif )	val=motif ;;
@@ -4295,7 +4296,7 @@
 	    gtk3  )	val=gtk3 ;;
 	    * )
 as_fn_error $? "'--with-x-toolkit=$withval' is invalid;
-this option's value should be 'yes', 'no', 'lucid', 'athena', 'motif', 'gtk',
+this option's value should be 'yes', 'no', 'maybe', 'lucid', 'athena', 'motif', 'gtk',
 'gtk2' or 'gtk3'.  'yes' and 'gtk' are synonyms.
 'athena' and 'lucid' are synonyms." "$LINENO" 5
 	    ;;
@@ -4313,7 +4314,7 @@
       with_wide_int=no
 fi
 
-if test "$with_wide_int" = yes; then
+if test "$with_wide_int" != no; then
 
 $as_echo "#define WIDE_EMACS_INT 1" >>confdefs.h
 
@@ -4554,13 +4555,14 @@
   withval=$with_file_notification;  case "${withval}" in
     y | ye | yes )	val=yes ;;
     n | no )		val=no  ;;
+    maybe )             val=maybe ;;
     i | in | ino | inot | inoti | inotif | inotify )	val=inotify ;;
     k | kq | kqu | kque | kqueu | kqueue )	val=kqueue ;;
     g | gf | gfi | gfil | gfile )	val=gfile ;;
     w | w3 | w32 )	val=w32 ;;
     * ) as_fn_error $? "'--with-file-notification=$withval' is invalid;
-this option's value should be 'yes', 'no', 'inotify', 'kqueue', 'gfile' or 'w32'.
-'yes' is a synonym for 'w32' on MS-Windows, for 'no' on Nextstep,
+this option's value should be 'yes', 'no', 'maybe', 'inotify', 'kqueue', 'gfile' or 'w32'.
+'yes' and 'maybe' are a synonyms for 'w32' on MS-Windows, for 'no' on Nextstep,
 otherwise for the first of 'inotify', 'kqueue' or 'gfile' that is usable." "$LINENO" 5
     ;;
    esac
@@ -4615,7 +4617,7 @@
 gamegroup=
 case ${with_gameuser} in
   '' | no) ;;
-  yes) gamegroup=games ;;
+  yes | maybe) gamegroup=games ;;
   :*) gamegroup=${with_gameuser#:} ;;
   *) gameuser=${with_gameuser} ;;
 esac
@@ -9635,7 +9637,7 @@
           fi
 
 
-  if test "${with_sound}" = "alsa" || test "${with_sound}" = "yes"; then
+  if test "${with_sound}" = "alsa" || test "${with_sound}" = "yes" || test "${with_sound}" = "maybe" ; then
     ALSA_REQUIRED=1.0.0
     ALSA_MODULES="alsa >= $ALSA_REQUIRED"
 
@@ -11735,7 +11737,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thread support" >&5
 $as_echo_n "checking for thread support... " >&6; }
 threads_enabled=no
-if test "$with_threads" = yes; then
+if test "$with_threads" != no; then
    if test "$emacs_cv_pthread_lib" != no; then
 
 $as_echo "#define THREADS_ENABLED 1" >>confdefs.h
@@ -12715,7 +12717,7 @@
 
 HAVE_DBUS=no
 DBUS_OBJ=
-if test "${with_dbus}" = "yes"; then
+if test "${with_dbus}" != "no"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBUS" >&5
@@ -12820,7 +12822,7 @@
 
 
 HAVE_GSETTINGS=no
-if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then
+if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" != "no"; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GSETTINGS" >&5
@@ -13117,7 +13119,7 @@
 
 HAVE_LIBSELINUX=no
 LIBSELINUX_LIBS=
-if test "${with_selinux}" = "yes"; then
+if test "${with_selinux}" != "no"; then
    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for lgetfilecon in -lselinux" >&5
 $as_echo_n "checking for lgetfilecon in -lselinux... " >&6; }
 if ${ac_cv_lib_selinux_lgetfilecon+:} false; then :
@@ -13170,7 +13172,7 @@
 
 
 HAVE_GNUTLS=no
-if test "${with_gnutls}" = "yes" ; then
+if test "${with_gnutls}" != "no" ; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBGNUTLS" >&5
@@ -13259,7 +13261,7 @@
 
 
 HAVE_LIBSYSTEMD=no
-if test "${with_libsystemd}" = "yes" ; then
+if test "${with_libsystemd}" != "no" ; then
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBSYSTEMD" >&5
@@ -13351,7 +13353,7 @@
     this is only supported on MS-Windows native and MinGW32 builds.
     Consider using gfile instead." "$LINENO" 5
     ;;
-  w32,* | yes,mingw32)
+  w32,* | yes,mingw32 | maybe,mingw32)
     ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default"
 if test "x$ac_cv_header_windows_h" = xyes; then :
 
@@ -13368,7 +13370,7 @@
 esac
 
 case $with_file_notification,$NOTIFY_OBJ in
-  inotify, | yes,)
+  inotify, | yes, | maybe,)
     ac_fn_c_check_header_mongrel "$LINENO" "sys/inotify.h" "ac_cv_header_sys_inotify_h" "$ac_includes_default"
 if test "x$ac_cv_header_sys_inotify_h" = xyes; then :
 
@@ -13392,7 +13394,7 @@
 esac
 
 case $with_file_notification,$NOTIFY_OBJ in
-  kqueue,* | yes,)
+  kqueue,* | yes, | maybe,)
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KQUEUE" >&5
@@ -13542,7 +13544,7 @@
 esac
 
 case $with_file_notification,$NOTIFY_OBJ in
-  gfile,* | yes,)
+  gfile,* | yes, |maybe,)
     if test "${HAVE_NS}" = yes; then
        as_fn_error $? "'--with-file-notification=gfile' is not supported in NextStep builds.
 Consider kqueue instead." "$LINENO" 5
@@ -13632,7 +13634,7 @@
 esac
 
 case $with_file_notification,$NOTIFY_OBJ in
-  yes,* | no,* | *,?*) ;;
+  yes,* | no,* | maybe,* | *,?*) ;;
   *) as_fn_error $? "File notification '$with_file_notification' requested but requirements not found." "$LINENO" 5 ;;
 esac
 
@@ -14817,14 +14819,13 @@
 
 $as_echo "#define USE_CAIRO 1" >>confdefs.h
 
-    else
-      as_fn_error $? "cairo requested but not found." "$LINENO" 5
-    fi
-
-    CFLAGS="$CFLAGS $CAIRO_CFLAGS"
-    LIBS="$LIBS $CAIRO_LIBS"
+      CFLAGS="$CFLAGS $CAIRO_CFLAGS"
+      LIBS="$LIBS $CAIRO_LIBS"
 
 
+    elif test "${with_cairo}" = "yes" ; then
+      as_fn_error $? "cairo requested but not found." "$LINENO" 5
+    fi
   fi
 fi
 
@@ -15768,18 +15769,18 @@
 MISSING=
 WITH_NO=
 if test "${HAVE_X11}" = "yes"; then
-  test "${with_xpm}" != "no" && test "${HAVE_XPM}" != "yes" &&
+  test "${with_xpm}" = "yes" && test "${HAVE_XPM}" != "yes" &&
     MISSING="libXpm" && WITH_NO="--with-xpm=no"
-  test "${with_jpeg}" != "no" && test "${HAVE_JPEG}" != "yes" &&
+  test "${with_jpeg}" = "yes" && test "${HAVE_JPEG}" != "yes" &&
     MISSING="$MISSING libjpeg" && WITH_NO="$WITH_NO --with-jpeg=no"
-  test "${with_png}" != "no" && test "${HAVE_PNG}" != "yes" &&
+  test "${with_png}" = "yes" && test "${HAVE_PNG}" != "yes" &&
     MISSING="$MISSING libpng" && WITH_NO="$WITH_NO --with-png=no"
-  test "${with_gif}" != "no" && test "${HAVE_GIF}" != "yes" &&
+  test "${with_gif}" = "yes" && test "${HAVE_GIF}" != "yes" &&
     MISSING="$MISSING libgif/libungif" && WITH_NO="$WITH_NO --with-gif=no"
-  test "${with_tiff}" != "no" && test "${HAVE_TIFF}" != "yes" &&
+  test "${with_tiff}" = "yes" && test "${HAVE_TIFF}" != "yes" &&
     MISSING="$MISSING libtiff" && WITH_NO="$WITH_NO --with-tiff=no"
 fi
-test "${with_gnutls}" != "no" && test "${HAVE_GNUTLS}" != "yes" &&
+test "${with_gnutls}" = "yes" && test "${HAVE_GNUTLS}" != "yes" &&
   MISSING="$MISSING gnutls" && WITH_NO="$WITH_NO --with-gnutls=no"
 if test "X${MISSING}" != X; then
   as_fn_error $? "The following required libraries were not found: