Update of /cvsroot/htoolkit/HSQL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8632
Modified Files:
configure.ac
Log Message:
Added support for MySQL under Windows
Index: configure.ac
===================================================================
RCS file: /cvsroot/htoolkit/HSQL/configure.ac,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** configure.ac 15 Feb 2004 10:48:41 -0000 1.13
--- configure.ac 9 Apr 2004 20:24:05 -0000 1.14
***************
*** 228,233 ****
--- 228,236 ----
case $ac_cv_target_alias in
i[[3456]]86-*-cygwin*|i[[3456]]86-*-mingw32*)
+ AC_CHECK_HEADER(windows.h)
CFLAGS="$CFLAGS -mno-cygwin"
CPPFLAGS="$CPPFLAGS -D_WIN32_"
+ ac_includes_default="$ac_includes_default
+ #include <windows.h>"
WIN32=YES
;;
***************
*** 244,266 ****
if test $WithODBC = YES; then
! case $ac_cv_target_alias in
! i[[3456]]86-*-cygwin*|i[[3456]]86-*-mingw32*)
! AC_COMPILE_IFELSE(
! [
! #include <windows.h>
! #include <sqlext.h>
!
! int main()
! {
! SQLAllocEnv (NULL);
! return 0;
! }
! ],
! [LIBS="${LIBS} -lodbc32"],
! AC_MSG_ERROR([sqlext.h and libodbc required to build ODBC building.]))
! ;;
! *) AC_CHECK_HEADER(sqlext.h,,AC_MSG_ERROR([sqlext.h and libodbc required to build ODBC building.]))
! AC_CHECK_LIB(odbc,SQLAllocEnv,,AC_MSG_ERROR([sqlext.h and libodbc required to build ODBC building.]))
! ;;
esac
--- 247,270 ----
if test $WithODBC = YES; then
! AC_CHECK_HEADER(sqlext.h,,AC_MSG_ERROR([sqlext.h and libodbc required to build ODBC building.]))
! case $WIN32 in
! YES)
! AC_COMPILE_IFELSE(
! [
! #include <windows.h>
! #include <sqlext.h>
!
! int main()
! {
! SQLAllocEnv (NULL);
! return 0;
! }
! ],
! [LIBS="${LIBS} -lodbc32"],
! AC_MSG_ERROR([sqlext.h and libodbc required to build ODBC building.]))
! ;;
! NO)
! AC_CHECK_LIB(odbc,SQLAllocEnv,,AC_MSG_ERROR([sqlext.h and libodbc required to build ODBC building.]))
! ;;
esac
***************
*** 302,322 ****
if test $WithMySQL = YES; then
! AC_PATH_PROG(MYSQL_CONFIG, mysql_config)
!
! if test "$MYSQL_CONFIG" = "" || test ! -f $MYSQL_CONFIG; then
! AC_MSG_ERROR([mysql_config is required to build MySQL binding])
! fi
!
! LDFLAGS="$LDFLAGS `$MYSQL_CONFIG --libs`"
! for mysql_opt in `$MYSQL_CONFIG --cflags`
! do
! case $mysql_opt in
! -I*)
! CPPFLAGS="$CPPFLAGS ${mysql_opt}";;
! esac
! done
! AC_CHECK_HEADER(mysql.h,, AC_MSG_ERROR([mysql.h header not found]))
fi
--- 306,349 ----
if test $WithMySQL = YES; then
! if test $WIN32 = NO; then
! AC_PATH_PROG(MYSQL_CONFIG, mysql_config)
!
! if test "$MYSQL_CONFIG" = "" || test ! -f $MYSQL_CONFIG; then
! AC_MSG_ERROR([mysql_config is required to build MySQL binding])
! fi
!
! LDFLAGS="$LDFLAGS `$MYSQL_CONFIG --libs`"
!
! for mysql_opt in `$MYSQL_CONFIG --cflags`
! do
! case $mysql_opt in
! -I*)
! CPPFLAGS="$CPPFLAGS ${mysql_opt}";;
! esac
! done
! fi
! AC_CHECK_HEADER(mysql.h,, AC_MSG_ERROR([mysql.h header not found]))
!
! case $WIN32 in
! YES)
! AC_COMPILE_IFELSE(
! [
! #include <windows.h>
! #include <mysql.h>
! int main ()
! {
! mysql_init (NULL);
! return 0;
! }
! ],
! [LIBS="${LIBS} -llibmysql"],
! AC_MSG_ERROR([liblibmysql.a library not found]))
! ;;
! NO)
! AC_CHECK_LIB(mysql,mysql_init,,AC_MSG_ERROR([libmysql.a library not found]))
! ;;
! esac
fi
|
