Mercurial > emacs

comparison configure @ 90237:aa89c814f853

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-88 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 569-579) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 129-132) - Update from CVS - Merge from emacs--cvs-trunk--0
author Miles Bader <miles@gnu.org>
date Fri, 07 Oct 2005 07:15:40 +0000
parents 10fe5fadaf89 878043933e69
children 7beb78bc1f8e
comparison
equal deleted inserted replaced
90236:7871ecd1281b 90237:aa89c814f853
8195 if test ${bmd_acc} != "dummyval"; then 8195 if test ${bmd_acc} != "dummyval"; then
8196 bitmapdir=`echo ${bmd_acc} | sed -e "s/^dummyval://"` 8196 bitmapdir=`echo ${bmd_acc} | sed -e "s/^dummyval://"`
8197 fi 8197 fi
8198 fi 8198 fi
8199 8199
8200 case "${window_system}" in
8201 x11 )
8202 HAVE_X_WINDOWS=yes
8203 HAVE_X11=yes
8204 case "${with_x_toolkit}" in
8205 athena | lucid ) USE_X_TOOLKIT=LUCID ;;
8206 motif ) USE_X_TOOLKIT=MOTIF ;;
8207 gtk ) with_gtk=yes
8208 USE_X_TOOLKIT=none ;;
8209 no ) USE_X_TOOLKIT=none ;;
8210 * ) USE_X_TOOLKIT=maybe ;;
8211 esac
8212 ;;
8213 none )
8214 HAVE_X_WINDOWS=no
8215 HAVE_X11=no
8216 USE_X_TOOLKIT=none
8217 ;;
8218 esac
8219
8220 ### If we're using X11, we should use the X menu package.
8221 HAVE_MENUS=no
8222 case ${HAVE_X11} in
8223 yes ) HAVE_MENUS=yes ;;
8224 esac
8225
8226 if test "${opsys}" = "hpux9"; then
8227 case "${x_libraries}" in
8228 *X11R4* )
8229 opsysfile="s/hpux9-x11r4.h"
8230 ;;
8231 esac
8232 fi
8233
8234 if test "${opsys}" = "hpux9shr"; then
8235 case "${x_libraries}" in
8236 *X11R4* )
8237 opsysfile="s/hpux9shxr4.h"
8238 ;;
8239 esac
8240 fi
8241
8242 HAVE_CARBON=no 8200 HAVE_CARBON=no
8243 if test "${HAVE_X11}" != "yes"; then 8201 if test "${with_carbon}" != no; then
8244 if test "${with_carbon}" != "no"; then 8202 if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
8245 if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
8246 echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5 8203 echo "$as_me:$LINENO: checking for Carbon/Carbon.h" >&5
8247 echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6 8204 echo $ECHO_N "checking for Carbon/Carbon.h... $ECHO_C" >&6
8248 if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then 8205 if test "${ac_cv_header_Carbon_Carbon_h+set}" = set; then
8249 echo $ECHO_N "(cached) $ECHO_C" >&6 8206 echo $ECHO_N "(cached) $ECHO_C" >&6
8250 fi 8207 fi
8382 if test $ac_cv_header_Carbon_Carbon_h = yes; then 8339 if test $ac_cv_header_Carbon_Carbon_h = yes; then
8383 HAVE_CARBON=yes 8340 HAVE_CARBON=yes
8384 fi 8341 fi
8385 8342
8386 8343
8344 fi
8345 if test "${window_system}" = x11 && test "${HAVE_CARBON}" = yes; then
8346 if test "${with_carbon+set}" != set \
8347 && test "${carbon_appdir_x+set}" != set; then
8348 HAVE_CARBON=no
8387 fi 8349 fi
8350 fi
8351 if test "${HAVE_CARBON}" = yes; then
8352 window_system=mac
8353 fi
8354
8355 case "${window_system}" in
8356 x11 )
8357 HAVE_X_WINDOWS=yes
8358 HAVE_X11=yes
8359 case "${with_x_toolkit}" in
8360 athena | lucid ) USE_X_TOOLKIT=LUCID ;;
8361 motif ) USE_X_TOOLKIT=MOTIF ;;
8362 gtk ) with_gtk=yes
8363 USE_X_TOOLKIT=none ;;
8364 no ) USE_X_TOOLKIT=none ;;
8365 * ) USE_X_TOOLKIT=maybe ;;
8366 esac
8367 ;;
8368 mac | none )
8369 HAVE_X_WINDOWS=no
8370 HAVE_X11=no
8371 USE_X_TOOLKIT=none
8372 ;;
8373 esac
8374
8375 ### If we're using X11, we should use the X menu package.
8376 HAVE_MENUS=no
8377 case ${HAVE_X11} in
8378 yes ) HAVE_MENUS=yes ;;
8379 esac
8380
8381 if test "${opsys}" = "hpux9"; then
8382 case "${x_libraries}" in
8383 *X11R4* )
8384 opsysfile="s/hpux9-x11r4.h"
8385 ;;
8386 esac
8387 fi
8388
8389 if test "${opsys}" = "hpux9shr"; then
8390 case "${x_libraries}" in
8391 *X11R4* )
8392 opsysfile="s/hpux9shxr4.h"
8393 ;;
8394 esac
8388 fi 8395 fi
8389 8396
8390 ### Compute the unexec source name from the object name. 8397 ### Compute the unexec source name from the object name.
8391 UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`" 8398 UNEXEC_SRC="`echo ${unexec} | sed 's/\.o/.c/'`"
8392 8399
12714 12721
12715 cat >>confdefs.h <<\_ACEOF 12722 cat >>confdefs.h <<\_ACEOF
12716 #define HAVE_CARBON 1 12723 #define HAVE_CARBON 1
12717 _ACEOF 12724 _ACEOF
12718 12725
12719 window_system=mac
12720 ## Specify the install directory 12726 ## Specify the install directory
12721 carbon_appdir= 12727 carbon_appdir=
12722 if test "${carbon_appdir_x}" != ""; then 12728 if test "${carbon_appdir_x}" != ""; then
12723 case ${carbon_appdir_x} in 12729 case ${carbon_appdir_x} in
12724 y | ye | yes) carbon_appdir=/Applications ;; 12730 y | ye | yes) carbon_appdir=/Applications ;;