comparison configure @ 108137:4e52ea307c2d

Regenerate configure.
author Glenn Morris <rgm@gnu.org>
date Tue, 27 Apr 2010 01:11:11 -0700
parents 1b010f84803e
children 533b15049ee7
comparison
equal deleted inserted replaced
108136:43dcbd8381dc 108137:4e52ea307c2d
721 DBUS_LIBS 721 DBUS_LIBS
722 DBUS_OBJ 722 DBUS_OBJ
723 GCONF_CFLAGS 723 GCONF_CFLAGS
724 GCONF_LIBS 724 GCONF_LIBS
725 LIBSELINUX_LIBS 725 LIBSELINUX_LIBS
726 LIBXTR6
726 FONTCONFIG_CFLAGS 727 FONTCONFIG_CFLAGS
727 FONTCONFIG_LIBS 728 FONTCONFIG_LIBS
728 XFT_CFLAGS 729 XFT_CFLAGS
729 XFT_LIBS 730 XFT_LIBS
730 LIBOTF_CFLAGS 731 LIBOTF_CFLAGS
13010 fi 13011 fi
13011 fi 13012 fi
13012 13013
13013 X_TOOLKIT_TYPE=$USE_X_TOOLKIT 13014 X_TOOLKIT_TYPE=$USE_X_TOOLKIT
13014 13015
13016 LIBXTR6=
13015 if test "${USE_X_TOOLKIT}" != "none"; then 13017 if 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; }
13018 if test "${emacs_cv_x11_toolkit_version_6+set}" = set; then 13020 if test "${emacs_cv_x11_toolkit_version_6+set}" = set; then
13019 $as_echo_n "(cached) " >&6 13021 $as_echo_n "(cached) " >&6
13077 13079
13078 cat >>confdefs.h <<\_ACEOF 13080 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; }
13085 fi 13092 fi
13086 13093
13165 13172
13166 fi 13173 fi
13167 13174
13168 test $ac_cv_lib_Xmu_XmuConvertStandardSelection = no && LIBS="$OLDLIBS" 13175 test $ac_cv_lib_Xmu_XmuConvertStandardSelection = no && LIBS="$OLDLIBS"
13169 fi 13176 fi
13177
13170 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.
13172 if test "${HAVE_X11}" = "yes"; then 13180 if test "${HAVE_X11}" = "yes"; then
13173 if test "${USE_X_TOOLKIT}" != "none"; then 13181 if test "${USE_X_TOOLKIT}" != "none"; then
13174 13182