Mercurial > emacs

comparison configure @ 108173:d85e87455963

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 Thu, 29 Apr 2010 18:54:08 -0700
parents 533b15049ee7
children e6f59a2ba110
comparison
equal deleted inserted replaced
108172:c9d0b6bfe74e 108173:d85e87455963
797 OTHER_FILES 797 OTHER_FILES
798 XMENU_OBJ 798 XMENU_OBJ
799 XOBJ 799 XOBJ
800 WIDGET_OBJ 800 WIDGET_OBJ
801 TOOLKIT_LIBW 801 TOOLKIT_LIBW
802 OLDXMENU
803 LIBXMENU
802 CYGWIN_OBJ 804 CYGWIN_OBJ
805 OTHER_OBJ
803 LTLIBOBJS' 806 LTLIBOBJS'
804 ac_subst_files='' 807 ac_subst_files=''
805 ac_user_opts=' 808 ac_user_opts='
806 enable_option_checking 809 enable_option_checking
807 with_pop 810 with_pop
13258 13261
13259 LIBXMU=-lXmu 13262 LIBXMU=-lXmu
13260 case "$machine" in 13263 case "$machine" in
13261 ## These machines don't supply Xmu. 13264 ## These machines don't supply Xmu.
13262 hpux* | aix4-2 ) 13265 hpux* | aix4-2 )
13263 test "X$ac_cv_lib_Xmu_XmuConvertStandardSelection" = "Xno" && LIBXMU= 13266 test "X$ac_cv_lib_Xmu_XmuConvertStandardSelection" != "Xyes" && LIBXMU=
13264 ;; 13267 ;;
13265 esac 13268 esac
13266 13269
13267 13270
13268 # On Irix 6.5, at least, we need XShapeQueryExtension from -lXext for Xaw3D. 13271 # On Irix 6.5, at least, we need XShapeQueryExtension from -lXext for Xaw3D.
26101 MOTIF_LIBW="$MOTIF_LIBW $LIBXP" 26104 MOTIF_LIBW="$MOTIF_LIBW $LIBXP"
26102 fi 26105 fi
26103 fi 26106 fi
26104 26107
26105 26108
26109 TOOLKIT_LIBW=
26106 case "$USE_X_TOOLKIT" in 26110 case "$USE_X_TOOLKIT" in
26107 MOTIF) TOOLKIT_LIBW="$MOTIF_LIBW" ;; 26111 MOTIF) TOOLKIT_LIBW="$MOTIF_LIBW" ;;
26108 LUCID) TOOLKIT_LIBW="$LUCID_LIBW" ;; 26112 LUCID) TOOLKIT_LIBW="$LUCID_LIBW" ;;
26109 *) TOOLKIT_LIBW= ;; 26113 none) test "x$HAVE_GTK" = "xyes" && TOOLKIT_LIBW="$GTK_LIBS" ;;
26110 esac 26114 esac
26111 26115
26112 26116
26117 ## The X Menu stuff is present in the X10 distribution, but missing
26118 ## from X11. If we have X10, just use the installed library;
26119 ## otherwise, use our own copy.
26113 if test "${HAVE_X11}" = "yes" ; then 26120 if test "${HAVE_X11}" = "yes" ; then
26114 26121
26115 cat >>confdefs.h <<\_ACEOF 26122 cat >>confdefs.h <<\_ACEOF
26116 #define HAVE_X11 1 26123 #define HAVE_X11 1
26117 _ACEOF 26124 _ACEOF
26118 26125
26119 fi 26126
26127 if test "$USE_X_TOOLKIT" = "none"; then
26128 OLDXMENU="\${oldXMenudir}libXMenu11.a"
26129 else
26130 OLDXMENU="\${lwlibdir}liblw.a"
26131 fi
26132 LIBXMENU="\$(OLDXMENU)"
26133 else
26134 OLDXMENU=
26135 LIBXMENU="-lXMenu"
26136 fi
26137
26138 if test "$HAVE_GTK" = "yes"; then
26139 OLDXMENU=
26140 LIBXMENU=
26141 fi
26142
26143
26144
26145
26120 if test "${HAVE_MENUS}" = "yes" ; then 26146 if test "${HAVE_MENUS}" = "yes" ; then
26121 26147
26122 cat >>confdefs.h <<\_ACEOF 26148 cat >>confdefs.h <<\_ACEOF
26123 #define HAVE_MENUS 1 26149 #define HAVE_MENUS 1
26124 _ACEOF 26150 _ACEOF
26137 #define REL_ALLOC 1 26163 #define REL_ALLOC 1
26138 _ACEOF 26164 _ACEOF
26139 26165
26140 fi 26166 fi
26141 26167
26142 CYGWIN_OBJ= 26168
26143 test "$opsys" = "cygwin" && CYGWIN_OBJ="sheap.o" 26169 OTHER_OBJ="\$(gmallocobj) \$(rallocobj)"
26170 if test "$opsys" = "cygwin"; then
26171 CYGWIN_OBJ="sheap.o"
26172 ## Cygwin differs because of its unexec().
26173 OTHER_OBJ="$OTHER_OBJ lastfile.o"
26174 else
26175 CYGWIN_OBJ=
26176 OTHER_OBJ="lastfile.o $OTHER_OBJ"
26177 fi
26178
26144 26179
26145 26180
26146 26181
26147 26182
26148 26183