comparison configure.in @ 355:182f72e8cd0d r21-1-7

Import from CVS: tag r21-1-7
author cvs
date Mon, 13 Aug 2007 10:56:21 +0200
parents 3b3709405255
children 4711e16a8e49
comparison
equal deleted inserted replaced
354:3729bef672e0 355:182f72e8cd0d
342 libdir='${exec_prefix}/lib' 342 libdir='${exec_prefix}/lib'
343 mandir='${prefix}/man/man1' 343 mandir='${prefix}/man/man1'
344 infodir='${datadir}/${PROGNAME}-${version}/info' 344 infodir='${datadir}/${PROGNAME}-${version}/info'
345 infopath='' 345 infopath=''
346 install_pp='' 346 install_pp=''
347 exe_suffix=''
347 lispdir='${datadir}/${PROGNAME}-${version}/lisp' 348 lispdir='${datadir}/${PROGNAME}-${version}/lisp'
348 dnl sitelispdir='${datadir}/xemacs/site-lisp' 349 dnl sitelispdir='${datadir}/xemacs/site-lisp'
349 pkgdir='${datadir}/${PROGNAME}-${version}/lisp' 350 pkgdir='${datadir}/${PROGNAME}-${version}/lisp'
350 package_path='' 351 package_path=''
351 etcdir='${datadir}/${PROGNAME}-${version}/etc' 352 etcdir='${datadir}/${PROGNAME}-${version}/etc'
1030 sparc-*-* ) machine=sparc ;; 1031 sparc-*-* ) machine=sparc ;;
1031 alpha*-*-* ) machine=alpha ;; 1032 alpha*-*-* ) machine=alpha ;;
1032 vax-*-* ) machine=vax ;; 1033 vax-*-* ) machine=vax ;;
1033 mips-dec-* ) machine=pmax ;; 1034 mips-dec-* ) machine=pmax ;;
1034 mips-sgi-* ) machine=iris4d ;; 1035 mips-sgi-* ) machine=iris4d ;;
1036 mips*-linux ) machine=mips ;;
1035 romp-ibm-* ) machine=ibmrt ;; 1037 romp-ibm-* ) machine=ibmrt ;;
1036 rs6000-ibm-aix* ) machine=ibmrs6000 ;; 1038 rs6000-ibm-aix* ) machine=ibmrs6000 ;;
1037 powerpc-ibm-aix* ) machine=ibmrs6000 ;; 1039 powerpc-ibm-aix* ) machine=ibmrs6000 ;;
1038 powerpc*-* ) machine=powerpc ;; 1040 powerpc*-* ) machine=powerpc ;;
1039 hppa-*-* ) machine=hp800 ;; 1041 hppa-*-* ) machine=hp800 ;;
2460 AC_CHECKING(for MS-Windows) 2462 AC_CHECKING(for MS-Windows)
2461 AC_CHECK_LIB(gdi32,main,with_msw=yes) 2463 AC_CHECK_LIB(gdi32,main,with_msw=yes)
2462 if test "$with_msw" = "yes"; then 2464 if test "$with_msw" = "yes"; then
2463 AC_DEFINE(HAVE_MS_WINDOWS) 2465 AC_DEFINE(HAVE_MS_WINDOWS)
2464 install_pp="$blddir/lib-src/installexe.sh" 2466 install_pp="$blddir/lib-src/installexe.sh"
2467 exe_suffix=".exe"
2465 XE_APPEND(-lshell32 -lgdi32 -luser32 -lcomctl32, libs_system) 2468 XE_APPEND(-lshell32 -lgdi32 -luser32 -lcomctl32, libs_system)
2466 test "$with_dragndrop" != no && XE_APPEND(msw, dragndrop_proto) 2469 test "$with_dragndrop" != no && XE_APPEND(msw, dragndrop_proto)
2467 if test "$window_system" != x11; then 2470 if test "$window_system" != x11; then
2468 window_system=msw 2471 window_system=msw
2469 test "$with_scrollbars" != "no" && with_scrollbars=msw \ 2472 test "$with_scrollbars" != "no" && with_scrollbars=msw \
2491 XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o) 2494 XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o)
2492 fi 2495 fi
2493 fi 2496 fi
2494 2497
2495 AC_SUBST(install_pp) 2498 AC_SUBST(install_pp)
2499 AC_SUBST(exe_suffix)
2496 2500
2497 test -z "$window_system" && window_system="none" 2501 test -z "$window_system" && window_system="none"
2498 2502
2499 dnl Test for features that require a window system - ANY window system 2503 dnl Test for features that require a window system - ANY window system
2500 if test "$window_system" = "none"; then 2504 if test "$window_system" = "none"; then
3896 if test "$with_site_lisp" = "no"; then 3900 if test "$with_site_lisp" = "no"; then
3897 AC_DEFINE(INHIBIT_SITE_LISP) 3901 AC_DEFINE(INHIBIT_SITE_LISP)
3898 fi 3902 fi
3899 3903
3900 XE_SPACE(ac_configure_args, $ac_configure_args) 3904 XE_SPACE(ac_configure_args, $ac_configure_args)
3901 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "$canonical") 3905 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "$configuration")
3902 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "$ac_configure_args") 3906 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "$ac_configure_args")
3903 AC_DEFINE_UNQUOTED(config_machfile, "$machfile") 3907 AC_DEFINE_UNQUOTED(config_machfile, "$machfile")
3904 AC_DEFINE_UNQUOTED(config_opsysfile, "$opsysfile") 3908 AC_DEFINE_UNQUOTED(config_opsysfile, "$opsysfile")
3905 3909
3906 dnl Following are deprecated 3910 dnl Following are deprecated