comparison configure.ac @ 2741:d5863780dbef

[xemacs-hg @ 2005-04-22 12:45:22 by malcolmp] configure.ac: Make srcdir absolute before calling AC_CONFIG_AUX_DIR_DEFAULT, include X headers for shape.h, terminate checking lines when testing for dynamic libraries.
author malcolmp
date Fri, 22 Apr 2005 12:45:41 +0000
parents 6fa9919a9a0b
children ac63ab256048
comparison
equal deleted inserted replaced
2740:fb11217148b1 2741:d5863780dbef
962 962
963 AC_SUBST(inststaticdir) 963 AC_SUBST(inststaticdir)
964 AC_SUBST(statedir,$with_statedir) 964 AC_SUBST(statedir,$with_statedir)
965 965
966 dnl ------------------------------------------------------------------------- 966 dnl -------------------------------------------------------------------------
967 AC_CONFIG_AUX_DIR_DEFAULT
968 AC_CANONICAL_BUILD
969 dnl -------------------------------------------------------------------------
970 967
971 AC_PROG_LN_S 968 AC_PROG_LN_S
972 969
973 dnl Make symlinks for etc, lisp, and info directories while the path 970 dnl Make symlinks for etc, lisp, and info directories while the path
974 dnl is still relative. We do not symlink lock because someone may 971 dnl is still relative. We do not symlink lock because someone may
1016 vpath %.y $(srcdir)\ 1013 vpath %.y $(srcdir)\
1017 vpath %.l $(srcdir)\ 1014 vpath %.l $(srcdir)\
1018 vpath %.s $(srcdir)\ 1015 vpath %.s $(srcdir)\
1019 vpath %.in $(srcdir)' 1016 vpath %.in $(srcdir)'
1020 fi 1017 fi
1018
1019 dnl -------------------------------------------------------------------------
1020 AC_CONFIG_AUX_DIR_DEFAULT
1021 AC_CANONICAL_BUILD
1022 dnl -------------------------------------------------------------------------
1021 1023
1022 dnl ---------------------------------------- 1024 dnl ----------------------------------------
1023 dnl Find out which version of XEmacs this is 1025 dnl Find out which version of XEmacs this is
1024 dnl ---------------------------------------- 1026 dnl ----------------------------------------
1025 . "$srcdir/version.sh" || exit 1; 1027 . "$srcdir/version.sh" || exit 1;
3357 dnl Balloon Help requires the Shape extension, not available everywhere, 3359 dnl Balloon Help requires the Shape extension, not available everywhere,
3358 dnl for example not on AIX 4.3. 3360 dnl for example not on AIX 4.3.
3359 if test "$with_x11" = "yes"; then 3361 if test "$with_x11" = "yes"; then
3360 AC_CHECK_HEADER(X11/extensions/shape.h, [ 3362 AC_CHECK_HEADER(X11/extensions/shape.h, [
3361 AC_DEFINE(HAVE_BALLOON_HELP) 3363 AC_DEFINE(HAVE_BALLOON_HELP)
3362 ]) 3364 ],[],
3365 [
3366 #include <X11/Xlib.h>
3367 #include <X11/Xutil.h>
3368 ])
3363 fi 3369 fi
3364 3370
3365 dnl FSF 19.29 has some bitmapdir stuff here. 3371 dnl FSF 19.29 has some bitmapdir stuff here.
3366 bitmapdir= 3372 bitmapdir=
3367 3373
3428 * ) 3434 * )
3429 dnl Check for the ELFish dlopen() 3435 dnl Check for the ELFish dlopen()
3430 AC_CHECK_HEADER(dlfcn.h, [ 3436 AC_CHECK_HEADER(dlfcn.h, [
3431 AC_MSG_CHECKING([for dlopen in -lc]) 3437 AC_MSG_CHECKING([for dlopen in -lc])
3432 AC_TRY_LINK([#include <dlfcn.h>],dnl 3438 AC_TRY_LINK([#include <dlfcn.h>],dnl
3433 [dlopen ("", 0);], [ have_dl=yes ], [ 3439 [dlopen ("", 0);], [ have_dl=yes ; AC_MSG_RESULT($have_dl)], [
3440 AC_MSG_RESULT([no])
3434 AC_MSG_CHECKING([for dlopen in -ldl]) 3441 AC_MSG_CHECKING([for dlopen in -ldl])
3435 ac_save_LIBS="$LIBS" 3442 ac_save_LIBS="$LIBS"
3436 LIBS="$LIBS -ldl" 3443 LIBS="$LIBS -ldl"
3437 AC_TRY_LINK([#include <dlfcn.h>],dnl 3444 AC_TRY_LINK([#include <dlfcn.h>],dnl
3438 [dlopen ("", 0);], [ have_dl=yes ], [ 3445 [dlopen ("", 0);], [ have_dl=yes; AC_MSG_RESULT($have_dl)], [
3446 AC_MSG_RESULT([no])
3439 AC_MSG_CHECKING([for dlopen in -lsvld]) 3447 AC_MSG_CHECKING([for dlopen in -lsvld])
3440 LIBS="$ac_save_LIBS -lsvld" 3448 LIBS="$ac_save_LIBS -lsvld"
3441 AC_TRY_LINK([#include <dlfcn.h>],dnl 3449 AC_TRY_LINK([#include <dlfcn.h>],dnl
3442 [dlopen ("", 0);], [ have_dl=yes ], [LIBS="$ac_save_LIBS"])])])]) 3450 [dlopen ("", 0);], [ have_dl=yes; AC_MSG_RESULT($have_dl) ],
3451 [LIBS="$ac_save_LIBS" ; AC_MSG_RESULT([no])])])])])
3443 if test "$have_dl" = "yes"; then 3452 if test "$have_dl" = "yes"; then
3444 AC_DEFINE(HAVE_DLOPEN) 3453 AC_DEFINE(HAVE_DLOPEN)
3445 else 3454 else
3446 dnl Check for HP/UX shl_load 3455 dnl Check for HP/UX shl_load
3447 AC_CHECK_HEADER(dl.h, [ 3456 AC_CHECK_HEADER(dl.h, [
3448 AC_MSG_CHECKING([for shl_load in -lc]) 3457 AC_MSG_CHECKING([for shl_load in -lc])
3449 AC_TRY_LINK([#include <dl.h>],dnl 3458 AC_TRY_LINK([#include <dl.h>],dnl
3450 [shl_load ("", 0, 0);], [have_dl=yes], [ 3459 [shl_load ("", 0, 0);], [have_dl=yes; AC_MSG_RESULT($have_dl)], [
3460 AC_MSG_RESULT([no])
3451 AC_MSG_CHECKING([for shl_load in -ldl]) 3461 AC_MSG_CHECKING([for shl_load in -ldl])
3452 ac_save_LIBS="$LIBS" 3462 ac_save_LIBS="$LIBS"
3453 LIBS="$LIBS -ldld" 3463 LIBS="$LIBS -ldld"
3454 AC_TRY_LINK([#include <dl.h>],dnl 3464 AC_TRY_LINK([#include <dl.h>],dnl
3455 [shl_load ("", 0, 0);], [have_dl=yes], [LIBS="$ac_save_LIBS"])])]) 3465 [shl_load ("", 0, 0);], [have_dl=yes],
3466 [LIBS="$ac_save_LIBS"; AC_MSG_RESULT([no])])])])
3456 if test "$have_dl" = "yes"; then 3467 if test "$have_dl" = "yes"; then
3457 AC_DEFINE(HAVE_SHL_LOAD) 3468 AC_DEFINE(HAVE_SHL_LOAD)
3458 else 3469 else
3459 dnl Check for libtool's libltdl 3470 dnl Check for libtool's libltdl
3460 AC_CHECK_HEADER(ltdl.h, [ 3471 AC_CHECK_HEADER(ltdl.h, [
3461 AC_MSG_CHECKING([for lt_dlinit in -lltdl]) 3472 AC_MSG_CHECKING([for lt_dlinit in -lltdl])
3462 ac_save_LIBS="$LIBS" 3473 ac_save_LIBS="$LIBS"
3463 LIBS="$LIBS -lltdl" 3474 LIBS="$LIBS -lltdl"
3464 AC_TRY_LINK([#include <ltdl.h>],dnl 3475 AC_TRY_LINK([#include <ltdl.h>],dnl
3465 [lt_dlinit ();], [have_dl=yes], [LIBS="$ac_save_LIBS"])]) 3476 [lt_dlinit ();], [have_dl=yes], [LIBS="$ac_save_LIBS"])])
3477 AC_MSG_RESULT($have_dl)
3466 if test "$have_dl" = "yes"; then 3478 if test "$have_dl" = "yes"; then
3467 AC_DEFINE(HAVE_LTDL) 3479 AC_DEFINE(HAVE_LTDL)
3468 fi 3480 fi
3469 dnl end !HP/UX 3481 dnl end !HP/UX
3470 fi 3482 fi