comparison configure.in @ 384:bbff43aa5eb7 r21-2-7

Import from CVS: tag r21-2-7
author cvs
date Mon, 13 Aug 2007 11:08:24 +0200
parents 064ab7fed2e0
children aabb7f5b1c81
comparison
equal deleted inserted replaced
383:6a50c6a581a5 384:bbff43aa5eb7
228 define([XE_PREPEND], 228 define([XE_PREPEND],
229 [[$2]="[$1] $[$2]" && dnl 229 [[$2]="[$1] $[$2]" && dnl
230 if test "$extra_verbose" = "yes"; then echo " Prepending \"[$1]\" to \$[$2]"; fi]) 230 if test "$extra_verbose" = "yes"; then echo " Prepending \"[$1]\" to \$[$2]"; fi])
231 231
232 dnl XE_DIE(message) 232 dnl XE_DIE(message)
233 define([XE_DIE], [{ echo $1 >&2; exit 1; }]) 233 define([XE_DIE], [{ echo "Error:" $1 >&2; exit 1; }])
234 234
235 dnl XE_STRIP_4TH_COMPONENT(var) 235 dnl XE_STRIP_4TH_COMPONENT(var)
236 dnl Changes i986-pc-linux-gnu to i986-pc-linux, as God (not RMS) intended. 236 dnl Changes i986-pc-linux-gnu to i986-pc-linux, as God (not RMS) intended.
237 define([XE_STRIP_4TH_COMPONENT], 237 define([XE_STRIP_4TH_COMPONENT],
238 [$1=`echo "$$1" | sed '[s/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/]'`]) 238 [$1=`echo "$$1" | sed '[s/^\([^-][^-]*-[^-][^-]*-[^-][^-]*\)-.*$/\1/]'`])
2481 [AC_DEFINE(HAVE_MSG_SELECT)]) 2481 [AC_DEFINE(HAVE_MSG_SELECT)])
2482 const_is_losing=no 2482 const_is_losing=no
2483 with_file_coding=yes 2483 with_file_coding=yes
2484 use_minimal_tagbits=yes 2484 use_minimal_tagbits=yes
2485 use_indexed_lrecord_implementation=yes 2485 use_indexed_lrecord_implementation=yes
2486 XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o) 2486 XE_ADD_OBJS(console-msw.o device-msw.o event-msw.o frame-msw.o objects-msw.o select-msw.o redisplay-msw.o glyphs-msw.o gui-msw.o)
2487 fi 2487 fi
2488 fi 2488 fi
2489 2489
2490 AC_SUBST(install_pp) 2490 AC_SUBST(install_pp)
2491 2491
2920 2920
2921 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar.o) 2921 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar.o)
2922 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar.o) 2922 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar.o)
2923 test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog.o) 2923 test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog.o)
2924 test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar.o) 2924 test "$with_toolbars" != "no" && XE_ADD_OBJS(toolbar.o)
2925 test "$all_widgets" != "no no no no" && XE_ADD_OBJS(gui.o)
2926 2925
2927 if test "$with_x11" = "yes"; then 2926 if test "$with_x11" = "yes"; then
2928 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-x.o) 2927 test "$with_menubars" != "no" && XE_ADD_OBJS(menubar-x.o)
2929 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-x.o) 2928 test "$with_scrollbars" != "no" && XE_ADD_OBJS(scrollbar-x.o)
2930 test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog-x.o) 2929 test "$with_dialogs" != "no" && XE_ADD_OBJS(dialog-x.o)
3483 3482
3484 dnl Do we need event-unixoid.o ? 3483 dnl Do we need event-unixoid.o ?
3485 test "$with_x11" = "yes" -o "$with_tty" = "yes" && XE_ADD_OBJS(event-unixoid.o) 3484 test "$with_x11" = "yes" -o "$with_tty" = "yes" && XE_ADD_OBJS(event-unixoid.o)
3486 3485
3487 dnl Database support 3486 dnl Database support
3488 dnl <mdiers@logware.de>
3489 dnl We do not necessarily have to have libdb/lib(g)dbm for DB/(G)DBM support. 3487 dnl We do not necessarily have to have libdb/lib(g)dbm for DB/(G)DBM support.
3490 dnl On FreeBSD, both DB and DBM are part of libc. 3488 dnl On FreeBSD, both DB and DBM are part of libc.
3491 dnl Note that unless support for DB/(G)DBM is explicitly disabled, we always 3489 dnl By default, we check for DBM support in libgdbm, then libc, then libdbm.
3492 dnl want to check for libdb/lib(g)dbm. Also note that libc will not be 3490
3493 dnl checked if we have the libraries. 3491 test "$with_database_gnudbm $with_database_dbm $with_database_berkdb" \
3494 dnl If support for DB/(G)DBM is requested, but we neither have libdb/lib(g)dbm, 3492 != "no no no" && AC_CHECKING(for database support)
3495 dnl nor does libc implement it, we are a bit lost :) 3493
3496 3494 dnl Check for ndbm.h, required for either kind of DBM support.
3497 AC_CHECKING(for database support) 3495 if test "$with_database_gnudbm $with_database_dbm" != "no no"; then
3498 3496 AC_CHECK_HEADER(ndbm.h, [:], [
3497 test "$with_database_gnudbm" = "yes" -o \
3498 "$with_database_dbm" = "yes" && \
3499 XE_DIE("Required DBM support cannot be provided.")
3500 with_database_gnudbm=no with_database_dbm=no])
3501 fi
3502
3503 dnl Check for DBM support in libgdbm.
3499 if test "$with_database_gnudbm" != "no"; then 3504 if test "$with_database_gnudbm" != "no"; then
3500 AC_CHECK_HEADERS(ndbm.h, have_ndbm_h=yes) 3505 AC_CHECK_LIB(gdbm, dbm_open, [
3501 if test "$have_ndbm_h" = "yes"; then 3506 with_database_gnudbm=yes with_database_dbm=no libdbm=-lgdbm], [
3502 AC_CHECK_LIB(gdbm, dbm_open, with_database_gnudbm=yes have_libgdbm=yes) 3507 if test "$with_database_gnudbm" = "yes"; then
3503 fi 3508 XE_DIE("Required GNU DBM support cannot be provided.")
3504 if test "$with_database_gnudbm" != "yes"; then 3509 fi
3505 AC_CHECK_FUNC(dbm_open, with_database_gnudbm=yes) 3510 with_database_gnudbm=no])
3506 fi 3511 fi
3507 if test "$with_database_gnudbm" = "yes"; then 3512
3508 AC_DEFINE(HAVE_DBM) 3513 dnl Check for DBM support in libc and libdbm.
3509 test "$have_libgdbm" = "yes" && XE_PREPEND(-lgdbm, LIBS)
3510 with_database_dbm=no
3511 else with_database_gnudbm=no
3512 fi
3513 fi
3514
3515 if test "$with_database_dbm" != "no"; then 3514 if test "$with_database_dbm" != "no"; then
3516 AC_CHECK_FUNC(dbm_open, with_database_dbm=yes need_libdbm=no) 3515 AC_CHECK_FUNC(dbm_open, [with_database_dbm=yes libdbm=], [
3517 if test "$need_libdbm" != "no"; then 3516 AC_CHECK_LIB(dbm, dbm_open, [with_database_dbm=yes libdbm=-ldbm], [
3518 AC_CHECK_LIB(dbm, dbm_open, with_database_dbm=yes need_libdbm=yes) 3517 test "$with_database_dbm" = "yes" && \
3519 fi 3518 XE_DIE("Required DBM support cannot be provided.")
3520 if test "$with_database_dbm" = "yes"; then 3519 with_database_dbm=no])])
3521 AC_DEFINE(HAVE_DBM) 3520 fi
3522 test "$need_libdbm" = "yes" && XE_PREPEND(-ldbm, LIBS) 3521
3523 else with_database_dbm=no 3522 dnl Tell make about the DBM support we detected.
3524 fi 3523 test -n "$libdbm" && XE_PREPEND("$libdbm", LIBS)
3525 fi 3524 test "$with_database_gnudbm" = "yes" -o \
3526 3525 "$with_database_dbm" = "yes" && \
3526 AC_DEFINE(HAVE_DBM)
3527
3528 dnl Check for Berkeley DB.
3527 if test "$with_database_berkdb" != "no"; then 3529 if test "$with_database_berkdb" != "no"; then
3528 AC_MSG_CHECKING(for Berkeley db.h) 3530 AC_MSG_CHECKING(for Berkeley db.h)
3529 for path in "db/db.h" "db.h"; do 3531 for path in "db/db.h" "db.h"; do
3530 AC_TRY_COMPILE([#ifdef HAVE_INTTYPES_H 3532 AC_TRY_COMPILE([#ifdef HAVE_INTTYPES_H
3531 #define __BIT_TYPES_DEFINED__ 3533 #define __BIT_TYPES_DEFINED__