Mercurial > emacs

changeset 108137:4e52ea307c2d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Regenerate configure.
author Glenn Morris <rgm@gnu.org>
date Tue, 27 Apr 2010 01:11:11 -0700
parents 43dcbd8381dc
children 0c5ef72c7a9d
files configure
diffstat 1 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Tue Apr 27 01:09:01 2010 -0700
+++ b/configure	Tue Apr 27 01:11:11 2010 -0700
@@ -723,6 +723,7 @@
 GCONF_CFLAGS
 GCONF_LIBS
 LIBSELINUX_LIBS
+LIBXTR6
 FONTCONFIG_CFLAGS
 FONTCONFIG_LIBS
 XFT_CFLAGS
@@ -13012,6 +13013,7 @@
 
 X_TOOLKIT_TYPE=$USE_X_TOOLKIT
 
+LIBXTR6=
 if test "${USE_X_TOOLKIT}" != "none"; then
   { $as_echo "$as_me:$LINENO: checking X11 toolkit version" >&5
 $as_echo_n "checking X11 toolkit version... " >&6; }
@@ -13079,6 +13081,11 @@
 #define HAVE_X11XTR6 1
 _ACEOF
 
+    LIBXTR6="-lSM -lICE"
+    case "$opsys" in
+      ## Use libw.a along with X11R6 Xt.
+      unixware) LIBXTR6="$LIBXTR6 -lw" ;;
+    esac
   else
     { $as_echo "$as_me:$LINENO: result: before 6" >&5
 $as_echo "before 6" >&6; }
@@ -13168,6 +13175,7 @@
   test $ac_cv_lib_Xmu_XmuConvertStandardSelection = no && LIBS="$OLDLIBS"
 fi
 
+
 # On Irix 6.5, at least, we need XShapeQueryExtension from -lXext for Xaw3D.
 if test "${HAVE_X11}" = "yes"; then
   if test "${USE_X_TOOLKIT}" != "none"; then