aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2010-04-27 01:11:11 -0700
committerGlenn Morris2010-04-27 01:11:11 -0700
commit64a09d2d8aab2967c61bf0b01182619778fab332 (patch)
treed61879fd492cb8e86f3cb6e8e51f69a62a688150
parent8fdac2c337db94e64bbb679cac3efdc533168e9a (diff)
downloademacs-64a09d2d8aab2967c61bf0b01182619778fab332.tar.gz
emacs-64a09d2d8aab2967c61bf0b01182619778fab332.zip
Regenerate configure.
-rwxr-xr-xconfigure8
1 files changed, 8 insertions, 0 deletions
diff --git a/configure b/configure
index 99bc7a188e3..050d1051412 100755
--- a/configure
+++ b/configure
@@ -723,6 +723,7 @@ DBUS_OBJ
723GCONF_CFLAGS 723GCONF_CFLAGS
724GCONF_LIBS 724GCONF_LIBS
725LIBSELINUX_LIBS 725LIBSELINUX_LIBS
726LIBXTR6
726FONTCONFIG_CFLAGS 727FONTCONFIG_CFLAGS
727FONTCONFIG_LIBS 728FONTCONFIG_LIBS
728XFT_CFLAGS 729XFT_CFLAGS
@@ -13012,6 +13013,7 @@ fi
13012 13013
13013X_TOOLKIT_TYPE=$USE_X_TOOLKIT 13014X_TOOLKIT_TYPE=$USE_X_TOOLKIT
13014 13015
13016LIBXTR6=
13015if test "${USE_X_TOOLKIT}" != "none"; then 13017if test "${USE_X_TOOLKIT}" != "none"; then
13016 { $as_echo "$as_me:$LINENO: checking X11 toolkit version" >&5 13018 { $as_echo "$as_me:$LINENO: checking X11 toolkit version" >&5
13017$as_echo_n "checking X11 toolkit version... " >&6; } 13019$as_echo_n "checking X11 toolkit version... " >&6; }
@@ -13079,6 +13081,11 @@ cat >>confdefs.h <<\_ACEOF
13079#define HAVE_X11XTR6 1 13081#define HAVE_X11XTR6 1
13080_ACEOF 13082_ACEOF
13081 13083
13084 LIBXTR6="-lSM -lICE"
13085 case "$opsys" in
13086 ## Use libw.a along with X11R6 Xt.
13087 unixware) LIBXTR6="$LIBXTR6 -lw" ;;
13088 esac
13082 else 13089 else
13083 { $as_echo "$as_me:$LINENO: result: before 6" >&5 13090 { $as_echo "$as_me:$LINENO: result: before 6" >&5
13084$as_echo "before 6" >&6; } 13091$as_echo "before 6" >&6; }
@@ -13168,6 +13175,7 @@ fi
13168 test $ac_cv_lib_Xmu_XmuConvertStandardSelection = no && LIBS="$OLDLIBS" 13175 test $ac_cv_lib_Xmu_XmuConvertStandardSelection = no && LIBS="$OLDLIBS"
13169fi 13176fi
13170 13177
13178
13171# On Irix 6.5, at least, we need XShapeQueryExtension from -lXext for Xaw3D. 13179# On Irix 6.5, at least, we need XShapeQueryExtension from -lXext for Xaw3D.
13172if test "${HAVE_X11}" = "yes"; then 13180if test "${HAVE_X11}" = "yes"; then
13173 if test "${USE_X_TOOLKIT}" != "none"; then 13181 if test "${USE_X_TOOLKIT}" != "none"; then