Mercurial > emacs

comparison configure.in @ 91085:880960b70474

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs--devo--0 Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-283
author Miles Bader <miles@gnu.org>
date Sun, 11 Nov 2007 00:56:44 +0000
parents 1251cabc40b7 a9c20d74abe4
children b02d8e52ce68
comparison
equal deleted inserted replaced
91084:a4347a111894 91085:880960b70474
2123 else 2123 else
2124 AC_MSG_RESULT(before 6) 2124 AC_MSG_RESULT(before 6)
2125 fi 2125 fi
2126 fi 2126 fi
2127 2127
2128 if test "${window_system}" = "x11"; then
2129 AC_MSG_CHECKING(X11 version 5)
2130 AC_CACHE_VAL(emacs_cv_x11_version_5,
2131 [AC_TRY_LINK([#include <X11/Xlib.h>],
2132 [#if XlibSpecificationRelease < 5
2133 fail;
2134 #endif
2135 ], emacs_cv_x11_version_5=yes, emacs_cv_x11_version_5=no)])
2136 if test $emacs_cv_x11_version_5 = yes; then
2137 AC_MSG_RESULT(5 or newer)
2138 HAVE_X11R5=yes
2139 AC_DEFINE(HAVE_X11R5, 1,
2140 [Define to 1 if you have the X11R5 or newer version of Xlib.])
2141 else
2142 HAVE_X11R5=no
2143 AC_MSG_RESULT(before 5)
2144 fi
2145 fi
2146 2128
2147 ### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified. 2129 ### Use -lrsvg-2 if available, unless `--with-rsvg=no' is specified.
2148 HAVE_RSVG=no 2130 HAVE_RSVG=no
2149 if test "${HAVE_X11}" = "yes" || test "${HAVE_CARBON}" = "yes"; then 2131 if test "${HAVE_X11}" = "yes" || test "${HAVE_CARBON}" = "yes"; then
2150 if test "${with_rsvg}" != "no"; then 2132 if test "${with_rsvg}" != "no"; then
2272 2254
2273 dnl Do not put whitespace before the #include statements below. 2255 dnl Do not put whitespace before the #include statements below.
2274 dnl Older compilers (eg sunos4 cc) choke on it. 2256 dnl Older compilers (eg sunos4 cc) choke on it.
2275 HAVE_XAW3D=no 2257 HAVE_XAW3D=no
2276 if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then 2258 if test x"${USE_X_TOOLKIT}" = xmaybe || test x"${USE_X_TOOLKIT}" = xLUCID; then
2277 if test x"${HAVE_X11R5}" != xyes; then 2259 if test "$with_xaw3d" != no; then
2278 USE_X_TOOLKIT=none 2260 AC_MSG_CHECKING(for xaw3d)
2279 else 2261 AC_CACHE_VAL(emacs_cv_xaw3d,
2280 if test "$with_xaw3d" != no; then 2262 [AC_TRY_LINK([
2281 AC_MSG_CHECKING(for xaw3d)
2282 AC_CACHE_VAL(emacs_cv_xaw3d,
2283 [AC_TRY_LINK([
2284 #include <X11/Intrinsic.h> 2263 #include <X11/Intrinsic.h>
2285 #include <X11/Xaw3d/Simple.h>], 2264 #include <X11/Xaw3d/Simple.h>],
2286 [], 2265 [],
2287 emacs_cv_xaw3d=yes, 2266 emacs_cv_xaw3d=yes,
2288 emacs_cv_xaw3d=no)]) 2267 emacs_cv_xaw3d=no)])
2289 else 2268 else
2290 emacs_cv_xaw3d=no 2269 emacs_cv_xaw3d=no
2291 fi 2270 fi
2292 if test $emacs_cv_xaw3d = yes; then 2271 if test $emacs_cv_xaw3d = yes; then
2272 AC_MSG_RESULT([yes; using Lucid toolkit])
2273 USE_X_TOOLKIT=LUCID
2274 HAVE_XAW3D=yes
2275 AC_DEFINE(HAVE_XAW3D, 1,
2276 [Define to 1 if you have the Xaw3d library (-lXaw3d).])
2277 else
2278 AC_MSG_RESULT(no)
2279 AC_MSG_CHECKING(for libXaw)
2280 AC_CACHE_VAL(emacs_cv_xaw,
2281 [AC_TRY_LINK([
2282 #include <X11/Intrinsic.h>
2283 #include <X11/Xaw/Simple.h>],
2284 [],
2285 emacs_cv_xaw=yes,
2286 emacs_cv_xaw=no)])
2287 if test $emacs_cv_xaw = yes; then
2293 AC_MSG_RESULT([yes; using Lucid toolkit]) 2288 AC_MSG_RESULT([yes; using Lucid toolkit])
2294 USE_X_TOOLKIT=LUCID 2289 USE_X_TOOLKIT=LUCID
2295 HAVE_XAW3D=yes 2290 elif test x"${USE_X_TOOLKIT}" = xLUCID; then
2296 AC_DEFINE(HAVE_XAW3D, 1, 2291 AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files])
2297 [Define to 1 if you have the Xaw3d library (-lXaw3d).])
2298 else 2292 else
2299 AC_MSG_RESULT(no) 2293 AC_MSG_RESULT([no; do not use toolkit by default])
2300 AC_MSG_CHECKING(for libXaw) 2294 USE_X_TOOLKIT=none
2301 AC_CACHE_VAL(emacs_cv_xaw,
2302 [AC_TRY_LINK([
2303 #include <X11/Intrinsic.h>
2304 #include <X11/Xaw/Simple.h>],
2305 [],
2306 emacs_cv_xaw=yes,
2307 emacs_cv_xaw=no)])
2308 if test $emacs_cv_xaw = yes; then
2309 AC_MSG_RESULT([yes; using Lucid toolkit])
2310 USE_X_TOOLKIT=LUCID
2311 elif test x"${USE_X_TOOLKIT}" = xLUCID; then
2312 AC_MSG_ERROR([Lucid toolkit requires X11/Xaw include files])
2313 else
2314 AC_MSG_RESULT([no; do not use toolkit by default])
2315 USE_X_TOOLKIT=none
2316 fi
2317 fi 2295 fi
2318 fi 2296 fi
2319 fi 2297 fi
2320 2298
2321 X_TOOLKIT_TYPE=$USE_X_TOOLKIT 2299 X_TOOLKIT_TYPE=$USE_X_TOOLKIT
3420 3398
3421 /* Define HAVE_X_I18N if we have usable i18n support. */ 3399 /* Define HAVE_X_I18N if we have usable i18n support. */
3422 3400
3423 #ifdef HAVE_X11R6 3401 #ifdef HAVE_X11R6
3424 #define HAVE_X_I18N 3402 #define HAVE_X_I18N
3425 #elif defined HAVE_X11R5 && !defined X11R5_INHIBIT_I18N 3403 #elif !defined X11R5_INHIBIT_I18N
3426 #define HAVE_X_I18N 3404 #define HAVE_X_I18N
3427 #endif 3405 #endif
3428 3406
3429 /* Define HAVE_X11R6_XIM if we have usable X11R6-style XIM support. */ 3407 /* Define HAVE_X11R6_XIM if we have usable X11R6-style XIM support. */
3430 3408
3534 toolkit for Emacs. See etc/PROBLEMS for more information." 3512 toolkit for Emacs. See etc/PROBLEMS for more information."
3535 ;; 3513 ;;
3536 esac 3514 esac
3537 fi 3515 fi
3538 3516
3517
3518 if test "$HAVE_CARBON" = "yes"; then
3519 echo
3520 echo "Warning: The Mac Carbon port is currently unsupported and has
3521 known problems. It is not recommended for use by non-developers.
3522 Read the emacs-devel archives for more information."
3523 echo
3524 fi
3539 3525
3540 3526
3541 # Remove any trailing slashes in these variables. 3527 # Remove any trailing slashes in these variables.
3542 [test "${prefix}" != NONE && 3528 [test "${prefix}" != NONE &&
3543 prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'` 3529 prefix=`echo "${prefix}" | sed 's,\([^/]\)/*$,\1,'`