diff options
| author | Martin Ebourne <martin@ebourne.me.uk> | 2006-01-02 00:53:08 +0000 |
|---|---|---|
| committer | Martin Ebourne <martin@ebourne.me.uk> | 2006-01-02 00:53:08 +0000 |
| commit | 2b62b678b4ab3ea386346ba8cf4a659f7a6bf4e0 (patch) | |
| tree | 7b379985142fd3dc68293274d48096976752d262 | |
| parent | 9c538b76b289c98cf68d758c64477b1835c55b6c (diff) | |
Try and bodge round the scary mess Berkeley DB has left us. This possible fix is for FreeBSD which fails to compile db.h
| -rw-r--r-- | infrastructure/m4/ax_path_bdb.m4 | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/infrastructure/m4/ax_path_bdb.m4 b/infrastructure/m4/ax_path_bdb.m4 index 6d82ff81..fe863728 100644 --- a/infrastructure/m4/ax_path_bdb.m4 +++ b/infrastructure/m4/ax_path_bdb.m4 @@ -163,7 +163,11 @@ AC_DEFUN([AX_PATH_BDB_NO_OPTIONS], [ AC_PREPROC_IFELSE([ AC_LANG_SOURCE([[ #include <db.h> +#ifdef DB_VERSION_MAJOR AX_PATH_BDB_STUFF DB_VERSION_MAJOR,DB_VERSION_MINOR,DB_VERSION_PATCH +#else +AX_PATH_BDB_STUFF 1,0,0 +#endif ]]) ],[ # Extract version from preprocessor output. @@ -364,9 +368,14 @@ int main(int argc,char **argv) (void) argv; 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) +#else + printf("1.0.0\n"); + if (major == 1) +#endif return 0; else return 1; @@ -424,9 +433,14 @@ int main(int argc,char **argv) (void) argv; 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) +#else + printf("1.0.0\n"); + if (major == 1) +#endif return 0; else return 1; @@ -483,7 +497,11 @@ int main(int argc,char **argv) { (void) argv; if (argc > 1) +#ifdef DB_VERSION_MAJOR printf("%d.%d.%d\n",DB_VERSION_MAJOR,DB_VERSION_MINOR,DB_VERSION_PATCH); +#else + printf("1.0.0\n"); +#endif return 0; } ]]) |