Mercurial > emacs

comparison configure @ 108135:1b010f84803e

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 00:38:05 -0700
parents b7d03b0055ab
children 4e52ea307c2d
comparison
equal deleted inserted replaced
108134:236318fbe135 108135:1b010f84803e
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 LUCID_LIBW
727 LIBXP
728 FONTCONFIG_CFLAGS 726 FONTCONFIG_CFLAGS
729 FONTCONFIG_LIBS 727 FONTCONFIG_LIBS
730 XFT_CFLAGS 728 XFT_CFLAGS
731 XFT_LIBS 729 XFT_LIBS
732 LIBOTF_CFLAGS 730 LIBOTF_CFLAGS
792 LIB_SRC_EXTRA_INSTALLABLES 790 LIB_SRC_EXTRA_INSTALLABLES
793 OTHER_FILES 791 OTHER_FILES
794 XMENU_OBJ 792 XMENU_OBJ
795 XOBJ 793 XOBJ
796 WIDGET_OBJ 794 WIDGET_OBJ
795 TOOLKIT_LIBW
797 LTLIBOBJS' 796 LTLIBOBJS'
798 ac_subst_files='' 797 ac_subst_files=''
799 ac_user_opts=' 798 ac_user_opts='
800 enable_option_checking 799 enable_option_checking
801 with_pop 800 with_pop
13009 USE_X_TOOLKIT=none 13008 USE_X_TOOLKIT=none
13010 fi 13009 fi
13011 fi 13010 fi
13012 fi 13011 fi
13013 13012
13014
13015 X_TOOLKIT_TYPE=$USE_X_TOOLKIT 13013 X_TOOLKIT_TYPE=$USE_X_TOOLKIT
13016 13014
13017 if test "${USE_X_TOOLKIT}" != "none"; then 13015 if test "${USE_X_TOOLKIT}" != "none"; then
13018 { $as_echo "$as_me:$LINENO: checking X11 toolkit version" >&5 13016 { $as_echo "$as_me:$LINENO: checking X11 toolkit version" >&5
13019 $as_echo_n "checking X11 toolkit version... " >&6; } 13017 $as_echo_n "checking X11 toolkit version... " >&6; }
13305 13303
13306 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext 13304 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
13307 fi 13305 fi
13308 { $as_echo "$as_me:$LINENO: result: $emacs_cv_motif_version_2_1" >&5 13306 { $as_echo "$as_me:$LINENO: result: $emacs_cv_motif_version_2_1" >&5
13309 $as_echo "$emacs_cv_motif_version_2_1" >&6; } 13307 $as_echo "$emacs_cv_motif_version_2_1" >&6; }
13310 HAVE_MOTIF_2_1=$emacs_cv_motif_version_2_1
13311 if test $emacs_cv_motif_version_2_1 = yes; then 13308 if test $emacs_cv_motif_version_2_1 = yes; then
13312 { $as_echo "$as_me:$LINENO: checking for XpCreateContext in -lXp" >&5 13309 { $as_echo "$as_me:$LINENO: checking for XpCreateContext in -lXp" >&5
13313 $as_echo_n "checking for XpCreateContext in -lXp... " >&6; } 13310 $as_echo_n "checking for XpCreateContext in -lXp... " >&6; }
13314 if test "${ac_cv_lib_Xp_XpCreateContext+set}" = set; then 13311 if test "${ac_cv_lib_Xp_XpCreateContext+set}" = set; then
13315 $as_echo_n "(cached) " >&6 13312 $as_echo_n "(cached) " >&6
13448 CFLAGS=$OLD_CFLAGS 13445 CFLAGS=$OLD_CFLAGS
13449 CPPFLAGS=$OLD_CPPFLAGS 13446 CPPFLAGS=$OLD_CPPFLAGS
13450 fi 13447 fi
13451 fi 13448 fi
13452 fi 13449 fi
13453
13454 13450
13455 13451
13456 13452
13457 USE_TOOLKIT_SCROLL_BARS=no 13453 USE_TOOLKIT_SCROLL_BARS=no
13458 if test "${with_toolkit_scroll_bars}" != "no"; then 13454 if test "${with_toolkit_scroll_bars}" != "no"; then
25886 25882
25887 25883
25888 25884
25889 25885
25890 25886
25887 ## Used in lwlib/Makefile.in.
25891 25888
25892 25889
25893 25890
25894 25891
25895 25892
25952 fi 25949 fi
25953 25950
25954 25951
25955 25952
25956 WIDGET_OBJ= 25953 WIDGET_OBJ=
25954 MOTIF_LIBW=
25957 if test "${USE_X_TOOLKIT}" != "none" ; then 25955 if test "${USE_X_TOOLKIT}" != "none" ; then
25958 WIDGET_OBJ=widget.o 25956 WIDGET_OBJ=widget.o
25959 25957
25960 cat >>confdefs.h <<\_ACEOF 25958 cat >>confdefs.h <<\_ACEOF
25961 #define USE_X_TOOLKIT 1 25959 #define USE_X_TOOLKIT 1
25971 25969
25972 cat >>confdefs.h <<\_ACEOF 25970 cat >>confdefs.h <<\_ACEOF
25973 #define USE_MOTIF 1 25971 #define USE_MOTIF 1
25974 _ACEOF 25972 _ACEOF
25975 25973
25974 MOTIF_LIBW=-lXm
25975 case "$opsys" in
25976 gnu-linux)
25977 ## Paul Abrahams <abrahams at equinox.shaysnet.com> says this is needed.
25978 MOTIF_LIBW="$MOTIF_LIBW -lXpm"
25979 ;;
25980
25981 unixware)
25982 ## Richard Anthony Ryan <ryanr at ellingtn.ftc.nrcs.usda.gov>
25983 ## says -lXimp is needed in UNIX_SV ... 4.2 1.1.2.
25984 MOTIF_LIBW="MOTIF_LIBW -lXimp"
25985 ;;
25986
25987 aix4-2)
25988 ## olson@mcs.anl.gov says -li18n is needed by -lXm.
25989 MOTIF_LIBW="$MOTIF_LIBW -li18n"
25990 ;;
25991 esac
25992 MOTIF_LIBW="$MOTIF_LIBW $LIBXP"
25976 fi 25993 fi
25977 fi 25994 fi
25995
25996
25997 case "$USE_X_TOOLKIT" in
25998 MOTIF) TOOLKIT_LIBW="$MOTIF_LIBW" ;;
25999 LUCID) TOOLKIT_LIBW="$LUCID_LIBW" ;;
26000 *) TOOLKIT_LIBW= ;;
26001 esac
26002
25978 26003
25979 if test "${HAVE_X11}" = "yes" ; then 26004 if test "${HAVE_X11}" = "yes" ; then
25980 26005
25981 cat >>confdefs.h <<\_ACEOF 26006 cat >>confdefs.h <<\_ACEOF
25982 #define HAVE_X11 1 26007 #define HAVE_X11 1