comparison configure.in @ 280:7df0dd720c89 r21-0b38

Import from CVS: tag r21-0b38
author cvs
date Mon, 13 Aug 2007 10:32:22 +0200
parents 90d73dddcdc4
children c42ec1d1cded
comparison
equal deleted inserted replaced
279:c20b2fb5bb0a 280:7df0dd720c89
323 dnl libexecdir='${exec_prefix}/libexec' 323 dnl libexecdir='${exec_prefix}/libexec'
324 datadir='${prefix}/lib' 324 datadir='${prefix}/lib'
325 statedir='${prefix}/lib' 325 statedir='${prefix}/lib'
326 libdir='${exec_prefix}/lib' 326 libdir='${exec_prefix}/lib'
327 mandir='${prefix}/man/man1' 327 mandir='${prefix}/man/man1'
328 infodir='${datadir}/xemacs-${version}/info' 328 infodir='${datadir}/${PROGNAME}-${version}/info'
329 infopath='' 329 infopath=''
330 install_pp='' 330 install_pp=''
331 lispdir='${datadir}/xemacs-${version}/lisp' 331 lispdir='${datadir}/${PROGNAME}-${version}/lisp'
332 dnl sitelispdir='${datadir}/xemacs/site-lisp' 332 dnl sitelispdir='${datadir}/xemacs/site-lisp'
333 pkgdir='${datadir}/xemacs-${version}/lisp' 333 pkgdir='${datadir}/${PROGNAME}-${version}/lisp'
334 package_path='' 334 package_path=''
335 etcdir='${datadir}/xemacs-${version}/etc' 335 etcdir='${datadir}/${PROGNAME}-${version}/etc'
336 lockdir='${statedir}/xemacs/lock' 336 lockdir='${statedir}/${PROGNAME}/lock'
337 archlibdir='${libdir}/xemacs-${version}/${configuration}' 337 archlibdir='${libdir}/${PROGNAME}-${version}/${configuration}'
338 with_site_lisp='no' 338 with_site_lisp='no'
339 with_menubars='' 339 with_menubars=''
340 with_scrollbars='' 340 with_scrollbars=''
341 with_dialogs='' 341 with_dialogs=''
342 with_file_coding='' 342 with_file_coding=''
478 with_ldap | \ 478 with_ldap | \
479 with_pop | \ 479 with_pop | \
480 with_kerberos | \ 480 with_kerberos | \
481 with_hesiod | \ 481 with_hesiod | \
482 with_dnet | \ 482 with_dnet | \
483 with_infodock | \
483 external_widget | \ 484 external_widget | \
484 verbose | \ 485 verbose | \
485 extra_verbose | \ 486 extra_verbose | \
486 const_is_losing | \ 487 const_is_losing | \
487 usage_tracking | \ 488 usage_tracking | \
907 AC_DEFINE_UNQUOTED(EMACS_BETA_VERSION, $emacs_beta_version) 908 AC_DEFINE_UNQUOTED(EMACS_BETA_VERSION, $emacs_beta_version)
908 fi 909 fi
909 AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename") 910 AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename")
910 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") 911 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version")
911 912
912 dnl InfoDock version numbers. XEmacs will use the same numbering after 913 if test "$with_infodock" = "yes"; then
913 dnl the release of 21.0. 914 if test ! -f ../InfoDock.rules; then
914 AC_DEFINE_UNQUOTED(INFODOCK_MAJOR_VERSION, $infodock_major_version) 915 echo "Cannot build InfoDock without InfoDock sources"
915 AC_DEFINE_UNQUOTED(INFODOCK_MINOR_VERSION, $infodock_minor_version) 916 with_infodock=no
916 AC_DEFINE_UNQUOTED(INFODOCK_BUILD_VERSION, $infodock_build_version) 917 fi
918 fi
919
920 if test "$with_infodock" = "yes"; then
921 dnl InfoDock version numbers. XEmacs will use the same style of numbering
922 dnl after the release of XEmacs 21.0.
923 AC_DEFINE_UNQUOTED(INFODOCK_MAJOR_VERSION, $infodock_major_version)
924 AC_DEFINE_UNQUOTED(INFODOCK_MINOR_VERSION, $infodock_minor_version)
925 AC_DEFINE_UNQUOTED(INFODOCK_BUILD_VERSION, $infodock_build_version)
926 version=${infodock_major_version}.${infodock_minor_version}.${infodock_build_version}
927 PROGNAME=infodock
928 CPPFLAGS="$CPPFLAGS -DINFODOCK"
929 else
930 PROGNAME=xemacs
931 fi
917 932
918 dnl ---------------------------------- 933 dnl ----------------------------------
919 dnl Error checking and debugging flags 934 dnl Error checking and debugging flags
920 dnl ---------------------------------- 935 dnl ----------------------------------
921 dnl Error checking default to "yes" in beta versions, to "no" in releases. 936 dnl Error checking default to "yes" in beta versions, to "no" in releases.
1459 fi 1474 fi
1460 1475
1461 dnl Use xlc by default on AIX 1476 dnl Use xlc by default on AIX
1462 case "$opsys" in aix*) NON_GNU_CC=xlc ;; esac 1477 case "$opsys" in aix*) NON_GNU_CC=xlc ;; esac
1463 1478
1464 stack_trace_eye_catcher=`echo xemacs_${version}_${canonical} | sed 'y/.-/__/'` 1479 stack_trace_eye_catcher=`echo ${PROGNAME}_${version}_${canonical} | sed 'y/.-/__/'`
1465 AC_DEFINE_UNQUOTED(STACK_TRACE_EYE_CATCHER, $stack_trace_eye_catcher) 1480 AC_DEFINE_UNQUOTED(STACK_TRACE_EYE_CATCHER, $stack_trace_eye_catcher)
1466 1481
1467 machfile="m/${machine}.h" 1482 machfile="m/${machine}.h"
1468 opsysfile="s/${opsys}.h" 1483 opsysfile="s/${opsys}.h"
1469 1484
3533 dnl ---------------------------------------------- 3548 dnl ----------------------------------------------
3534 3549
3535 dnl what sort of things to edit into Makefile, config.h and paths.h 3550 dnl what sort of things to edit into Makefile, config.h and paths.h
3536 dnl configuration here uncanonicalized to avoid exceeding size limits. 3551 dnl configuration here uncanonicalized to avoid exceeding size limits.
3537 3552
3553 AC_SUBST(PROGNAME)
3538 AC_SUBST(version) 3554 AC_SUBST(version)
3539 AC_SUBST(configuration) 3555 AC_SUBST(configuration)
3540 AC_SUBST(canonical) 3556 AC_SUBST(canonical)
3541 AC_SUBST(srcdir) 3557 AC_SUBST(srcdir)
3542 AC_SUBST(bindir) 3558 AC_SUBST(bindir)