[Xastir-dev] Re: [Xastir] Cygwin help

[Daniel H. Brown]

On Sat, 13 Nov 2004, Tom Russo wrote:

> Date: Sat, 13 Nov 2004 07:29:35 -0700
> From: Tom Russo <russo at bogodyn.org>
> To: "Bennett, Joe" <remailer at ka3nam.com>
> Cc: xastir at xastir.org
> Subject: Re: [Xastir] Cygwin help
> 
> On Sat, Nov 13, 2004 at 08:22:57AM -0600, we recorded a bogon-computron collision of the <remailer at ka3nam.com> flavor, containing:
>> Tom et al,
>>
>> You are correct sir! I did goon up automake in this process... I believe that
>> everything is working OK (?????) up to when I perform make. Here is the
>> flight data recorder info (sorry if this is waisted bandwidth):
>>
> [...]
>>
>> Joe at winxp ~/src/xastir
>> $ make
>> make  all-recursive
>> make[1]: Entering directory `/home/Joe/src/xastir'
>> Making all in src
>> make[2]: Entering directory `/home/Joe/src/xastir/src'
>> make[3]: Entering directory `/home/Joe/src/xastir/src'
>> if gcc -DHAVE_CONFIG_H -I. -I. -I..
>> -I/usr/X11R6/include -I/usr/include
>> -DXASTIR_DATA_BASE=\"/usr/local/share/xastir\"  -g -O2
>> -pipe -Wall -MT map_cache.o -MD -MP -MF
>> ".deps/map_cache.Tpo" -c -o map_cache.o map_cache.c; \
>> then mv -f ".deps/map_cache.Tpo" ".deps/map_cache.Po";
>> else rm -f ".deps/map_cache.Tpo"; exit 1; fi
>> map_cache.c:37:16: db.h: No such file or directory
> [etc.]
>
> There was a bug in xastir until a half hour ago.  The new map_cache feature
> didn't have an ifdef it needed to disable it when db.h or -ldb weren't found.
> I fixed it, and it should be in anonymous CVS in a few hours.
>
> If you're desperate to get it compiled sooner than that, look in map_cache.c
> and move the "#endif" that matches "#ifdef USE_MAP_CACHE" to the end of the
> file.  That will prevent its compilation when the packages it relies on aren't
> there.

I'd like to suggest this patch:

  diff -Naur  xastir-clean/src/map_cache.c   xastir/src/map_cache.c 
--- xastir-clean/src/map_cache.c        2004-11-13 14:00:19.000000000 +0000
+++ xastir/src/map_cache.c      2004-11-13 21:36:09.545714320 +0000
@@ -23,10 +23,7 @@
   * Look at the README for more information on the program.
   */

-#ifdef  USE_MAP_CACHE
-#warning USE_MAP_CACHE Defined (and there was much rejoicing) 
-
-
+#include "config.h"

  #include <sys/types.h>
  #include <stdio.h>
@@ -44,6 +41,12 @@
  #include "map_cache.h"


+#ifndef  USE_MAP_CACHE
+#warning USE_MAP_CACHE NOT Defined 
+
+#else 
+#warning USE_MAP_CACHE Defined 
+





--
Dan Brown 
brown at brauhausdc.org