comparison configure.in @ 438:84b14dcb0985 r21-2-27

Import from CVS: tag r21-2-27
author cvs
date Mon, 13 Aug 2007 11:32:25 +0200
parents 9d177e8d4150
children 8de8e3f6228a
comparison
equal deleted inserted replaced
437:e2a4e8b94b82 438:84b14dcb0985
671 dnl Mail locking specification 671 dnl Mail locking specification
672 "mail_locking" ) 672 "mail_locking" )
673 case "$val" in 673 case "$val" in
674 lockf ) val=lockf ;; 674 lockf ) val=lockf ;;
675 flock ) val=flock ;; 675 flock ) val=flock ;;
676 file ) val=file ;; 676 file | dot ) val=file ;;
677 locking ) val=locking ;;
677 * ) USAGE_ERROR(["The \`--$optname' option must have one of these values: 678 * ) USAGE_ERROR(["The \`--$optname' option must have one of these values:
678 \`lockf', \`flock', or \`file'."]) ;; 679 \`lockf', \`flock', \`file', \`locking', or \`mmdf'."]) ;;
679 esac 680 esac
680 eval "$opt=\"$val\"" 681 eval "$opt=\"$val\""
681 ;; 682 ;;
682 683
683 dnl Has the user requested error-checking? 684 dnl Has the user requested error-checking?
904 dnl Make symlinks for etc, lisp, and info directories while the path 905 dnl Make symlinks for etc, lisp, and info directories while the path
905 dnl is still relative. We do not symlink lock because someone may 906 dnl is still relative. We do not symlink lock because someone may
906 dnl have stuck the source on a read-only partition. Instead we 907 dnl have stuck the source on a read-only partition. Instead we
907 dnl create it as an actual directory later on if it does not already 908 dnl create it as an actual directory later on if it does not already
908 dnl exist. 909 dnl exist.
909 for dir in lisp etc man info; do 910 for dir in lisp etc man info tests; do
910 if test ! -d "$dir" ; then 911 if test ! -d "$dir" ; then
911 echo Making symbolic link to "$srcdir/$dir" 912 echo Making symbolic link to "$srcdir/$dir"
912 ${LN_S} "$srcdir/$dir" "$dir" 913 ${LN_S} "$srcdir/$dir" "$dir"
913 fi 914 fi
914 done 915 done
1767 configure___ start_files=START_FILES 1768 configure___ start_files=START_FILES
1768 1769
1769 CPP_boolean_to_sh(ORDINARY_LINK, ordinary_link) 1770 CPP_boolean_to_sh(ORDINARY_LINK, ordinary_link)
1770 CPP_boolean_to_sh(SYSTEM_MALLOC, system_malloc) 1771 CPP_boolean_to_sh(SYSTEM_MALLOC, system_malloc)
1771 CPP_boolean_to_sh(TERMINFO, have_terminfo) 1772 CPP_boolean_to_sh(TERMINFO, have_terminfo)
1773 dnl The MAIL_USE_xxx variables come from the s&m headers
1772 CPP_boolean_to_sh(MAIL_USE_FLOCK, mail_use_flock) 1774 CPP_boolean_to_sh(MAIL_USE_FLOCK, mail_use_flock)
1773 CPP_boolean_to_sh(MAIL_USE_LOCKF, mail_use_lockf) 1775 CPP_boolean_to_sh(MAIL_USE_LOCKF, mail_use_lockf)
1776 CPP_boolean_to_sh(MAIL_USE_LOCKING, mail_use_locking)
1774 CPP_boolean_to_sh(HAVE_WIN32_PROCESSES, win32_processes) 1777 CPP_boolean_to_sh(HAVE_WIN32_PROCESSES, win32_processes)
1775 EOF 1778 EOF
1776 1779
1777 dnl The value of CPP is a quoted variable reference, so we need to do this 1780 dnl The value of CPP is a quoted variable reference, so we need to do this
1778 dnl to get its actual value... 1781 dnl to get its actual value...
1790 PRINT_VAR(libs_machine libs_system libs_termcap libs_standard 1793 PRINT_VAR(libs_machine libs_system libs_termcap libs_standard
1791 objects_machine objects_system c_switch_machine c_switch_system 1794 objects_machine objects_system c_switch_machine c_switch_system
1792 ld_switch_machine ld_switch_system unexec ld_switch_shared 1795 ld_switch_machine ld_switch_system unexec ld_switch_shared
1793 ld lib_gcc ld_text_start_addr start_files ordinary_link 1796 ld lib_gcc ld_text_start_addr start_files ordinary_link
1794 have_terminfo mail_use_flock mail_use_lockf) && echo "" 1797 have_terminfo mail_use_flock mail_use_lockf) && echo ""
1798
1799 dnl Pick up mingw32 include path
1800 case "$opsys" in mingw*) mingw_include=`eval "gcc -print-file-name=libc.a"` ;
1801 mingw_include=`eval "dirname $mingw_include"` ;
1802 mingw_include="-I$mingw_include/../include/mingw32" ;
1803 XE_APPEND($mingw_include, c_switch_system) ;;
1804 esac
1795 1805
1796 dnl Non-ordinary link usually requires -lc 1806 dnl Non-ordinary link usually requires -lc
1797 test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc" 1807 test "$ordinary_link" = "no" -a -z "$libs_standard" && libs_standard="-lc"
1798 1808
1799 dnl Compiler-specific hacks 1809 dnl Compiler-specific hacks
2253 [return atanh(1.0) + asinh(1.0) + acosh(1.0); ], 2263 [return atanh(1.0) + asinh(1.0) + acosh(1.0); ],
2254 AC_DEFINE(HAVE_INVERSE_HYPERBOLIC)) 2264 AC_DEFINE(HAVE_INVERSE_HYPERBOLIC))
2255 2265
2256 dnl Determine type of mail locking from configure args and s&m headers 2266 dnl Determine type of mail locking from configure args and s&m headers
2257 AC_CHECKING(type of mail spool file locking) 2267 AC_CHECKING(type of mail spool file locking)
2268 AC_CHECK_FUNCS(lockf flock)
2269 dnl The mail_use_xxx variables are set according to the s&m headers.
2258 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock 2270 test -z "$mail_locking" -a "$mail_use_flock" = "yes" && mail_locking=flock
2259 test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf 2271 test -z "$mail_locking" -a "$mail_use_lockf" = "yes" && mail_locking=lockf
2260 if test "$mail_locking" = "lockf"; then AC_DEFINE(REAL_MAIL_USE_LOCKF) 2272 test -z "$mail_locking" -a "$mail_use_locking" = "yes" && mail_locking=locking
2261 elif test "$mail_locking" = "flock"; then AC_DEFINE(REAL_MAIL_USE_FLOCK) 2273 if test "$mail_locking" = "lockf"; then AC_DEFINE(MAIL_LOCK_LOCKF)
2262 else mail_locking="dot-locking" 2274 elif test "$mail_locking" = "flock"; then AC_DEFINE(MAIL_LOCK_FLOCK)
2263 fi 2275 elif test "$mail_locking" = "locking"; then AC_DEFINE(MAIL_LOCK_LOCKING)
2276 else mail_locking="dot-locking"; AC_DEFINE(MAIL_LOCK_DOT)
2277 fi
2278 test "$mail_locking" = "lockf" -a "$ac_cv_func_lockf" != "yes" && \
2279 XE_DIE("lockf mail locking requested but not available.")
2280 test "$mail_locking" = "flock" -a "$ac_cv_func_flock" != "yes" && \
2281 XE_DIE("flock mail locking requested but not available.")
2282 test "$mail_locking" = "locking" -a "$ac_cv_func_locking" != "yes" && \
2283 XE_DIE("locking mail locking requested but not available.")
2264 2284
2265 case "$opsys" in decosf*) 2285 case "$opsys" in decosf*)
2266 AC_CHECK_LIB(pthreads, cma_open) 2286 AC_CHECK_LIB(pthreads, cma_open)
2267 test "$ac_cv_lib_pthreads_cma_open" = "yes" && \ 2287 test "$ac_cv_lib_pthreads_cma_open" = "yes" && \
2268 c_switch_site="$c_switch_site -threads" ;; 2288 c_switch_site="$c_switch_site -threads" ;;
2897 2917
2898 AC_CHECKING(for the Athena widgets) 2918 AC_CHECKING(for the Athena widgets)
2899 2919
2900 dnl What in heck did the user actually want? 2920 dnl What in heck did the user actually want?
2901 case "$with_athena" in 2921 case "$with_athena" in
2902 dnl This is the default, old fashioned flat Athena. 2922 dnl This is the default, old fashioned flat Athena.
2903 "xaw" | "") athena_variant=Xaw athena_3d=no ;; 2923 "xaw" | "") athena_variant=Xaw athena_3d=no ;;
2904 "3d") athena_variant=Xaw3d athena_3d=yes ;; 2924 "3d") athena_variant=Xaw3d athena_3d=yes ;;
2905 "next") athena_variant=neXtaw athena_3d=yes ;; 2925 "next") athena_variant=neXtaw athena_3d=yes ;;
2906 "95") athena_variant=Xaw95 athena_3d=yes ;; 2926 "95") athena_variant=Xaw95 athena_3d=yes ;;
2907 "xpm") athena_variant=XawXpm athena_3d=yes ;; 2927 "xpm") athena_variant=XawXpm athena_3d=yes ;;
2908 *) XE_DIE("Unknown Athena widget set \`$with_athena'. This should not happen.") ;; 2928 *) XE_DIE("Unknown Athena widget set \`$with_athena'. This should not happen.") ;;
2909 esac 2929 esac
2910 2930
2911 dnl Search for the Athena library... 2931 dnl Search for the Athena library...
2912 if test "$athena_3d" = "no"; then 2932 if test "$athena_3d" = "no"; then
2913 AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb, 2933 AC_CHECK_LIB($athena_variant, XawScrollbarSetThumb,
2914 [ 2934 [
2915 dnl Must not be a 3d library... 2935 dnl Must not be a 3d library...
2916 AC_CHECK_LIB($athena_variant, threeDClassRec, 2936 AC_CHECK_LIB($athena_variant, threeDClassRec,
2917 AC_MSG_WARN("Could not find a non-3d Athena widget library."), 2937 AC_MSG_WARN("Could not find a non-3d Athena widget library."),
2918 athena_lib=$athena_variant) 2938 athena_lib=$athena_variant)
2919 ], 2939 ],
2920 AC_MSG_WARN("Could not find an Athena widget library.")) 2940 AC_MSG_WARN("Could not find an Athena widget library."))
2921 else 2941 else
2922 dnl The real configuration, need 3d library 2942 dnl The real configuration, need 3d library
2923 AC_CHECK_LIB($athena_variant, threeDClassRec, athena_lib=$athena_variant, 2943 AC_CHECK_LIB($athena_variant, threeDClassRec, athena_lib=$athena_variant,
2924 dnl OK, couldn't find it with a proper name, try the standard Athena lib 2944 dnl OK, couldn't find it with a proper name, try the standard Athena lib
2925 dnl If that is 3d, presume the user asked for what they have installed. 2945 dnl If that is 3d, presume the user asked for what they have installed.
2926 AC_CHECK_LIB(Xaw, threeDClassRec, 2946 AC_CHECK_LIB(Xaw, threeDClassRec,
2927 [ 2947 [
2928 athena_lib=Xaw; 2948 athena_lib=Xaw;
2929 AC_MSG_WARN("Assuming that libXaw is actually $athena_variant."); 2949 AC_MSG_WARN("Assuming that libXaw is actually $athena_variant.");
2930 ], 2950 ],
2931 AC_MSG_WARN("Could not find a 3d Athena widget library that looked like $athena_variant."))) 2951 AC_MSG_WARN("Could not find a 3d Athena widget library that looked like $athena_variant.")))
2932 fi 2952 fi
2933 2953
3241 dnl AIX needs the following library for use with Motif 3261 dnl AIX needs the following library for use with Motif
3242 AC_CHECK_LIB(i18n, layout_object_getvalue, [XE_PREPEND(-li18n, libs_x)]) 3262 AC_CHECK_LIB(i18n, layout_object_getvalue, [XE_PREPEND(-li18n, libs_x)])
3243 XE_COMPUTE_RUNPATH() 3263 XE_COMPUTE_RUNPATH()
3244 fi 3264 fi
3245 3265
3246 AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getpt getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strcasecmp strerror tzset ulimit usleep utimes waitpid vsnprintf) 3266 AC_CHECK_FUNCS(cbrt closedir dup2 eaccess fmod fpathconf frexp ftime gethostname getpagesize gettimeofday getcwd getpt getwd logb lrand48 matherr mkdir mktime perror poll random rename res_init rint rmdir select setitimer setpgid setlocale setsid sigblock sighold sigprocmask snprintf stpcpy strcasecmp strerror tzset ulimit usleep utimes waitpid vsnprintf fsync ftruncate umask)
3247 3267
3248 dnl realpath is buggy on linux, decosf and aix4 3268 dnl realpath is buggy on linux, decosf and aix4
3249 3269
3250 dnl The realpath() in linux libc (4.6.27) sometimes fails with ELOOP. 3270 dnl The realpath() in linux libc (4.6.27) sometimes fails with ELOOP.
3251 dnl The realpath in ELF linux libc's is O.K. 3271 dnl The realpath in ELF linux libc's is O.K.
3912 ld_switch_general ld_switch_window_system ld_switch_all 3932 ld_switch_general ld_switch_window_system ld_switch_all
3913 ld_libs_general ld_libs_window_system ld_libs_all) 3933 ld_libs_general ld_libs_window_system ld_libs_all)
3914 echo "" 3934 echo ""
3915 fi 3935 fi
3916 3936
3917 dnl Create some auxiliary files 3937 dnl ----------------------------------------------
3918 if test -f $srcdir/src/gdbinit -a ! -f src/gdbinit ; then 3938 dnl Create some auxiliary files for developers.
3919 echo "creating src/gdbinit"; echo "" 3939 dnl ----------------------------------------------
3920 echo "source $srcdir/src/gdbinit" > src/gdbinit 3940
3941 dnl Create a .gdbinit useful for debugging XEmacs
3942 if test -f "$srcdir/src/.gdbinit" -a ! -f "src/.gdbinit"; then
3943 test "$extra_verbose" = "yes" && echo "creating src/.gdbinit"
3944 echo "source $srcdir/src/.gdbinit" > "src/.gdbinit"
3945 fi
3946
3947 dnl Create a .dbxrc useful for debugging XEmacs
3948 if test -f "$srcdir/src/.dbxrc" -a ! -f "src/.dbxrc"; then
3949 test "$extra_verbose" = "yes" && echo "creating src/.dbxrc"
3950 echo ". $srcdir/src/.dbxrc" > "src/.dbxrc"
3951 fi
3952
3953 dnl Create a useful TAGS file
3954 if test -f "$srcdir/TAGS" -a ! -f "TAGS"; then
3955 test "$extra_verbose" = "yes" && echo "creating TAGS"
3956 echo "
3957 $srcdir/TAGS,include" > "TAGS"
3921 fi 3958 fi
3922 3959
3923 dnl Create top level .sbinit for Sun compilers 3960 dnl Create top level .sbinit for Sun compilers
3924 if test "$__SUNPRO_C" = "yes"; then 3961 if test "$__SUNPRO_C" = "yes"; then
3925 echo "creating .sbinit"; echo "" 3962 test "$extra_verbose" = "yes" && echo "creating .sbinit"
3926 ( echo "# For use with Sun WorkShop's Source browser." 3963 ( echo "# For use with Sun WorkShop's Source browser."
3927 echo "# See sbquery(1) and sbinit(4) for more information" 3964 echo "# See sbquery(1) and sbinit(4) for more information"
3928 for dir in $MAKE_SUBDIR; do echo "import $dir"; done 3965 for dir in $MAKE_SUBDIR; do echo "import $dir"; done
3929 ) > .sbinit 3966 ) > .sbinit
3930 fi 3967 fi
4239 echo " Additional prefixes: $site_prefixes" 4276 echo " Additional prefixes: $site_prefixes"
4240 fi 4277 fi
4241 if test -n "$runpath"; then 4278 if test -n "$runpath"; then
4242 echo " Runtime library search path: $runpath" 4279 echo " Runtime library search path: $runpath"
4243 fi 4280 fi
4281 if test "$have_xaw" = "yes"; then
4282 echo " Athena library to link: $athena_lib"
4283 echo " Athena header include path: $athena_h_path"
4284 fi
4244 test "$with_dnet" = yes && echo " Compiling in support for DNET." 4285 test "$with_dnet" = yes && echo " Compiling in support for DNET."
4245 test "$with_socks" = yes && echo " Compiling in support for SOCKS." 4286 test "$with_socks" = yes && echo " Compiling in support for SOCKS."
4246 test "$with_xauth" = yes && echo " Compiling in support for XAUTH." 4287 test "$with_xauth" = yes && echo " Compiling in support for XAUTH."
4247 if test "$with_xmu" != yes -a "$with_x11" = yes; then 4288 if test "$with_xmu" != yes -a "$with_x11" = yes; then
4248 echo " No Xmu; substituting equivalent routines." 4289 echo " No Xmu; substituting equivalent routines."
4322 esac 4363 esac
4323 case "$with_scrollbars" in 4364 case "$with_scrollbars" in
4324 lucid ) echo " Using Lucid scrollbars." ;; 4365 lucid ) echo " Using Lucid scrollbars." ;;
4325 motif ) echo " Using Motif scrollbars." ;; 4366 motif ) echo " Using Motif scrollbars." ;;
4326 athena ) echo " Using Athena scrollbars." ;; 4367 athena ) echo " Using Athena scrollbars." ;;
4327 athena3d ) echo " Using Athena-3d scrollbars." ;;
4328 msw ) echo " Using MS-Windows scrollbars." ;; 4368 msw ) echo " Using MS-Windows scrollbars." ;;
4329 esac 4369 esac
4330 case "$with_widgets" in 4370 case "$with_widgets" in
4331 motif ) echo " Using Motif native widgets." ;; 4371 motif ) echo " Using Motif native widgets." ;;
4332 athena ) echo " Using Athena native widgets." ;; 4372 athena ) echo " Using Athena native widgets." ;;
4333 athena3d ) echo " Using Athena-3d native widgets." ;;
4334 msw ) echo " Using MS-Windows native widgets." ;; 4373 msw ) echo " Using MS-Windows native widgets." ;;
4335 esac 4374 esac
4336 case "$with_dialogs" in 4375 case "$with_dialogs" in
4337 motif ) 4376 motif )
4338 echo " Using Motif dialog boxes." 4377 echo " Using Motif dialog boxes."
4342 echo " Install libXaw and re-run configure with --with-dialogs='athena'." 4381 echo " Install libXaw and re-run configure with --with-dialogs='athena'."
4343 echo " Read the PROBLEMS file for more information." 4382 echo " Read the PROBLEMS file for more information."
4344 fi; fi 4383 fi; fi
4345 ;; 4384 ;;
4346 athena ) echo " Using Athena dialog boxes." ;; 4385 athena ) echo " Using Athena dialog boxes." ;;
4347 athena3d ) echo " Using Athena-3d dialog boxes." ;;
4348 msw ) echo " Using MS-Windows dialog boxes." ;; 4386 msw ) echo " Using MS-Windows dialog boxes." ;;
4349 esac 4387 esac
4350 test "$with_modules" = "yes" && echo " Compiling in dynamic shared object module support." 4388 test "$with_modules" = "yes" && echo " Compiling in dynamic shared object module support."
4351 test "$with_clash_detection" = yes && \ 4389 test "$with_clash_detection" = yes && \
4352 echo " Clash detection will use \"$lockdir\" for locking files." 4390 echo " Clash detection will use \"$lockdir\" for locking files."