Mercurial > hg > xemacs-beta

comparison configure.in @ 430:a5df635868b2 r21-2-23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-23
author cvs
date Mon, 13 Aug 2007 11:29:08 +0200
parents 43177a4f3daf
children 3a7e78e1142d
comparison
equal deleted inserted replaced
429:8305706cbb93 430:a5df635868b2
2940 *athena*3d ) 2940 *athena*3d )
2941 AC_DEFINE(LWLIB_USES_ATHENA) 2941 AC_DEFINE(LWLIB_USES_ATHENA)
2942 AC_DEFINE(NEED_ATHENA) 2942 AC_DEFINE(NEED_ATHENA)
2943 XE_APPEND(lwlib-Xaw.o, lwlib_objs) 2943 XE_APPEND(lwlib-Xaw.o, lwlib_objs)
2944 if test "$have_xaw3d"; then 2944 if test "$have_xaw3d"; then
2945 XE_PREPEND(-lXaw3d, libs_x) 2945 XE_PREPEND(-lXaw3d, libs_x)
2946 else 2946 else
2947 XE_PREPEND(-lXaw, libs_x) 2947 XE_PREPEND(-lXaw, libs_x)
2948 fi ;; 2948 fi ;;
2949 *athena* ) 2949 *athena* )
2950 AC_DEFINE(LWLIB_USES_ATHENA) 2950 AC_DEFINE(LWLIB_USES_ATHENA)
3685 AC_DEFINE(USAGE_TRACKING) 3685 AC_DEFINE(USAGE_TRACKING)
3686 XE_PREPEND(-Bstatic -lut -Bdynamic, LIBS) 3686 XE_PREPEND(-Bstatic -lut -Bdynamic, LIBS)
3687 fi 3687 fi
3688 3688
3689 dnl autodetect dll support 3689 dnl autodetect dll support
3690 AC_CHECK_HEADERS(dlfcn.h, [have_dlfcn=yes 3690 if test "$with_modules" != "no"; then
3691 AC_DEFINE(HAVE_DLFCN_H)]) 3691 AC_CHECKING(for module support)
3692 test -z "$with_modules" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(dl, dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=dl; with_modules=yes]) } 3692
3693 test -z "$with_modules" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(c, _dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=; with_modules=yes]) } 3693 dnl Find headers and libraries
3694 test -z "$with_modules" && test ! -z "$have_dlfcn" && { AC_CHECK_LIB(c, dlopen, [ AC_DEFINE(HAVE_DLOPEN) DLL_LIB=; with_modules=yes]) } 3694 AC_CHECK_HEADER(dlfcn.h, [
3695 test -z "$with_modules" && { AC_CHECK_LIB(dld, shl_load, [ AC_DEFINE(HAVE_SHL_LOAD) DLL_LIB=dld; with_modules=yes]) } 3695 AC_CHECK_LIB(dl, dlopen, [ have_dl=yes libdl=dl], [
3696 test -z "$with_modules" && { AC_CHECK_LIB(dld, dld_init, [ AC_DEFINE(HAVE_DLD_INIT) DLL_LIB=dld; with_modules=yes]) } 3696 AC_CHECK_LIB(c, dlopen, [ have_dl=yes ])])])
3697 if test "$with_modules" = "yes"; then 3697 if test -n "$have_dl"; then
3698 XE_SHLIB_STUFF 3698 AC_DEFINE(HAVE_DLOPEN)
3699 else
3700 AC_CHECK_LIB(dld, shl_load, [
3701 libdl=dld have_dl=yes;
3702 AC_DEFINE(HAVE_SHL_LOAD)], [
3703 AC_CHECK_LIB(dld, dld_init, [
3704 libdl=dld have_dl=yes;
3705 AC_DEFINE(HAVE_DLD_INIT)])])
3706 fi
3707
3708 if test -n "$have_dl"; then
3709 dnl XE_SHLIB_STUFF (in aclocal.m4) defines $can_build_shared
3710 XE_SHLIB_STUFF
3711 fi
3712
3699 if test "$can_build_shared" = "yes"; then 3713 if test "$can_build_shared" = "yes"; then
3700 AC_DEFINE(HAVE_SHLIB) 3714 AC_DEFINE(HAVE_SHLIB)
3701 XE_ADD_OBJS(sysdll.o) 3715 XE_ADD_OBJS(sysdll.o emodules.o)
3702 XE_ADD_OBJS(emodules.o)
3703 XE_APPEND(src, INSTALL_ARCH_DEP_SUBDIR) 3716 XE_APPEND(src, INSTALL_ARCH_DEP_SUBDIR)
3704 test ! -z "$DLL_LIB" && XE_PREPEND(-l${DLL_LIB}, LIBS) 3717 test -n "$libdl" && XE_PREPEND(-l${libdl}, LIBS)
3705 AC_CHECK_FUNCS(dlerror _dlerror) 3718 AC_CHECK_FUNCS(dlerror _dlerror)
3719 with_modules=yes
3706 else 3720 else
3707 AC_MSG_WARN(disabling shared library support) 3721 if test "$with_modules" = "yes"; then
3722 XE_DIE("Required module support cannot be provided.")
3723 else
3724 AC_MSG_WARN("Module support cannot be provided.")
3725 fi
3708 with_modules=no 3726 with_modules=no
3709 fi 3727 fi
3710 fi 3728 fi
3711 3729
3712 dnl Unfortunately, just because we can link doesn't mean we can run. 3730 dnl Unfortunately, just because we can link doesn't mean we can run.
4085 xemacs_betaname=".${emacs_beta_version}" 4103 xemacs_betaname=".${emacs_beta_version}"
4086 else 4104 else
4087 xemacs_betaname="-b${emacs_beta_version}" 4105 xemacs_betaname="-b${emacs_beta_version}"
4088 fi 4106 fi
4089 else 4107 else
4090 xemacs_betaname="" 4108 xemacs_betaname=""
4091 fi 4109 fi
4092 4110
4093 dnl Start stdout redirection to '| tee -a Installation' 4111 dnl Start stdout redirection to '| tee -a Installation'
4094 ( 4112 (
4095 echo " 4113 echo "
4156 test "$with_gif" = yes && echo " Compiling in support for (builtin) GIF image handling." 4174 test "$with_gif" = yes && echo " Compiling in support for (builtin) GIF image handling."
4157 test "$with_jpeg" = yes && echo " Compiling in support for JPEG image handling." 4175 test "$with_jpeg" = yes && echo " Compiling in support for JPEG image handling."
4158 test "$with_tiff" = yes && echo " Compiling in support for TIFF image handling." 4176 test "$with_tiff" = yes && echo " Compiling in support for TIFF image handling."
4159 test "$with_xface" = yes && echo " Compiling in support for X-Face message headers." 4177 test "$with_xface" = yes && echo " Compiling in support for X-Face message headers."
4160 test "$with_native_sound" = yes && echo " Compiling in native sound support." 4178 test "$with_native_sound" = yes && echo " Compiling in native sound support."
4161 test "$with_nas_sound" = yes && echo " Compiling in network sound (NAS) support." 4179 test "$with_nas_sound" = yes && echo " Compiling in network sound (NAS) support."
4162 test "$old_nas" = yes && echo " nas library lacks error trapping, will play synchronously." 4180 test "$old_nas" = yes && echo " nas library lacks error trapping, will play synchronously."
4163 test "$with_esd" = yes && echo " Compiling in support for Enlightened Sound Daemon." 4181 test "$with_esd" = yes && echo " Compiling in support for Enlightened Sound Daemon."
4164 4182
4165 test "$with_database_berkdb" = yes && echo " Compiling in support for Berkeley DB." 4183 test "$with_database_berkdb" = yes && echo " Compiling in support for Berkeley DB."
4166 test "$with_database_dbm" = yes && echo " Compiling in support for DBM." 4184 test "$with_database_dbm" = yes && echo " Compiling in support for DBM."
4223 ;; 4241 ;;
4224 athena ) echo " Using Athena dialog boxes." ;; 4242 athena ) echo " Using Athena dialog boxes." ;;
4225 athena3d ) echo " Using Athena-3d dialog boxes." ;; 4243 athena3d ) echo " Using Athena-3d dialog boxes." ;;
4226 msw ) echo " Using MS-Windows dialog boxes." ;; 4244 msw ) echo " Using MS-Windows dialog boxes." ;;
4227 esac 4245 esac
4228 test "$with_modules" = "yes" && echo " Compiling in DSO module support." 4246 test "$with_modules" = "yes" && echo " Compiling in dynamic shared object module support."
4229 test "$with_clash_detection" = yes && \ 4247 test "$with_clash_detection" = yes && \
4230 echo " Clash detection will use \"$lockdir\" for locking files." 4248 echo " Clash detection will use \"$lockdir\" for locking files."
4231 echo " movemail will use \"$mail_locking\" for locking mail spool files." 4249 echo " movemail will use \"$mail_locking\" for locking mail spool files."
4232 test "$with_pop" = yes && echo " Using POP for mail access." 4250 test "$with_pop" = yes && echo " Using POP for mail access."
4233 test "$with_kerberos" = yes && echo " Using Kerberos for POP authentication." 4251 test "$with_kerberos" = yes && echo " Using Kerberos for POP authentication."
4264 dnl except ./Makefile from $srcdir/Makefile.in 4282 dnl except ./Makefile from $srcdir/Makefile.in
4265 4283
4266 for file in $internal_makefile_list; do 4284 for file in $internal_makefile_list; do
4267 test "$file" = src/Makefile.in && \ 4285 test "$file" = src/Makefile.in && \
4268 file="src/Makefile.in:src/Makefile.in.in:src/depend" 4286 file="src/Makefile.in:src/Makefile.in.in:src/depend"
4269 ac_output_files="${ac_output_files+$ac_output_files }$file" 4287 XE_APPEND($file, ac_output_files)
4270 done 4288 done
4271 ac_output_files="$ac_output_files src/paths.h lib-src/config.values" 4289 ac_output_files="$ac_output_files src/paths.h lib-src/config.values"
4272 if test "$with_modules" = "yes"; then 4290 test "$with_modules" = "yes" && XE_APPEND(lib-src/ellcc.h, ac_output_files)
4273 ac_output_files="$ac_output_files lib-src/ellcc.h"
4274 fi
4275 4291
4276 AC_OUTPUT($ac_output_files, 4292 AC_OUTPUT($ac_output_files,
4277 [for dir in . $MAKE_SUBDIR; do 4293 [for dir in . $MAKE_SUBDIR; do
4278 ( 4294 (
4279 cd $dir 4295 cd $dir