[Mapserver-dev] Problem building from CVS...

[Norman Vine]

This is a multi-part message in MIME format.

------=_NextPart_000_00B7_01C3F0F9.35C5E330
Content-Type: text/plain;
	charset="us-ascii"
Content-Transfer-Encoding: 7bit

Tonights CVS introduces a mySQL dependency
could something like the attached diff please be
committed

TIA

Norman
------=_NextPart_000_00B7_01C3F0F9.35C5E330
Content-Type: application/octet-stream;
	name="mapjoin.diff"
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment;
	filename="mapjoin.diff"

Index: mapjoin.c=0A=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=0A=
RCS file: /data2/cvsroot/mapserver/mapjoin.c,v=0A=
retrieving revision 1.21=0A=
diff -c -r1.21 mapjoin.c=0A=
*** mapjoin.c	11 Feb 2004 13:26:40 -0000	1.21=0A=
--- mapjoin.c	12 Feb 2004 04:40:52 -0000=0A=
***************=0A=
*** 470,476 ****=0A=
  }=0A=
  #endif=0A=
  =0A=
! //=0A=
  // mysql join functions=0A=
  //=0A=
  typedef struct {=0A=
--- 470,476 ----=0A=
  }=0A=
  #endif=0A=
  =0A=
! #ifdef USE_MYGIS=0A=
  // mysql join functions=0A=
  //=0A=
  typedef struct {=0A=
***************=0A=
*** 483,495 ****=0A=
    char *target;=0A=
    int nextrecord;=0A=
  } msMySQLJoinInfo;=0A=
! =0A=
  =0A=
  =0A=
  int msMySQLJoinConnect(layerObj *layer, joinObj *join) =0A=
  {=0A=
     MYDEBUG if (setvbuf(stdout, NULL, _IONBF , =
0)){printf("Whoops...");};=0A=
! 	=0A=
  #ifndef USE_MYGIS=0A=
    msSetError(MS_QUERYERR, "MySQL support not available (compile with =
--with-mygis)", "msMySQLJoinConnect()");=0A=
    return(MS_FAILURE);=0A=
--- 483,497 ----=0A=
    char *target;=0A=
    int nextrecord;=0A=
  } msMySQLJoinInfo;=0A=
! #endif=0A=
  =0A=
  =0A=
  int msMySQLJoinConnect(layerObj *layer, joinObj *join) =0A=
  {=0A=
+ #ifdef MYDEBUG=0A=
     MYDEBUG if (setvbuf(stdout, NULL, _IONBF , =
0)){printf("Whoops...");};=0A=
! #endif=0A=
!    =0A=
  #ifndef USE_MYGIS=0A=
    msSetError(MS_QUERYERR, "MySQL support not available (compile with =
--with-mygis)", "msMySQLJoinConnect()");=0A=
    return(MS_FAILURE);=0A=

------=_NextPart_000_00B7_01C3F0F9.35C5E330--