[Freeciv-Dev] Re: [Patch] Win32 client autoconf stuff (PR#935)

[Gaute B Strokkenes <gs234@xxxxxxxxx>]

On Sun, 2 Sep 2001, akemnade@xxxxxxxxxxx wrote:
> I have decided to put the win32 client into cvs soon so it can be
> more easily maintained.

Yay!

> diff -X diff_ignore -Nur /usr/src/cvs/freeciv/configure.in
> freeciv/configure.in --- /usr/src/cvs/freeciv/configure.in Sun Sep 2
> 19:15:36 2001
> +++ freeciv/configure.in      Sun Sep  2 20:19:36 2001
> @@ -329,8 +329,10 @@
>  
>    dnl Win32-specific overrides
>    if test "$client" = win32 || test "$client" = yes ; then
> -    # ADD WIN32 TEST HERE
> -
> +    if test x"$MINGW32" = "xyes"; then
> +      found_client=yes
> +      CLIENT_LIBS="-lwsock32 -lcomctl32 -mwindows"
> +    fi
>      if test "x$found_client" = "xyes"; then
>        client=win32
>      elif test "$client" = "win32"; then

Looks fine to me.

> @@ -476,13 +478,13 @@
>  
>  dnl Checks for header files.  AC_HEADER_STDC
>  -AC_CHECK_HEADERS(fcntl.h sys/time.h sys/types.h unistd.h
>  sys/utsname.h)
> +AC_CHECK_HEADERS(fcntl.h sys/time.h sys/types.h unistd.h)
>  dnl Avoid including the unix emulation layer if we build mingw executables
>  dnl There would be type conflicts between winsock and bsd/unix includes
>  if test "x$MINGW32" != "xyes"; then
>    AC_CHECK_HEADERS(arpa/inet.h netdb.h netinet/in.h pwd.h sys/ioctl.h \
>                     sys/select.h sys/signal.h sys/socket.h sys/termio.h \
> -                   sys/uio.h termios.h)
> +                   sys/uio.h termios.h  sys/utsname.h)
>  fi
>  if test x$client = xxaw; then
>    dnl Want to get appropriate -I flags:

Are you sure you wish to undo this recent change.

-- 
Big Gaute                               http://www.srcf.ucam.org/~gs234/
Yow!  Now I get to think about all the BAD THINGS I did to a BOWLING BALL
 when I was in JUNIOR HIGH SCHOOL!