merge from upstream. currently seems to have bitroted and i get segfaults

[gnu-emacs] / configure

diff --git a/configure b/configure
index f236975106092cd95c315fb7734c28abc98e1930..7ea4d3a040db5fbeb11e93dccf5065207ab0221e 100755 (executable)
--- a/configure
+++ b/configure
@@ -17164,7 +17164,7 @@ TOOLKIT_LIBW=
 case "$USE_X_TOOLKIT" in
   MOTIF) TOOLKIT_LIBW="$MOTIF_LIBW" ;;
   LUCID) TOOLKIT_LIBW="$LUCID_LIBW" ;;
-  none) test "x$HAVE_GTK" = "xyes" && TOOLKIT_LIBW="$GTK_LIBS" ;;
+  none) test "x$HAVE_GTK" = "xyes" && TOOLKIT_LIBW="$GTK_LIBS -lXcomposite" ;;
 esac