[Freeciv-Dev] problems building server

[pohl@xxxxxxxxxxxxx]

I grabbed the most recent sources out of cvs and tried to
build the server portion (./configure --enable-client=no)
on a macos-x box.  The autoconfiguration seems to work 
nicely, but when make steps into the common directory and
tries to compile city.c, it complains about line 97...

Making all in common
cc -DHAVE_CONFIG_H -I. -I. -I.. -I../intl    -g -O2 -Wall -c city.c
city.c:97: bad macro argument list
city.c:97: bad macro argument list
make[2]: *** [city.o] Error 1
make[1]: *** [all-recursive] Error 1
make: *** [all-recursive-am] Error 2
bash-2.02$                              

Now I've looked at line 97, and it's a freaking comment, the
first solid row of asterisks in this section...  

-------------------------------------------------------------------
enum city_tile_type get_worker_city(struct city *pcity, int x, int y)
{
  if ((x==0 || x==4) && (y == 0 || y == 4)) 
    return C_TILE_UNAVAILABLE;
  return(pcity->city_map[x][y]);
}

/**************************************************************************
...
**************************************************************************/
int is_worker_here(struct city *pcity, int x, int y) 
{
  if (x < 0 || x > 4 || y < 0 || y > 4 || ((x == 0 || x == 4) && (y == 0|| 
y==4))) {
    return 0;
  }
  return (get_worker_city(pcity,x,y)==C_TILE_WORKER); 
}
---------------------------------------------------------------------

I've tried building the 1.9.0 sources on the same machine with 
the exact same results.  

I'm a very weak c programmer, and I'd like a nudge in the right
direction to get this to build before the next version is released.
Apple is using gnu make and gcc, albeit slightly older versions 
than on my debian box.  Here's the versions on MacOS X:

bash-2.02$ cc --version
2.7.2.1
bash-2.02$ make --version
GNU Make version 3.74, by Richard Stallman and Roland McGrath.
Copyright (C) 1988, 89, 90, 91, 92, 93, 94, 95 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE.