Mercurial > hg > xemacs-beta

comparison configure.in @ 274:ca9a9ec9c1c1 r21-0b35

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-0b35
author cvs
date Mon, 13 Aug 2007 10:29:42 +0200
parents c5d627a313b1
children 6330739388db
comparison
equal deleted inserted replaced
273:411aac7253ef 274:ca9a9ec9c1c1
287 MFLAGS= MAKEFLAGS= 287 MFLAGS= MAKEFLAGS=
288 dnl Maximum number of lines to put in a shell here document. 288 dnl Maximum number of lines to put in a shell here document.
289 ac_max_here_lines=12 289 ac_max_here_lines=12
290 ])dnl 290 ])dnl
291 AC_INIT(src/lisp.h)dnl 291 AC_INIT(src/lisp.h)dnl
292 AC_CONFIG_HEADER(src/config.h lwlib/config.h) 292 AC_CONFIG_HEADER(src/config.h src/paths.h lwlib/config.h)
293 dnl Remove any more than one leading "." element from the path name. 293 dnl Remove any more than one leading "." element from the path name.
294 dnl If we do not remove them, then another "./" will be prepended to 294 dnl If we do not remove them, then another "./" will be prepended to
295 dnl the file name each time we use config.status, and the program name 295 dnl the file name each time we use config.status, and the program name
296 dnl will get larger and larger. This would not be a problem, except 296 dnl will get larger and larger. This would not be a problem, except
297 dnl that since progname gets recorded in all the Makefiles this script 297 dnl that since progname gets recorded in all the Makefiles this script
322 datadir='${prefix}/lib' 322 datadir='${prefix}/lib'
323 statedir='${prefix}/lib' 323 statedir='${prefix}/lib'
324 libdir='${exec_prefix}/lib' 324 libdir='${exec_prefix}/lib'
325 mandir='${prefix}/man/man1' 325 mandir='${prefix}/man/man1'
326 infodir='${datadir}/xemacs-${version}/info' 326 infodir='${datadir}/xemacs-${version}/info'
327 infodir_user_defined='no' 327 infopath=''
328 dnl BETA NOTE: ! Will you please add to this list? Nonexistent dirs
329 dnl are dropped from the list at runtime, so it is safe to add
330 dnl directories to this list that you don't have at home.
331 infopath='/usr/local/lib/texmf/doc/info:/usr/local/lib/texmf/info:/usr/lib/texmf/doc/info:/usr/lib/texmf/info:/usr/local/info:/usr/info'
332 lispdir='${datadir}/xemacs-${version}/lisp' 328 lispdir='${datadir}/xemacs-${version}/lisp'
333 lispdir_user_defined='no'
334 sitelispdir='${datadir}/xemacs/site-lisp' 329 sitelispdir='${datadir}/xemacs/site-lisp'
335 sitelispdir_user_defined='no'
336 pkgdir='${datadir}/xemacs-${version}/lisp' 330 pkgdir='${datadir}/xemacs-${version}/lisp'
337 package_path='~/.xemacs::${datadir}/xemacs-${version}/mule-packages:${datadir}/xemacs/mule-packages:${datadir}/xemacs-${version}/packages:${datadir}/xemacs/packages' 331 package_path=''
338 package_path_user_defined='no'
339 etcdir='${datadir}/xemacs-${version}/etc' 332 etcdir='${datadir}/xemacs-${version}/etc'
340 etcdir_user_defined='no'
341 lockdir='${statedir}/xemacs/lock' 333 lockdir='${statedir}/xemacs/lock'
342 lockdir_user_defined='no'
343 archlibdir='${libdir}/xemacs-${version}/${configuration}' 334 archlibdir='${libdir}/xemacs-${version}/${configuration}'
344 archlibdir_user_defined='no'
345 with_site_lisp='no' 335 with_site_lisp='no'
346 with_menubars='' 336 with_menubars=''
347 with_scrollbars='' 337 with_scrollbars=''
348 with_dialogs='' 338 with_dialogs=''
349 with_file_coding='' 339 with_file_coding=''
431 opt=`echo '' $arg | sed -e 's:^ ::' -e 's:^-*\(.*\)$:\1:'` 421 opt=`echo '' $arg | sed -e 's:^ ::' -e 's:^-*\(.*\)$:\1:'`
432 val="yes" valomitted=yes 422 val="yes" valomitted=yes
433 ;; 423 ;;
434 esac 424 esac
435 425
426 dnl translate "-" in option string to "_"
427 optname="$opt"
428 opt="`echo '' $opt | sed -e 's:^ ::' | tr - _`"
429
436 dnl Support --without-FOO as a synonym for --with-FOO=no 430 dnl Support --without-FOO as a synonym for --with-FOO=no
437 case "${valomitted}-${opt}" in yes-without_* ) 431 case "${valomitted}-${opt}" in yes-without_* )
438 opt=`echo $opt | sed 's/without/with/'` 432 opt=`echo $opt | sed 's/without/with/'`
439 valomitted="no" val="no" ;; 433 valomitted="no" val="no" ;;
440 esac 434 esac
441
442 dnl translate "-" in option string to "_"
443 optname="$opt"
444 opt="`echo '' $opt | sed -e 's:^ ::' | tr - _`"
445 435
446 dnl Process the option. 436 dnl Process the option.
447 case "$opt" in 437 case "$opt" in
448 438
449 dnl Process (many) boolean options 439 dnl Process (many) boolean options
704 dnl Changing exec_prefix or libdir will change the default value 694 dnl Changing exec_prefix or libdir will change the default value
705 dnl of archlibdir. Changing datadir will change the default value 695 dnl of archlibdir. Changing datadir will change the default value
706 dnl of etcdir and lispdir. Changing statedir will change the 696 dnl of etcdir and lispdir. Changing statedir will change the
707 dnl default value of lockdir. 697 dnl default value of lockdir.
708 case "$opt" in 698 case "$opt" in
709 lispdir ) lispdir_user_defined=yes ;; 699 lispdir ) AC_DEFINE(LISPDIR_USER_DEFINED) ;;
710 sitelispdir ) sitelispdir_user_defined=yes ;; 700 sitelispdir ) AC_DEFINE(SITELISPDIR_USER_DEFINED) ;;
711 etcdir ) etcdir_user_defined=yes ;; 701 etcdir ) AC_DEFINE(ETCDIR_USER_DEFINED) ;;
712 infodir ) infodir_user_defined=yes ;; 702 infodir ) AC_DEFINE(INFODIR_USER_DEFINED) ;;
713 package_path ) package_path_user_defined=yes ;; 703 infopath ) AC_DEFINE(INFOPATH_USER_DEFINED) ;;
714 datadir ) lispdir_user_defined=yes etcdir_user_defined=yes ;; 704 package_path ) AC_DEFINE(PACKAGE_PATH_USER_DEFINED) ;;
715 statedir | lockdir ) lockdir_user_defined=yes ;; 705 datadir ) AC_DEFINE(ETCDIR_USER_DEFINED) ;;
716 exec_prefix | libdir | archlibdir ) archlibdir_user_defined=yes ;; 706 statedir | lockdir ) AC_DEFINE(LOCKDIR_USER_DEFINED) ;;
707 exec_prefix | libdir | archlibdir ) AC_DEFINE(ARCHLIBDIR_USER_DEFINED) ;;
717 esac 708 esac
718 ;; 709 ;;
719 710
720 dnl --no-create added by autoconf for use by config.status 711 dnl --no-create added by autoconf for use by config.status
721 "no_create" ) ;; 712 "no_create" ) ;;
760 dnl Several options are equivalent to, and override, environment variables. 751 dnl Several options are equivalent to, and override, environment variables.
761 test -n "$cpp" && CPP="$cpp" 752 test -n "$cpp" && CPP="$cpp"
762 test -n "$cppflags" && CPPFLAGS="$cppflags" 753 test -n "$cppflags" && CPPFLAGS="$cppflags"
763 test -n "$libs" && LIBS="$libs" 754 test -n "$libs" && LIBS="$libs"
764 test -n "$ldflags" && LDFLAGS="$ldflags" 755 test -n "$ldflags" && LDFLAGS="$ldflags"
765
766 dnl Personal settings shouldn't affect the configuration process.
767 dnl if test "$infopath_user_defined" = "no" -a -n "$INFOPATH" ; then
768 dnl infopath="$INFOPATH"
769 dnl fi
770 756
771 dnl Get the arguments back. See the diatribe on Shell Magic above. 757 dnl Get the arguments back. See the diatribe on Shell Magic above.
772 eval set x "$quoted_arguments"; shift 758 eval set x "$quoted_arguments"; shift
773 759
774 dnl --extra-verbose implies --verbose 760 dnl --extra-verbose implies --verbose
1744 fi 1730 fi
1745 1731
1746 dnl Feed s&m crud to src/Makefile 1732 dnl Feed s&m crud to src/Makefile
1747 1733
1748 dnl Linux/powerpc needs the following magic for some reason 1734 dnl Linux/powerpc needs the following magic for some reason
1749 test "$machine$opsys" = "powerpclinux" && start_flags="-T $srcdir/ppc.ldscript" 1735 test "$machine$opsys" = "powerpclinux" && start_flags="-T $srcdir/src/ppc.ldscript"
1750 1736
1751 if test "$unexec" = "unexaix.o"; then 1737 if test "$unexec" = "unexaix.o"; then
1752 dnl AIX needs various hacks to make static linking work. 1738 dnl AIX needs various hacks to make static linking work.
1753 if test "$dynamic" = "no"; then 1739 if test "$dynamic" = "no"; then
1754 start_flags="-Wl,-bnso,-bnodelcsect" 1740 start_flags="-Wl,-bnso,-bnodelcsect"
2339 AC_CHECK_LIB(Xbsd, main, XE_PREPEND(-lXbsd, libs_x)) 2325 AC_CHECK_LIB(Xbsd, main, XE_PREPEND(-lXbsd, libs_x))
2340 2326
2341 dnl Problem with the MIT distribution of X on AIX 2327 dnl Problem with the MIT distribution of X on AIX
2342 if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then 2328 if test "$unexec" = "unexaix.o" -a "$x11_release" = "6"; then
2343 dnl X11R6 requires thread-safe code on AIX for some reason 2329 dnl X11R6 requires thread-safe code on AIX for some reason
2344 case "$CC" in 2330 if test "$GCC" = "yes"; then
2345 "xlc" ) CC="xlc_r" ;; 2331 XE_PREPEND(-mthreads, X_CFLAGS)
2346 "xlC" ) CC="xlC_r" ;; 2332 XE_PREPEND(-mthreads, libs_x)
2347 "cc" ) CC="cc_r" ;; 2333 else
2348 "gcc" ) 2334 case "$CC" in
2349 XE_PREPEND(-mthreads, X_CFLAGS) 2335 "xlc" ) CC="xlc_r" ;;
2350 XE_PREPEND(-mthreads, libs_x) 2336 "xlC" ) CC="xlC_r" ;;
2351 ;; 2337 "cc" ) CC="cc_r" ;;
2352 esac 2338 esac
2339 fi
2353 fi 2340 fi
2354 2341
2355 fi dnl $with_x11 = yes 2342 fi dnl $with_x11 = yes
2356 2343
2357 if test "$with_msw" != "no"; then 2344 if test "$with_msw" != "no"; then
2465 with_offix=no 2452 with_offix=no
2466 fi 2453 fi
2467 test -z "$with_offix" && with_offix=yes 2454 test -z "$with_offix" && with_offix=yes
2468 if test "$with_offix" = "yes"; then 2455 if test "$with_offix" = "yes"; then
2469 AC_DEFINE(HAVE_OFFIX_DND) 2456 AC_DEFINE(HAVE_OFFIX_DND)
2470 XE_ADD_OBJS(offix.o) 2457 XE_APPEND(offix.o, dnd_objs)
2471 fi 2458 fi
2459
2460 AC_SUBST(dnd_objs)
2472 2461
2473 dnl Autodetect tooltalk 2462 dnl Autodetect tooltalk
2474 test "$with_cde" = "yes" && with_tooltalk=yes # CDE requires tooltalk 2463 test "$with_cde" = "yes" && with_tooltalk=yes # CDE requires tooltalk
2475 if test "$with_tooltalk" != "no" ; then 2464 if test "$with_tooltalk" != "no" ; then
2476 dnl autodetect the location of tt_c.h 2465 dnl autodetect the location of tt_c.h
2615 AC_EGREP_CPP(yes, 2604 AC_EGREP_CPP(yes,
2616 [#include <png.h> 2605 [#include <png.h>
2617 #if PNG_LIBPNG_VER >= 96 2606 #if PNG_LIBPNG_VER >= 96
2618 yes 2607 yes
2619 #endif 2608 #endif
2620 ], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no); have_png=no]) 2609 ], [AC_MSG_RESULT(yes)], [AC_MSG_RESULT(no); with_png=no])
2621 fi 2610 fi
2622 test -z "$with_png" && { AC_CHECK_FUNC(pow, ,with_png=no) } 2611 test -z "$with_png" && { AC_CHECK_FUNC(pow, ,with_png=no) }
2623 test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no) } 2612 test -z "$with_png" && { AC_CHECK_LIB(png, png_read_image,[:],with_png=no) }
2624 test -z "$with_png" && with_png=yes 2613 test -z "$with_png" && with_png=yes
2625 if test "$with_png" = "yes"; then 2614 if test "$with_png" = "yes"; then
3485 fi 3474 fi
3486 3475
3487 dnl There are no more compile tests; remove the core they created. 3476 dnl There are no more compile tests; remove the core they created.
3488 rm -f core 3477 rm -f core
3489 3478
3490 dnl ------------------------------------- 3479 dnl ----------------------------------------------
3491 dnl Substitute into Makefile and config.h 3480 dnl Substitute into Makefile, config.h and paths.h
3492 dnl ------------------------------------- 3481 dnl ----------------------------------------------
3493 3482
3494 dnl what sort of things to edit into Makefile and config.h. 3483 dnl what sort of things to edit into Makefile, config.h and paths.h
3495 dnl configuration here uncanonicalized to avoid exceeding size limits. 3484 dnl configuration here uncanonicalized to avoid exceeding size limits.
3496 3485
3497 AC_SUBST(version) 3486 AC_SUBST(version)
3498 AC_SUBST(configuration) 3487 AC_SUBST(configuration)
3499 AC_SUBST(canonical) 3488 AC_SUBST(canonical)
3504 AC_SUBST(datadir) 3493 AC_SUBST(datadir)
3505 AC_SUBST(pkgdir) 3494 AC_SUBST(pkgdir)
3506 AC_SUBST(statedir) 3495 AC_SUBST(statedir)
3507 AC_SUBST(libdir) 3496 AC_SUBST(libdir)
3508 AC_SUBST(mandir) 3497 AC_SUBST(mandir)
3498
3509 AC_SUBST(infodir) 3499 AC_SUBST(infodir)
3510 AC_SUBST(infodir_user_defined) 3500 AC_SUBST(INFODIR_USER_DEFINED)
3501 dnl Yo, Stephen Bourne! I want to marry you!
3502 INFODIR=$infodir
3503 while true; do
3504 case "$INFODIR" in
3505 *\$* ) eval "INFODIR=$INFODIR" ;;
3506 *) break ;;
3507 esac
3508 done
3509 AC_SUBST(INFODIR)
3510
3511 AC_SUBST(infopath) 3511 AC_SUBST(infopath)
3512 AC_SUBST(INFOPATH_USER_DEFINED)
3513 INFOPATH=$infopath
3514 while true; do
3515 case "$INFOPATH" in
3516 *\$* ) eval "INFOPATH=$INFOPATH" ;;
3517 *) break ;;
3518 esac
3519 done
3520 AC_SUBST(INFOPATH)
3521
3512 AC_SUBST(package_path) 3522 AC_SUBST(package_path)
3513 AC_SUBST(package_path_user_defined) 3523 AC_SUBST(PACKAGE_PATH_USER_DEFINED)
3524 PACKAGE_PATH=$package_path
3525 while true; do
3526 case "$PACKAGE_PATH" in
3527 *\$* ) eval "PACKAGE_PATH=$PACKAGE_PATH" ;;
3528 *) break ;;
3529 esac
3530 done
3531 AC_SUBST(PACKAGE_PATH)
3532
3514 AC_SUBST(lispdir) 3533 AC_SUBST(lispdir)
3515 AC_SUBST(lispdir_user_defined) 3534 AC_SUBST(LISPDIR_USER_DEFINED)
3535 LISPDIR=$lispdir
3536 while true; do
3537 case "$LISPDIR" in
3538 *\$* ) eval "LISPDIR=$LISPDIR" ;;
3539 *) break ;;
3540 esac
3541 done
3542 AC_SUBST(LISPDIR)
3543
3516 AC_SUBST(sitelispdir) 3544 AC_SUBST(sitelispdir)
3517 AC_SUBST(sitelispdir_user_defined) 3545 AC_SUBST(SITELISPDIR_USER_DEFINED)
3546 SITELISPDIR=$sitelispdir
3547 while true; do
3548 case "$SITELISPDIR" in
3549 *\$* ) eval "SITELISPDIR=$SITELISPDIR" ;;
3550 *) break ;;
3551 esac
3552 done
3553 AC_SUBST(SITELISPDIR)
3554
3518 AC_SUBST(etcdir) 3555 AC_SUBST(etcdir)
3519 AC_SUBST(etcdir_user_defined) 3556 AC_SUBST(ETCDIR_USER_DEFINED)
3557 ETCDIR=$etcdir
3558 while true; do
3559 case "$ETCDIR" in
3560 *\$* ) eval "ETCDIR=$ETCDIR" ;;
3561 *) break ;;
3562 esac
3563 done
3564 AC_SUBST(ETCDIR)
3565
3520 AC_SUBST(lockdir) 3566 AC_SUBST(lockdir)
3521 AC_SUBST(lockdir_user_defined) 3567 AC_SUBST(LOCKDIR_USER_DEFINED)
3568 LOCKDIR=$lockdir
3569 while true; do
3570 case "$LOCKDIR" in
3571 *\$* ) eval "LOCKDIR=$LOCKDIR" ;;
3572 *) break ;;
3573 esac
3574 done
3575 AC_SUBST(LOCKDIR)
3576
3522 AC_SUBST(archlibdir) 3577 AC_SUBST(archlibdir)
3523 AC_SUBST(archlibdir_user_defined) 3578 AC_SUBST(ARCHLIBDIR_USER_DEFINED)
3579 ARCHLIBDIR=$archlibdir
3580 while true; do
3581 case "$ARCHLIBDIR" in
3582 *\$* ) eval "ARCHLIBDIR=$ARCHLIBDIR" ;;
3583 *) break ;;
3584 esac
3585 done
3586 AC_SUBST(ARCHLIBDIR)
3587
3524 AC_SUBST(docdir) 3588 AC_SUBST(docdir)
3525 AC_SUBST(bitmapdir) 3589 AC_SUBST(bitmapdir)
3526 AC_SUBST(extra_objs) 3590 AC_SUBST(extra_objs)
3527 AC_SUBST(ld_dynamic_link_flags) 3591 AC_SUBST(ld_dynamic_link_flags)
3528 3592
3770 for file in $internal_makefile_list; do 3834 for file in $internal_makefile_list; do
3771 test "$file" = src/Makefile.in && \ 3835 test "$file" = src/Makefile.in && \
3772 file="src/Makefile.in:src/Makefile.in.in:src/depend" 3836 file="src/Makefile.in:src/Makefile.in.in:src/depend"
3773 ac_output_files="${ac_output_files+$ac_output_files }$file" 3837 ac_output_files="${ac_output_files+$ac_output_files }$file"
3774 done 3838 done
3775 ac_output_files="$ac_output_files lib-src/config.values" 3839 ac_output_files="$ac_output_files src/paths.h.in lib-src/config.values"
3776 3840
3777 AC_OUTPUT($ac_output_files, 3841 AC_OUTPUT($ac_output_files,
3778 [for dir in $MAKE_SUBDIR; do 3842 [for dir in $MAKE_SUBDIR; do
3779 echo creating $dir/Makefile 3843 echo creating $dir/Makefile
3780 ( 3844 (