comparison configure.in @ 298:70ad99077275 r21-0b47

Import from CVS: tag r21-0b47
author cvs
date Mon, 13 Aug 2007 10:39:40 +0200
parents 5a79be0ef6a8
children 3cc9f0ebfbd1
comparison
equal deleted inserted replaced
297:deca3c1083ac 298:70ad99077275
934 fi 934 fi
935 AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename") 935 AC_DEFINE_UNQUOTED(XEMACS_CODENAME, "$xemacs_codename")
936 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version") 936 AC_DEFINE_UNQUOTED(EMACS_VERSION, "$version")
937 937
938 if test "$with_infodock" = "yes"; then 938 if test "$with_infodock" = "yes"; then
939 if test ! -f ../InfoDock.rules; then 939 if test ! -f ../ID-INSTALL; then
940 echo "Cannot build InfoDock without InfoDock sources" 940 echo "Cannot build InfoDock without InfoDock sources"
941 with_infodock=no 941 with_infodock=no
942 fi 942 fi
943 fi 943 fi
944 944
3448 else with_database_dbm=no 3448 else with_database_dbm=no
3449 fi 3449 fi
3450 fi 3450 fi
3451 3451
3452 if test "$with_database_berkdb" != "no"; then 3452 if test "$with_database_berkdb" != "no"; then
3453 AC_CHECK_FUNC(dbopen, with_database_berkdb=yes need_libdb=no, 3453 AC_MSG_CHECKING(for Berkeley db.h)
3454 AC_CHECK_FUNC(db_open, with_database_berkdb=yes need_libdb=no, 3454 for path in "db/db.h" "db.h"; do
3455 AC_CHECK_LIB(db, dbopen, with_database_berkdb=yes need_libdb=yes, 3455 AC_TRY_COMPILE([#ifdef HAVE_INTTYPES_H
3456 AC_CHECK_LIB(db, db_open, with_database_berkdb=yes need_libdb=yes))))
3457
3458 if test "$with_database_berkdb" = "yes"; then
3459 for path in "db/db.h" "db.h"; do
3460 AC_TRY_COMPILE([#ifdef HAVE_INTTYPES_H
3461 #define __BIT_TYPES_DEFINED__ 3456 #define __BIT_TYPES_DEFINED__
3462 #include <inttypes.h> 3457 #include <inttypes.h>
3463 typedef uint8_t u_int8_t; 3458 typedef uint8_t u_int8_t;
3464 typedef uint16_t u_int16_t; 3459 typedef uint16_t u_int16_t;
3465 typedef uint32_t u_int32_t; 3460 typedef uint32_t u_int32_t;
3467 typedef uint64_t u_int64_t; 3462 typedef uint64_t u_int64_t;
3468 #endif 3463 #endif
3469 #endif 3464 #endif
3470 #include <$path> 3465 #include <$path>
3471 ],[], db_h_path="$path"; break) 3466 ],[], db_h_path="$path"; break)
3472 done 3467 done
3473 test -z "$db_h_path" && with_database_berkdb=no 3468 if test -z "$db_h_path"
3474 fi 3469 then AC_MSG_RESULT(no); with_database_berkdb=no
3470 else AC_MSG_RESULT($db_h_path)
3471 fi
3472
3473 if test "$with_database_berkdb" != "no"; then
3474 AC_MSG_CHECKING(for Berkeley DB version)
3475 AC_EGREP_CPP(yes,
3476 [#include <$db_h_path>
3477 #if DB_VERSION_MAJOR > 1
3478 yes
3479 #endif
3480 ], [AC_MSG_RESULT(2); dbfunc=db_open], [AC_MSG_RESULT(1); dbfunc=dbopen])
3481 AC_CHECK_FUNC($dbfunc, with_database_berkdb=yes need_libdb=no, [
3482 AC_CHECK_LIB(db, $dbfunc, with_database_berkdb=yes need_libdb=yes)])
3483 fi
3484
3475 if test "$with_database_berkdb" = "yes"; then 3485 if test "$with_database_berkdb" = "yes"; then
3476 AC_DEFINE_UNQUOTED(DB_H_PATH, "$db_h_path") 3486 AC_DEFINE_UNQUOTED(DB_H_PATH, "$db_h_path")
3477 AC_DEFINE(HAVE_BERKELEY_DB) 3487 AC_DEFINE(HAVE_BERKELEY_DB)
3478 test "$need_libdb" = "yes" && XE_PREPEND(-ldb, LIBS) 3488 test "$need_libdb" = "yes" && XE_PREPEND(-ldb, LIBS)
3479 else with_database_berkdb=no 3489 else with_database_berkdb=no