diff options
| author | Martin Ebourne <martin@ebourne.me.uk> | 2006-01-02 11:00:10 +0000 |
|---|---|---|
| committer | Martin Ebourne <martin@ebourne.me.uk> | 2006-01-02 11:00:10 +0000 |
| commit | 2f1076aa7e8c531ec7e4405965753d204aa7a242 (patch) | |
| tree | 30f8c676a6970585aef4f82131469093fb7ae779 | |
| parent | 2b62b678b4ab3ea386346ba8cf4a659f7a6bf4e0 (diff) | |
The last commit fixed the header file check, hopefully this will fix the library check on platforms with only db version 1.
| -rw-r--r-- | infrastructure/m4/ax_path_bdb.m4 | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/infrastructure/m4/ax_path_bdb.m4 b/infrastructure/m4/ax_path_bdb.m4 index fe863728..08d71053 100644 --- a/infrastructure/m4/ax_path_bdb.m4 +++ b/infrastructure/m4/ax_path_bdb.m4 @@ -364,21 +364,27 @@ AC_DEFUN([AX_PATH_BDB_PATH_GET_VERSION], [ #include <db.h> int main(int argc,char **argv) { - int major,minor,patch; (void) argv; +#ifdef DB_VERSION_MAJOR + int major,minor,patch; db_version(&major,&minor,&patch); if (argc > 1) -#ifdef DB_VERSION_MAJOR printf("%d.%d.%d\n",DB_VERSION_MAJOR,DB_VERSION_MINOR,DB_VERSION_PATCH); if (DB_VERSION_MAJOR == major && DB_VERSION_MINOR == minor && DB_VERSION_PATCH == patch) + return 0; + else + return 1; #else + DB *dbp = dbopen(0, 0, 0, DB_HASH, 0); + if(dbp) dbp->close(dbp); + if (argc > 1) printf("1.0.0\n"); - if (major == 1) -#endif + if (dbp) return 0; else return 1; +#endif } ]]) ],[ @@ -429,21 +435,27 @@ AC_DEFUN([AX_PATH_BDB_ENV_CONFIRM_LIB], [ #include <db.h> int main(int argc,char **argv) { - int major,minor,patch; (void) argv; +#ifdef DB_VERSION_MAJOR + int major,minor,patch; db_version(&major,&minor,&patch); if (argc > 1) -#ifdef DB_VERSION_MAJOR printf("%d.%d.%d\n",DB_VERSION_MAJOR,DB_VERSION_MINOR,DB_VERSION_PATCH); if (DB_VERSION_MAJOR == major && DB_VERSION_MINOR == minor && DB_VERSION_PATCH == patch) + return 0; + else + return 1; #else + DB *dbp = dbopen(0, 0, 0, DB_HASH, 0); + if(dbp) dbp->close(dbp); + if (argc > 1) printf("1.0.0\n"); - if (major == 1) -#endif + if (dbp) return 0; else return 1; +#endif } ]]) ],[ |