Mercurial > emacs
comparison configure.in @ 14689:bd83ed983a96
Improve messages about X versions.
(LOCALTIME_CACHE): Cope if $ac_cv_func_tzset is null.
(HAVE_X11XTR6): Set it as a shell variable.
(HAVE_LIBXMU): If HAVE_X11XTR6, use -lSM and -lICE.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Mon, 26 Feb 1996 19:42:29 +0000 |
parents | 4deac8b4941c |
children | 0bb2443dcc6d |
comparison
equal
deleted
inserted
replaced
14688:217222b416f7 | 14689:bd83ed983a96 |
---|---|
1305 AC_MSG_CHECKING(X11 version 6) | 1305 AC_MSG_CHECKING(X11 version 6) |
1306 AC_TRY_LINK([#include <X11/Xlib.h>], | 1306 AC_TRY_LINK([#include <X11/Xlib.h>], |
1307 [#if XlibSpecificationRelease < 6 | 1307 [#if XlibSpecificationRelease < 6 |
1308 fail; | 1308 fail; |
1309 #endif | 1309 #endif |
1310 ], [AC_MSG_RESULT(6) | 1310 ], [AC_MSG_RESULT(6 or newer) |
1311 AC_DEFINE(HAVE_X11R6)], | 1311 AC_DEFINE(HAVE_X11R6)], |
1312 [AC_MSG_RESULT(not 6)]) | 1312 [AC_MSG_RESULT(before 6)]) |
1313 fi | 1313 fi |
1314 | 1314 |
1315 if test x"${USE_X_TOOLKIT}" = xmaybe; then | 1315 if test x"${USE_X_TOOLKIT}" = xmaybe; then |
1316 AC_MSG_CHECKING(X11 version 5) | 1316 AC_MSG_CHECKING(X11 version 5) |
1317 AC_TRY_LINK([#include <X11/Xlib.h>], | 1317 AC_TRY_LINK([#include <X11/Xlib.h>], |
1318 [#if XlibSpecificationRelease < 5 | 1318 [#if XlibSpecificationRelease < 5 |
1319 fail; | 1319 fail; |
1320 #endif | 1320 #endif |
1321 ], [AC_MSG_RESULT(5, use toolkit) | 1321 ], [AC_MSG_RESULT(5 or newer; use toolkit by default) |
1322 USE_X_TOOLKIT=LUCID | 1322 USE_X_TOOLKIT=LUCID |
1323 AC_DEFINE(HAVE_X11R5)], | 1323 AC_DEFINE(HAVE_X11R5)], |
1324 [AC_MSG_RESULT(not 5, do not use toolkit) | 1324 [AC_MSG_RESULT(before 5; do not use toolkit by default) |
1325 USE_X_TOOLKIT=none]) | 1325 USE_X_TOOLKIT=none]) |
1326 fi | 1326 fi |
1327 | 1327 |
1328 X_TOOLKIT_TYPE=$USE_X_TOOLKIT | 1328 X_TOOLKIT_TYPE=$USE_X_TOOLKIT |
1329 | 1329 |
1331 AC_MSG_CHECKING(X11 toolkit version) | 1331 AC_MSG_CHECKING(X11 toolkit version) |
1332 AC_TRY_LINK([#include <X11/Intrinsic.h>], | 1332 AC_TRY_LINK([#include <X11/Intrinsic.h>], |
1333 [#if XtSpecificationRelease < 6 | 1333 [#if XtSpecificationRelease < 6 |
1334 fail; | 1334 fail; |
1335 #endif | 1335 #endif |
1336 ], [AC_MSG_RESULT(6) | 1336 ], [AC_MSG_RESULT(6 or newer) |
1337 HAVE_X11XTR6=yes | |
1337 AC_DEFINE(HAVE_X11XTR6)], | 1338 AC_DEFINE(HAVE_X11XTR6)], |
1338 [AC_MSG_RESULT(not 6)]) | 1339 [AC_MSG_RESULT(before 6) |
1340 HAVE_X11XTR6=no]) | |
1339 | 1341 |
1340 dnl If using toolkit, check whether libXmu.a exists. | 1342 dnl If using toolkit, check whether libXmu.a exists. |
1341 dnl tranle@intellicorp.com says libXmu.a can need XtMalloc in libXt.a to link. | 1343 dnl tranle@intellicorp.com says libXmu.a can need XtMalloc in libXt.a to link. |
1342 OLDLIBS="$LIBS" | 1344 OLDLIBS="$LIBS" |
1343 LIBS="-lXt $LIBS" | 1345 if test x$HAVE_X11XTR6 = xyes; then |
1346 LIBS="-lXt -lSM -lICE $LIBS" | |
1347 else | |
1348 LIBS="-lXt $LIBS" | |
1349 fi | |
1344 AC_CHECK_LIB(Xmu, XmuConvertStandardSelection) | 1350 AC_CHECK_LIB(Xmu, XmuConvertStandardSelection) |
1345 LIBS="$OLDLIBS" | 1351 LIBS="$OLDLIBS" |
1346 fi | 1352 fi |
1347 | 1353 |
1348 # If netdb.h doesn't declare h_errno, we must declare it by hand. | 1354 # If netdb.h doesn't declare h_errno, we must declare it by hand. |
1362 random lrand48 bcopy bcmp logb frexp fmod ftime res_init setsid \ | 1368 random lrand48 bcopy bcmp logb frexp fmod ftime res_init setsid \ |
1363 strerror fpathconf select mktime eaccess getpagesize tzset) | 1369 strerror fpathconf select mktime eaccess getpagesize tzset) |
1364 | 1370 |
1365 AC_MSG_CHECKING(whether localtime caches TZ) | 1371 AC_MSG_CHECKING(whether localtime caches TZ) |
1366 AC_CACHE_VAL(emacs_cv_localtime_cache, | 1372 AC_CACHE_VAL(emacs_cv_localtime_cache, |
1367 [if test $ac_cv_func_tzset = yes; then | 1373 [if test x$ac_cv_func_tzset = xyes; then |
1368 AC_TRY_RUN([#include <time.h> | 1374 AC_TRY_RUN([#include <time.h> |
1369 #if STDC_HEADERS | 1375 #if STDC_HEADERS |
1370 # include <stdlib.h> | 1376 # include <stdlib.h> |
1371 #endif | 1377 #endif |
1372 main() | 1378 main() |