comparison configure.in @ 185:3d6bfa290dbd r20-3b19

Import from CVS: tag r20-3b19
author cvs
date Mon, 13 Aug 2007 09:55:28 +0200
parents e121b013d1f0
children b405438285a2
comparison
equal deleted inserted replaced
184:bcd2674570bf 185:3d6bfa290dbd
255 target=NONE 255 target=NONE
256 verbose= 256 verbose=
257 x_includes=NONE 257 x_includes=NONE
258 x_libraries=NONE 258 x_libraries=NONE
259 CDPATH=.; export CDPATH 259 CDPATH=.; export CDPATH
260 dnl this will serve for testing if a default value sould be given
261 package_path=NONE
260 262
261 dnl Allow this script to work with zsh, by setting sh emulation options 263 dnl Allow this script to work with zsh, by setting sh emulation options
262 if test -n "$ZSH_VERSION"; then 264 if test -n "$ZSH_VERSION"; then
263 setopt NO_BAD_PATTERN NO_BANG_HIST NO_BG_NICE NO_EQUALS NO_FUNCTION_ARGZERO 265 setopt NO_BAD_PATTERN NO_BANG_HIST NO_BG_NICE NO_EQUALS NO_FUNCTION_ARGZERO
264 setopt GLOB_SUBST NO_HUP INTERACTIVE_COMMENTS KSH_ARRAYS NO_MULTIOS NO_NOMATCH 266 setopt GLOB_SUBST NO_HUP INTERACTIVE_COMMENTS KSH_ARRAYS NO_MULTIOS NO_NOMATCH
277 datadir='${prefix}/share' 279 datadir='${prefix}/share'
278 sysconfdir='${prefix}/etc' 280 sysconfdir='${prefix}/etc'
279 sharedstatedir='${prefix}/com' 281 sharedstatedir='${prefix}/com'
280 localstatedir='${prefix}/var' 282 localstatedir='${prefix}/var'
281 libdir='${{exec_prefix}}/lib' 283 libdir='${{exec_prefix}}/lib'
282 dnl The following gives NONE/lib/xemacs/packages as the first package
283 dnl package_path=${prefix}/lib/xemacs/packages:~/.xemacs
284 includedir='${prefix}/include' 284 includedir='${prefix}/include'
285 oldincludedir='/usr/include' 285 oldincludedir='/usr/include'
286 infodir='${prefix}/info' 286 infodir='${prefix}/info'
287 mandir='${prefix}/man' 287 mandir='${prefix}/man'
288 288
487 --with-hesiod support Hesiod to get the POP server host 487 --with-hesiod support Hesiod to get the POP server host
488 --with-dnet (*) Compile with support for DECnet. 488 --with-dnet (*) Compile with support for DECnet.
489 --mail-locking=TYPE (*) Specify the locking to be used by movemail to prevent 489 --mail-locking=TYPE (*) Specify the locking to be used by movemail to prevent
490 concurrent updates of mail spool files. Valid types 490 concurrent updates of mail spool files. Valid types
491 are \`lockf', \`flock', and \`file'. 491 are \`lockf', \`flock', and \`file'.
492 --package-path=PATH A list of blank separated directories for finding
493 packages to dump with xemacs.
494 Defaults to \`$prefix/lib/xemacs/packages ~/.xemacs'
492 495
493 Internationalization options: 496 Internationalization options:
494 497
495 --with-mule Compile with Mule (MUlti-Lingual Emacs) support, 498 --with-mule Compile with Mule (MUlti-Lingual Emacs) support,
496 needed to suport non-Latin-1 (including Asian) languages. 499 needed to suport non-Latin-1 (including Asian) languages.
2359 fi 2362 fi
2360 2363
2361 dnl autodetect -lXmu 2364 dnl autodetect -lXmu
2362 test -z "$with_xmu" && { AC_CHECK_LIB(Xmu, XmuReadBitmapDataFromFile, 2365 test -z "$with_xmu" && { AC_CHECK_LIB(Xmu, XmuReadBitmapDataFromFile,
2363 with_xmu=yes, with_xmu=no) } 2366 with_xmu=yes, with_xmu=no) }
2364 if test "$with_xmu" = "no" 2367 if test "$with_xmu" = "no"; then
2365 then XE_ADD_OBJS(xmu.o) 2368 XE_ADD_OBJS(xmu.o)
2366 else XE_PREPEND(-lXmu, libs_x) 2369 else
2370 XE_PREPEND(-lXmu, libs_x)
2371 AC_DEFINE(HAVE_XMU)
2367 fi 2372 fi
2368 2373
2369 dnl Autodetect -lXbsd 2374 dnl Autodetect -lXbsd
2370 dnl #### Someone, please add a better function than main 2375 dnl #### Someone, please add a better function than main
2371 AC_CHECK_LIB(Xbsd, main, XE_PREPEND(-lXbsd, libs_x)) 2376 AC_CHECK_LIB(Xbsd, main, XE_PREPEND(-lXbsd, libs_x))
3366 AC_SUBST(sound_cflags) 3371 AC_SUBST(sound_cflags)
3367 AC_SUBST(RANLIB) 3372 AC_SUBST(RANLIB)
3368 AC_SUBST(dynodump_arch) 3373 AC_SUBST(dynodump_arch)
3369 3374
3370 3375
3376 dnl if --package-path wasn't passed to configure, give the default value
3377 if test "x${package_path}" = "xNONE" ; then
3378 package_path="${prefix}/lib/xemacs/packages:~/.xemacs"
3379 fi
3371 dnl change blanks to colons in package path, and make available to config.h 3380 dnl change blanks to colons in package path, and make available to config.h
3372 if test -n "$package_path"; then 3381 package_path=`echo $package_path | sed 'y/ /:/'`
3373 package_path=`echo $package_path | sed 'y/ /:/'` 3382 AC_DEFINE_UNQUOTED(PACKAGE_PATH, "$package_path")
3374 AC_DEFINE_UNQUOTED(PACKAGE_PATH, "$package_path")
3375 fi
3376 3383
3377 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "$canonical") 3384 AC_DEFINE_UNQUOTED(EMACS_CONFIGURATION, "$canonical")
3378 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}") 3385 AC_DEFINE_UNQUOTED(EMACS_CONFIG_OPTIONS, "${ac_configure_args}")
3379 AC_DEFINE_UNQUOTED(config_machfile, "$machfile") 3386 AC_DEFINE_UNQUOTED(config_machfile, "$machfile")
3380 AC_DEFINE_UNQUOTED(config_opsysfile, "$opsysfile") 3387 AC_DEFINE_UNQUOTED(config_opsysfile, "$opsysfile")