[Box Backup-dev] COMMIT r297 - box/trunk/infrastructure/m4

[James O'Gorman]

This has worked. Thanks Martin.

Would it be useful to you (or anyone on the list) if I gave you access 
to a FreeBSD jail?

James

On 2/1/06 11:00, subversion at fluffy.co.uk wrote:
> Author: martin
> Date: 2006-01-02 11:00:10 +0000 (Mon, 02 Jan 2006)
> New Revision: 297
> 
> Modified:
>    box/trunk/infrastructure/m4/ax_path_bdb.m4
> Log:
> The last commit fixed the header file check, hopefully this will fix the library check on platforms with only db version 1.
> 
> Modified: box/trunk/infrastructure/m4/ax_path_bdb.m4
> ===================================================================
> --- box/trunk/infrastructure/m4/ax_path_bdb.m4	2006-01-02 00:53:08 UTC (rev 296)
> +++ box/trunk/infrastructure/m4/ax_path_bdb.m4	2006-01-02 11:00:10 UTC (rev 297)
> @@ -364,21 +364,27 @@
>  #include <db.h>
>  int main(int argc,char **argv)
>  {
> +  (void) argv;
> +#ifdef DB_VERSION_MAJOR
>    int major,minor,patch;
> -  (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)
> +    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 @@
>  #include <db.h>
>  int main(int argc,char **argv)
>  {
> +  (void) argv;
> +#ifdef DB_VERSION_MAJOR
>    int major,minor,patch;
> -  (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)
> +    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
>  }
>      ]])
>    ],[
> 
> _______________________________________________
> Boxbackup-dev mailing list
> Boxbackup-dev at fluffy.co.uk
> http://lists.warhead.org.uk/mailman/listinfo/boxbackup-dev