Mercurial > hg > xemacs-beta

comparison configure.in @ 422:95016f13131a r21-2-19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-19
author cvs
date Mon, 13 Aug 2007 11:25:01 +0200
parents 41dbb7a9d5f2
children 11054d720c21
comparison
equal deleted inserted replaced
421:fff06e11db74 422:95016f13131a
343 dnl libexecdir='${exec_prefix}/libexec' 343 dnl libexecdir='${exec_prefix}/libexec'
344 datadir='${prefix}/lib' 344 datadir='${prefix}/lib'
345 statedir='${prefix}/lib' 345 statedir='${prefix}/lib'
346 libdir='${exec_prefix}/lib' 346 libdir='${exec_prefix}/lib'
347 mandir='${prefix}/man/man1' 347 mandir='${prefix}/man/man1'
348 infodir='${datadir}/${PROGNAME}-${version}/info' 348 inststaticdir='${PROGNAME}'
349 instvardir='${PROGNAME}-${version}'
350 infodir='${datadir}/${instvardir}/info'
349 infopath='' 351 infopath=''
350 install_pp='' 352 install_pp=''
351 lispdir='${datadir}/${PROGNAME}-${version}/lisp' 353 lispdir='${datadir}/${instvardir}/lisp'
352 moduledir='${datadir}/${PROGNAME}-${version}/${configuration}/modules' 354 moduledir='${datadir}/${instvardir}/${configuration}/modules'
353 sitelispdir='${datadir}/xemacs/site-lisp' 355 sitelispdir='${datadir}/${inststaticdir}/site-lisp'
354 sitemoduledir='${datadir}/xemacs/site-modules' 356 sitemoduledir='${datadir}/${inststaticdir}/site-modules'
355 pkgdir='${datadir}/${PROGNAME}-${version}/lisp' 357 pkgdir='${datadir}/${instvardir}/lisp'
356 package_path='' 358 package_path=''
357 etcdir='${datadir}/${PROGNAME}-${version}/etc' 359 etcdir='${datadir}/${instvardir}/etc'
358 lockdir='${statedir}/${PROGNAME}/lock' 360 lockdir='${statedir}/${inststaticdir}/lock'
359 archlibdir='${datadir}/${PROGNAME}-${version}/${configuration}' 361 archlibdir='${datadir}/${instvardir}/${configuration}'
360 docdir='${archlibdir}' 362 docdir='${archlibdir}'
361 with_prefix='yes' 363 with_prefix='yes'
362 with_site_lisp='no' 364 with_site_lisp='no'
363 with_site_modules='yes' 365 with_site_modules='yes'
364 with_menubars='' 366 with_menubars=''
516 use_union_type | \ 518 use_union_type | \
517 debug | \ 519 debug | \
518 use_assertions | \ 520 use_assertions | \
519 memory_usage_stats | \ 521 memory_usage_stats | \
520 with_clash_detection | \ 522 with_clash_detection | \
521 with_shlib | \ 523 with_modules | \
522 no_doc_file ) 524 no_doc_file )
523 dnl Make sure the value given was either "yes" or "no". 525 dnl Make sure the value given was either "yes" or "no".
524 case "$val" in 526 case "$val" in
525 y | ye | yes ) val=yes ;; 527 y | ye | yes ) val=yes ;;
526 n | no ) val=no ;; 528 n | no ) val=no ;;
1479 if test "$dynamic" = "yes" ; then 1481 if test "$dynamic" = "yes" ; then
1480 NON_GNU_CPP="/lib/cpp -D_XOPEN_SOURCE -D_SCO_ELF" ; 1482 NON_GNU_CPP="/lib/cpp -D_XOPEN_SOURCE -D_SCO_ELF" ;
1481 else 1483 else
1482 NON_GNU_CPP="/lib/cpp -D_XOPEN_SOURCE" ; 1484 NON_GNU_CPP="/lib/cpp -D_XOPEN_SOURCE" ;
1483 fi ;; 1485 fi ;;
1486 *-sysv5* ) opsys=sco7 ;;
1484 *-386bsd* ) opsys=386bsd ;; 1487 *-386bsd* ) opsys=386bsd ;;
1485 *-freebsd* ) opsys=freebsd ;; 1488 *-freebsd* ) opsys=freebsd ;;
1486 *-nextstep* ) opsys=nextstep ;; 1489 *-nextstep* ) opsys=nextstep ;;
1487 *-pc-cygwin* ) opsys=cygwin32 ;; 1490 *-pc-cygwin* ) opsys=cygwin32 ;;
1488 *-pc-mingw* ) opsys=mingw32 ; 1491 *-pc-mingw* ) opsys=mingw32 ;
2481 && XE_ADD_OBJS(menubar-msw.o) 2484 && XE_ADD_OBJS(menubar-msw.o)
2482 test "$with_toolbars" != "no" && with_toolbars=msw \ 2485 test "$with_toolbars" != "no" && with_toolbars=msw \
2483 && XE_ADD_OBJS(toolbar-msw.o) 2486 && XE_ADD_OBJS(toolbar-msw.o)
2484 test "$with_dialogs" != "no" && with_dialogs=msw \ 2487 test "$with_dialogs" != "no" && with_dialogs=msw \
2485 && XE_ADD_OBJS(dialog-msw.o) 2488 && XE_ADD_OBJS(dialog-msw.o)
2489 test "$with_widgets" != "no" && with_widgets=msw
2486 else 2490 else
2487 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-msw.o) 2491 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-msw.o)
2488 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-msw.o) 2492 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-msw.o)
2489 test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar-msw.o) 2493 test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar-msw.o)
2490 test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog-msw.o) 2494 test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog-msw.o)
2678 test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) } 2682 test -z "$with_ldap" && { AC_CHECK_HEADER(ldap.h, ,with_ldap=no) }
2679 test -z "$with_ldap" && { AC_CHECK_HEADER(lber.h, ,with_ldap=no) } 2683 test -z "$with_ldap" && { AC_CHECK_HEADER(lber.h, ,with_ldap=no) }
2680 if test "$with_ldap" != "no"; then 2684 if test "$with_ldap" != "no"; then
2681 AC_CHECK_LIB(ldap, ldap_search, with_ldap_nolber=yes, with_ldap_nolber=no) 2685 AC_CHECK_LIB(ldap, ldap_search, with_ldap_nolber=yes, with_ldap_nolber=no)
2682 test "$with_ldap_nolber" = "no" && { AC_CHECK_LIB(ldap, ldap_open, with_ldap_lber=yes, with_ldap_lber=no, -llber) } 2686 test "$with_ldap_nolber" = "no" && { AC_CHECK_LIB(ldap, ldap_open, with_ldap_lber=yes, with_ldap_lber=no, -llber) }
2683 test -z "$with_ldap" -a \( "$with_ldap_lber" = "yes" -o "$with_ldap_nolber" = "yes" \) && with_ldap=yes 2687 test "$with_ldap_nolber" = "no" -a "$with_ldap_lber" = "no" && { AC_CHECK_LIB(ldap, ldap_open, with_ldap_krb=yes, with_ldap_krb=no, -llber -lkrb) }
2688 test "$with_ldap_nolber" = "no" -a "$with_ldap_lber" = "no" -a "$with_ldap_krb" = "no" && { AC_CHECK_LIB(ldap, ldap_open, with_ldap_krbdes=yes, with_ldap_krbdes=no, -llber -lkrb -ldes) }
2689 test -z "$with_ldap" -a \( "$with_ldap_lber" = "yes" -o "$with_ldap_nolber" = "yes" -o "$with_ldap_krb" = "yes" -o "$with_ldap_krbdes" = "yes" \) && with_ldap=yes
2684 fi 2690 fi
2685 if test "$with_ldap" = "yes"; then 2691 if test "$with_ldap" = "yes"; then
2686 AC_DEFINE(HAVE_LDAP) 2692 AC_DEFINE(HAVE_LDAP)
2687 XE_ADD_OBJS(eldap.o) 2693 XE_ADD_OBJS(eldap.o)
2688 if test "$with_ldap_nolber" = "yes" ; then 2694 if test "$with_ldap_nolber" = "yes" ; then
2689 XE_PREPEND(-lldap, LIBS) 2695 XE_PREPEND(-lldap, LIBS)
2690 else 2696 else
2697 if test "$with_ldap_krb" = "yes" ; then
2698 XE_PREPEND(-lkrb, LIBS)
2699 fi
2700 if test "$with_ldap_krbdes" = "yes" ; then
2701 XE_PREPEND(-ldes, LIBS)
2702 XE_PREPEND(-lkrb, LIBS)
2703 fi
2691 XE_PREPEND(-llber, LIBS) 2704 XE_PREPEND(-llber, LIBS)
2692 XE_PREPEND(-lldap, LIBS) 2705 XE_PREPEND(-lldap, LIBS)
2693 fi 2706 fi
2694 AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result) 2707 AC_CHECK_FUNCS(ldap_set_option ldap_get_lderrno ldap_result2error ldap_parse_result)
2695 fi 2708 fi
3274 return 1; 3287 return 1;
3275 }], have_mmap=yes, have_mmap=no) ;; 3288 }], have_mmap=yes, have_mmap=no) ;;
3276 esac 3289 esac
3277 AC_MSG_RESULT($have_mmap) 3290 AC_MSG_RESULT($have_mmap)
3278 test "$have_mmap" = "yes" && AC_DEFINE(HAVE_MMAP) 3291 test "$have_mmap" = "yes" && AC_DEFINE(HAVE_MMAP)
3279 AC_FUNC_MMAP
3280 3292
3281 dnl rel_alloc requires either GNU malloc or system malloc with mmap 3293 dnl rel_alloc requires either GNU malloc or system malloc with mmap
3282 dnl We only turn rel_alloc on by default if mmap is available. 3294 dnl We only turn rel_alloc on by default if mmap is available.
3283 test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && rel_alloc=no 3295 test "$GNU_MALLOC" != "yes" -a "$have_mmap" != "yes" && rel_alloc=no
3284 test "$rel_alloc" = "default" -a "$have_mmap" = "yes" && rel_alloc=yes 3296 test "$rel_alloc" = "default" -a "$have_mmap" = "yes" && rel_alloc=yes
3610 fi 3622 fi
3611 3623
3612 dnl autodetect dll support 3624 dnl autodetect dll support
3613 AC_CHECK_HEADERS(dlfcn.h, [have_dlfcn=yes 3625 AC_CHECK_HEADERS(dlfcn.h, [have_dlfcn=yes
3614 AC_DEFINE(HAVE_DLFCN_H)]) 3626 AC_DEFINE(HAVE_DLFCN_H)])
3615 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(dl, dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=dl; with_shlib=yes]) } 3627 test -z "$with_modules" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(dl, dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=dl; with_modules=yes]) }
3616 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(c, _dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=; with_shlib=yes]) } 3628 test -z "$with_modules" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(c, _dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=; with_modules=yes]) }
3617 test -z "$with_shlib" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(c, dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=; with_shlib=yes]) } 3629 test -z "$with_modules" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(c, dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=; with_modules=yes]) }
3618 test -z "$with_shlib" && { AC_CHECK_LIB(dld, shl_load, [ AC_DEFINE(HAVE_SHL_LOAD) DLL_LIB=dld; with_shlib=yes]) } 3630 test -z "$with_modules" && { AC_CHECK_LIB(dld, shl_load, [ AC_DEFINE(HAVE_SHL_LOAD) DLL_LIB=dld; with_modules=yes]) }
3619 test -z "$with_shlib" && { AC_CHECK_LIB(dld, dld_init, [ AC_DEFINE(HAVE_DLD_INIT) DLL_LIB=dld; with_shlib=yes]) } 3631 test -z "$with_modules" && { AC_CHECK_LIB(dld, dld_init, [ AC_DEFINE(HAVE_DLD_INIT) DLL_LIB=dld; with_modules=yes]) }
3620 if test "$with_shlib" = "yes"; then 3632 if test "$with_modules" = "yes"; then
3621 XE_SHLIB_STUFF 3633 XE_SHLIB_STUFF
3622 if test "$can_build_shared" = "yes"; then 3634 if test "$can_build_shared" = "yes"; then
3623 AC_DEFINE(HAVE_SHLIB) 3635 AC_DEFINE(HAVE_SHLIB)
3624 XE_ADD_OBJS(sysdll.o) 3636 XE_ADD_OBJS(sysdll.o)
3625 XE_ADD_OBJS(emodules.o) 3637 XE_ADD_OBJS(emodules.o)
3626 XE_APPEND(src, INSTALL_ARCH_DEP_SUBDIR) 3638 XE_APPEND(src, INSTALL_ARCH_DEP_SUBDIR)
3627 test ! -z "$DLL_LIB" && XE_PREPEND(-l${DLL_LIB}, LIBS) 3639 test ! -z "$DLL_LIB" && XE_PREPEND(-l${DLL_LIB}, LIBS)
3628 AC_CHECK_FUNCS(dlerror _dlerror) 3640 AC_CHECK_FUNCS(dlerror _dlerror)
3629 else 3641 else
3630 AC_MSG_WARN(disabling shared library support) 3642 AC_MSG_WARN(disabling shared library support)
3631 with_shlib=no 3643 with_modules=no
3632 fi 3644 fi
3633 fi 3645 fi
3634 3646
3635 dnl Unfortunately, just because we can link doesn't mean we can run. 3647 dnl Unfortunately, just because we can link doesn't mean we can run.
3636 dnl One of the above link tests may have succeeded but caused resulting 3648 dnl One of the above link tests may have succeeded but caused resulting
3743 3755
3744 AC_SUBST(PROGNAME) 3756 AC_SUBST(PROGNAME)
3745 AC_SUBST(version) 3757 AC_SUBST(version)
3746 AC_SUBST(configuration) 3758 AC_SUBST(configuration)
3747 AC_SUBST(canonical) 3759 AC_SUBST(canonical)
3760 AC_SUBST(inststaticdir)
3761 AC_SUBST(instvardir)
3748 AC_SUBST(srcdir) 3762 AC_SUBST(srcdir)
3749 AC_SUBST(bindir) 3763 AC_SUBST(bindir)
3750 AC_SUBST(datadir) 3764 AC_SUBST(datadir)
3751 AC_SUBST(pkgdir) 3765 AC_SUBST(pkgdir)
3752 AC_SUBST(statedir) 3766 AC_SUBST(statedir)
4123 lucid ) echo " Using Lucid scrollbars." ;; 4137 lucid ) echo " Using Lucid scrollbars." ;;
4124 motif ) echo " Using Motif scrollbars." ;; 4138 motif ) echo " Using Motif scrollbars." ;;
4125 athena ) echo " Using Athena scrollbars." ;; 4139 athena ) echo " Using Athena scrollbars." ;;
4126 athena3d ) echo " Using Athena-3d scrollbars." ;; 4140 athena3d ) echo " Using Athena-3d scrollbars." ;;
4127 esac 4141 esac
4142 case "$with_widgets" in
4143 motif ) echo " Using Motif native widgets." ;;
4144 esac
4128 case "$with_dialogs" in 4145 case "$with_dialogs" in
4129 motif ) 4146 motif )
4130 echo " Using Motif dialog boxes." 4147 echo " Using Motif dialog boxes."
4131 if test "$unexec" = "unexaix.o"; then if test "`uname -v`" = 4 -a "`uname -r`" -ge 3; then 4148 if test "$unexec" = "unexaix.o"; then if test "`uname -v`" = 4 -a "`uname -r`" -ge 3; then
4132 echo " *WARNING* The Motif dialog boxes cause problems on AIX 4.3 and higher." 4149 echo " *WARNING* The Motif dialog boxes cause problems on AIX 4.3 and higher."
4136 fi; fi 4153 fi; fi
4137 ;; 4154 ;;
4138 athena ) echo " Using Athena dialog boxes." ;; 4155 athena ) echo " Using Athena dialog boxes." ;;
4139 athena3d ) echo " Using Athena-3d dialog boxes." ;; 4156 athena3d ) echo " Using Athena-3d dialog boxes." ;;
4140 esac 4157 esac
4141 test "$with_shlib" = "yes" && echo " Compiling in DLL support." 4158 test "$with_modules" = "yes" && echo " Compiling in DSO module support."
4142 test "$with_clash_detection" = yes && \ 4159 test "$with_clash_detection" = yes && \
4143 echo " Clash detection will use \"$lockdir\" for locking files." 4160 echo " Clash detection will use \"$lockdir\" for locking files."
4144 echo " movemail will use \"$mail_locking\" for locking mail spool files." 4161 echo " movemail will use \"$mail_locking\" for locking mail spool files."
4145 test "$with_pop" = yes && echo " Using POP for mail access." 4162 test "$with_pop" = yes && echo " Using POP for mail access."
4146 test "$with_kerberos" = yes && echo " Using Kerberos for POP authentication." 4163 test "$with_kerberos" = yes && echo " Using Kerberos for POP authentication."
4179 test "$file" = src/Makefile.in && \ 4196 test "$file" = src/Makefile.in && \
4180 file="src/Makefile.in:src/Makefile.in.in:src/depend" 4197 file="src/Makefile.in:src/Makefile.in.in:src/depend"
4181 ac_output_files="${ac_output_files+$ac_output_files }$file" 4198 ac_output_files="${ac_output_files+$ac_output_files }$file"
4182 done 4199 done
4183 ac_output_files="$ac_output_files src/paths.h lib-src/config.values" 4200 ac_output_files="$ac_output_files src/paths.h lib-src/config.values"
4184 if test "$with_shlib" = "yes"; then 4201 if test "$with_modules" = "yes"; then
4185 ac_output_files="$ac_output_files lib-src/ellcc.h" 4202 ac_output_files="$ac_output_files lib-src/ellcc.h"
4186 fi 4203 fi
4187 4204
4188 AC_OUTPUT($ac_output_files, 4205 AC_OUTPUT($ac_output_files,
4189 [for dir in . $MAKE_SUBDIR; do 4206 [for dir in . $MAKE_SUBDIR; do