Branch: Tag:

2007-03-10

2007-03-10 16:07:59 by Marcus Comstedt <marcus@mc.pp.se>

Windows build fixes.

Rev: src/modules/Mysql/configure.in:1.53
Rev: src/modules/Mysql/dummy.c:1.16

1:   # - # $Id: configure.in,v 1.52 2007/01/28 02:51:02 peter Exp $ + # $Id: configure.in,v 1.53 2007/03/10 16:07:59 marcus Exp $   #   # Configure script for the mysql-module   #
95:       # Header file    -  AC_CHECK_HEADERS(winsock.h winsock2.h mysql.h mysql/mysql.h errmsg.h mysql/errmsg.h) +  AC_CHECK_HEADERS(winsock.h winsock2.h mysql.h mysql/mysql.h errmsg.h mysql/errmsg.h,[],[],[#if HAVE_WINSOCK2_H + #include <winsock2.h> + #elif HAVE_WINSOCK_H + #include <winsock.h> + #endif + ])       if test x$ac_cv_header_mysql_h$ac_cv_header_mysql_mysql_h = xnono; then    # Required headerfile missing.
108:   [   AC_MSG_CHECKING(for $1)   AC_TRY_COMPILE([ + #if HAVE_WINSOCK2_H + #include <winsock2.h> + #elif HAVE_WINSOCK_H + #include <winsock.h> + #endif   #ifdef HAVE_MYSQL_H   #include <mysql.h>   #else
144:       pike_cv_mysql="unknown"    +  if test x"$pike_cv_sys_os" = xWindows_NT ; then +  LIBS="-lshell32 -lkernel32 -lws2_32 -ladvapi32 -luser32 ${LIBS}" +  fi       AC_CHECK_LIB(mysqlclient, bchange, [    LIBS="-lmysqlclient $LIBS"
428:    if test x"$pike_cv_sys_os" = xWindows_NT ; then    MYSQL_LIBS="-lshell32 -lkernel32 -lws2_32 -ladvapi32 -luser32 ${MYSQL_LIBS}"    fi -  AC_CHECK_FUNCS(ldiv open sopen close read fileno puts fgets) +  AC_CHECK_FUNCS(ldiv open sopen close read fileno puts fgets _findfirst _findnext _findclose)       AC_MSG_CHECKING(for the charsetnr member in MYSQL_FIELD)    AC_CACHE_VAL(pike_cv_have_mysql_field_charsetnr, [