Mercurial > hg > xemacs-beta

comparison configure.ac @ 5923:61d7d7bcbe76 cygwin

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merged heads after pull -u
author Henry Thompson <ht@markup.co.uk>
date Thu, 05 Feb 2015 17:19:05 +0000
parents 83e5c3cd6be6 0f2338afbabf
children
comparison
equal deleted inserted replaced
5921:68639fb08af8 5923:61d7d7bcbe76
915 AS_HELP_STRING([--with-dnet],[Compile with support for DECnet.]), 915 AS_HELP_STRING([--with-dnet],[Compile with support for DECnet.]),
916 [], []) 916 [], [])
917 XE_MERGED_ARG([ipv6-cname], 917 XE_MERGED_ARG([ipv6-cname],
918 AS_HELP_STRING([--with-ipv6-cname],[Try IPv6 information first when canonicalizing host names. This option has no effect unless system supports getaddrinfo(3) and getnameinfo(3).]), 918 AS_HELP_STRING([--with-ipv6-cname],[Try IPv6 information first when canonicalizing host names. This option has no effect unless system supports getaddrinfo(3) and getnameinfo(3).]),
919 [], [with_ipv6_cname="no"]) 919 [], [with_ipv6_cname="no"])
920 XE_MERGED_ARG([tls],
921 AS_HELP_STRING([--with-tls=TYPE],[Support TLS connections. TYPE must be one of "nss", "gnutls", and "openssl". If TYPE is omitted or "yes", support is determined automatically.]),
922 [], [])
920 dnl 923 dnl
921 XE_HELP_SUBSECTION([Memory allocation options]) 924 XE_HELP_SUBSECTION([Memory allocation options])
922 XE_MERGED_ARG([rel-alloc], 925 XE_MERGED_ARG([rel-alloc],
923 AS_HELP_STRING([--with-rel-alloc],[Enable the relocating allocator.]), 926 AS_HELP_STRING([--with-rel-alloc],[Enable the relocating allocator.]),
924 [], [with_rel_alloc='default']) 927 [], [with_rel_alloc='default'])
2824 fi 2827 fi
2825 2828
2826 dnl Disable ASLR on systems where it breaks pdump. 2829 dnl Disable ASLR on systems where it breaks pdump.
2827 AC_MSG_CHECKING([whether ASLR needs to be disabled]) 2830 AC_MSG_CHECKING([whether ASLR needs to be disabled])
2828 case `uname -s`:`uname -r` in 2831 case `uname -s`:`uname -r` in
2829 dnl Mac OS X 10.7 Lion, 10.8 Mountain Lion, 10.9 Mavericks 2832 dnl Mac OS X 10.7 Lion, 10.8 Mountain Lion, 10.9 Mavericks, 10.10 Yosemite
2830 Darwin:1[[123]].*) 2833 Darwin:1[[1234]].*)
2831 AC_MSG_RESULT(yes) 2834 AC_MSG_RESULT(yes)
2832 XE_APPEND([-Wl,-no_pie], LDFLAGS) 2835 XE_APPEND([-Wl,-no_pie], LDFLAGS)
2833 ;; 2836 ;;
2834 *) AC_MSG_RESULT(no) ;; 2837 *) AC_MSG_RESULT(no) ;;
2835 esac 2838 esac
4057 fi 4060 fi
4058 4061
4059 dnl Do we actually have a usable Athena widget set? Please? 4062 dnl Do we actually have a usable Athena widget set? Please?
4060 if test -n "$athena_lib" -a -n "$athena_h_path"; then 4063 if test -n "$athena_lib" -a -n "$athena_h_path"; then
4061 have_xaw=yes 4064 have_xaw=yes
4065 have_athena_i18n=unset
4066 dnl X.org at some point added .international to SimplePart, protected
4067 dnl by #ifdef XAW_INTERNATIONALIZATION in Xaw3d (only?). Unfortunately,
4068 dnl the distributed headers for Xaw3d don't set this to correspond to
4069 dnl the distributed library. (pkg-config does, if present.)
4070 if test "$athena_variant" = "Xaw3d"; then
4071 save_libs_x=$libs_x
4072 XE_PREPEND(-lXaw3d, libs_x)
4073 dnl The test below was provided by Ralf Soergel.
4074 AC_MSG_CHECKING([for "international" resource in Xaw3d SimpleWidget])
4075 AC_RUN_IFELSE(
4076 [AC_LANG_PROGRAM(
4077 [#include <stdlib.h>
4078 #include <string.h>
4079 #undef XAW_INTERNATIONALIZATION
4080 #include <$athena_h_path/Simple.h>
4081 ],
4082 [[int i = simpleWidgetClass->core_class.num_resources;
4083 while (i-- > 0)
4084 if (!strcmp(simpleWidgetClass->core_class.resources[i].resource_name,
4085 "international"))
4086 exit(0);
4087 exit(253);
4088 ]])],
4089 [have_athena_i18n=yes],
4090 [have_athena_i18n=no])
4091 libs_x=$save_libs_x
4092 AC_MSG_RESULT([$have_athena_i18n])
4093 fi
4062 else 4094 else
4063 have_xaw=no 4095 have_xaw=no
4064 fi 4096 fi
4065 4097
4066 else 4098 else
4189 AC_DEFINE_UNQUOTED(ATHENA_XawInit_h_,"$athena_h_path/XawInit.h") 4221 AC_DEFINE_UNQUOTED(ATHENA_XawInit_h_,"$athena_h_path/XawInit.h")
4190 4222
4191 AC_DEFINE(LWLIB_USES_ATHENA) 4223 AC_DEFINE(LWLIB_USES_ATHENA)
4192 AC_DEFINE(NEED_ATHENA) 4224 AC_DEFINE(NEED_ATHENA)
4193 need_athena="yes" 4225 need_athena="yes"
4194
4195 if test "$athena_3d" = "yes"; then 4226 if test "$athena_3d" = "yes"; then
4196 AC_DEFINE(HAVE_ATHENA_3D) 4227 AC_DEFINE(HAVE_ATHENA_3D)
4228 if test "$have_athena_i18n" = "yes"; then
4229 AC_DEFINE(HAVE_ATHENA_I18N)
4230 fi
4197 fi 4231 fi
4198 ;; 4232 ;;
4199 esac 4233 esac
4200 4234
4201 case "$all_widgets" in *motif* ) 4235 case "$all_widgets" in *motif* )
5335 [AC_DEFINE(HAVE_MP_SET_MEMORY_FUNCTIONS)])]) 5369 [AC_DEFINE(HAVE_MP_SET_MEMORY_FUNCTIONS)])])
5336 AC_DEFINE(WITH_NUMBER_TYPES) 5370 AC_DEFINE(WITH_NUMBER_TYPES)
5337 AC_DEFINE(WITH_MP) 5371 AC_DEFINE(WITH_MP)
5338 fi 5372 fi
5339 5373
5374 dnl TLS support
5375 if test "$with_tls" = "gnutls"; then
5376 AC_CHECK_HEADER([gnutls/gnutls.h],
5377 [AC_CHECK_LIB(gnutls, gnutls_global_init, [with_tls=gnutls],
5378 [XE_DIE("Required gnutls support cannot be provided.")])],
5379 [XE_DIE("Required gnutls support cannot be provided.")])
5380 elif test "$with_tls" = "nss"; then
5381 AC_CHECK_HEADER([nss.h],
5382 [AC_CHECK_LIB(nss3, NSS_InitContext, [with_tls=nss],
5383 [XE_DIE("Required NSS support cannot be provided.")])],
5384 [XE_DIE("Required NSS support cannot be provided.")])
5385 elif test "$with_tls" = "openssl"; then
5386 AC_CHECK_HEADER([openssl/ssl.h],
5387 [AC_CHECK_LIB(ssl, SSL_library_init, [with_tls=openssl],
5388 [XE_DIE("Required openssl support cannot be provided.")])],
5389 [XE_DIE("Required openssl support cannot be provided.")])
5390 fi
5391 dnl Autodetection
5392 if test "$with_tls" = "yes"; then
5393 AC_CHECK_HEADER([gnutls/gnutls.h],
5394 [AC_CHECK_LIB(gnutls, gnutls_global_init, [with_tls=gnutls])])
5395 fi
5396 if test "$with_tls" = "yes"; then
5397 AC_CHECK_HEADER([nss.h],
5398 [AC_CHECK_LIB(nss3, NSS_InitContext, [with_tls=nss])])
5399 fi
5400 if test "$with_tls" = "yes"; then
5401 AC_CHECK_HEADER([openssl/ssl.h],
5402 [AC_CHECK_LIB(ssl, SSL_library_init, [with_tls=openssl], [with_tls=no])])
5403 fi
5404 if test "$with_tls" != "no"; then
5405 AC_DEFINE(WITH_TLS)
5406 if test "$with_tls" = "gnutls"; then
5407 AC_DEFINE(HAVE_GNUTLS)
5408 gnutls_cflags=`pkg-config --cflags gnutls`
5409 if test "$?" = 0; then
5410 XE_PREPEND("$gnutls_cflags", CPPFLAGS)
5411 fi
5412 gnutls_libs=`pkg-config --libs gnutls`
5413 if test "$?" = 0; then
5414 XE_APPEND("$gnutls_libs", LIBS)
5415 fi
5416 AC_CHECK_FUNC(gnutls_certificate_verification_status_print,
5417 [AC_DEFINE(HAVE_GNUTLS_CERTIFICATE_VERIFICATION_STATUS_PRINT)])
5418 AC_CHECK_FUNC(gnutls_certificate_verify_peers3,
5419 [AC_DEFINE(HAVE_GNUTLS_CERTIFICATE_VERIFY_PEERS3)])
5420 elif test "$with_tls" = "nss"; then
5421 AC_DEFINE(HAVE_NSS)
5422 nss_cflags=`pkg-config --cflags nss`
5423 if test "$?" = 0; then
5424 XE_PREPEND("$nss_cflags", CPPFLAGS)
5425 fi
5426 nss_libs=`pkg-config --libs nss`
5427 if test "$?" = 0; then
5428 XE_APPEND("$nss_libs", LIBS)
5429 fi
5430 else
5431 AC_DEFINE(HAVE_OPENSSL)
5432 openssl_cflags=`pkg-config --cflags openssl`
5433 if test "$?" = 0; then
5434 XE_PREPEND("$openssl_cflags", CPPFLAGS)
5435 fi
5436 openssl_libs=`pkg-config --libs openssl`
5437 if test "$?" = 0; then
5438 XE_APPEND("$openssl_libs", LIBS)
5439 fi
5440 AC_CHECK_FUNC(X509_check_host, [AC_DEFINE(HAVE_X509_CHECK_HOST)])
5441 fi
5442 fi
5443
5340 dnl Unfortunately, just because we can link doesn't mean we can run. 5444 dnl Unfortunately, just because we can link doesn't mean we can run.
5341 dnl One of the above link tests may have succeeded but caused resulting 5445 dnl One of the above link tests may have succeeded but caused resulting
5342 dnl executables to fail to run. Also any tests using AC_RUN_IFELSE will 5446 dnl executables to fail to run. Also any tests using AC_RUN_IFELSE will
5343 dnl have reported incorrect results. 5447 dnl have reported incorrect results.
5344 AC_RUN_IFELSE([AC_LANG_SOURCE([int main(int c,char **v){return 0;}])],[:],[ 5448 AC_RUN_IFELSE([AC_LANG_SOURCE([int main(int c,char **v){return 0;}])],[:],[
5942 test "$with_database_gdbm" = yes && echo " Compiling in support for GNU DBM." 6046 test "$with_database_gdbm" = yes && echo " Compiling in support for GNU DBM."
5943 test "$with_ldap" = yes && echo " Compiling in support for LDAP." 6047 test "$with_ldap" = yes && echo " Compiling in support for LDAP."
5944 if test "$with_postgresql" = yes; then 6048 if test "$with_postgresql" = yes; then
5945 echo " Compiling in support for PostgreSQL." 6049 echo " Compiling in support for PostgreSQL."
5946 echo " - Using PostgreSQL header file: $libpq_fe_h_file" 6050 echo " - Using PostgreSQL header file: $libpq_fe_h_file"
5947 test "$with_postgresqlv7" = yes && echo " - Using PostgreSQL V7 bindings." 6051 test "$with_postgresqlv7" = yes && echo " - Using PostgreSQL V7+ bindings."
5948 fi 6052 fi
5949 6053
5950 echo " 6054 echo "
5951 Internationalization:" 6055 Internationalization:"
5952 test "$with_mule" = yes && echo " Compiling in support for Mule (multi-lingual Emacs)." 6056 test "$with_mule" = yes && echo " Compiling in support for Mule (multi-lingual Emacs)."
5966 test "$with_kerberos" = yes && echo " Compiling in support for Kerberos POP authentication." 6070 test "$with_kerberos" = yes && echo " Compiling in support for Kerberos POP authentication."
5967 test "$with_hesiod" = yes && echo " Compiling in support for Hesiod POP server access." 6071 test "$with_hesiod" = yes && echo " Compiling in support for Hesiod POP server access."
5968 test -n "$with_mail_locking" && echo " Compiling in support for \"$with_mail_locking\" mail spool file locking method." 6072 test -n "$with_mail_locking" && echo " Compiling in support for \"$with_mail_locking\" mail spool file locking method."
5969 6073
5970 echo " 6074 echo "
5971 Other Features:" 6075 Network:"
5972 test "$with_ipv6_cname" = no && echo " Inhibiting IPv6 canonicalization at startup." 6076 test "$with_ipv6_cname" = no && echo " Inhibiting IPv6 canonicalization at startup."
5973 test "$with_tooltalk" = yes && echo " Compiling in support for ToolTalk." 6077 test "$with_tooltalk" = yes && echo " Compiling in support for ToolTalk."
5974 test "$with_workshop" = yes && echo " Compiling in support for Sun WorkShop." 6078 test "$with_workshop" = yes && echo " Compiling in support for Sun WorkShop."
5975 test "$with_socks" = yes && echo " Compiling in support for SOCKS." 6079 test "$with_socks" = yes && echo " Compiling in support for SOCKS."
5976 test "$with_dnet" = yes && echo " Compiling in support for DNET." 6080 test "$with_dnet" = yes && echo " Compiling in support for DNET."
6081 test "$with_tls" = nss && echo " Compiling in support for TLS with NSS."
6082 test "$with_tls" = gnutls && echo " Compiling in support for TLS with gnutls."
6083 test "$with_tls" = openssl && echo " Compiling in support for TLS with OpenSSL."
6084
6085 echo "
6086 Other Features:"
5977 test "$with_modules" = "yes" && echo " Compiling in support for dynamic shared object modules." 6087 test "$with_modules" = "yes" && echo " Compiling in support for dynamic shared object modules."
5978 test "$with_bignum" = "gmp" && echo " Compiling in support for more number types using the GNU MP library." 6088 test "$with_bignum" = "gmp" && echo " Compiling in support for more number types using the GNU MP library."
5979 test "$with_bignum" = "mpir" && echo " Compiling in support for more number types using the MPIR library." 6089 test "$with_bignum" = "mpir" && echo " Compiling in support for more number types using the MPIR library."
5980 test "$with_bignum" = "mp" && echo " Compiling in support for more number types using the BSD MP library." 6090 test "$with_bignum" = "mp" && echo " Compiling in support for more number types using the BSD MP library."
5981 if test "$with_union_type" = yes ; then 6091 if test "$with_union_type" = yes ; then