Branch: Tag:

2007-03-20

2007-03-20 16:40:24 by Henrik Grubbström (Grubba) <grubba@grubba.org>

Various fixes for proper library detection on WIN32.
Added checks for _find*() on WIN32.

Rev: src/modules/Mysql/configure.in:1.57

1:   # - # $Id: configure.in,v 1.56 2007/01/28 03:01:15 peter Exp $ + # $Id: configure.in,v 1.57 2007/03/20 16:40:24 grubba Exp $   #   # Configure script for the mysql-module   #
102:       # Header file    -  AC_CHECK_HEADERS(winsock2.h winsock.h mysql.h mysql/mysql.h errmsg.h mysql/errmsg.h) +  AC_CHECK_HEADERS(winsock2.h winsock.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.
115:   [   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
151:       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"
442:    # Header checks necessary for PIKE_FUNCS_NEED_DECLS.    AC_CHECK_HEADERS(stdio.h io.h)    -  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, [