[htoolkit-cvs] HSQL Makefile,1.13,1.14 configure.ac,1.14,1.15

[<kr_...@us...>]

Update of /cvsroot/htoolkit/HSQL
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19310

Modified Files:
	Makefile configure.ac 
Log Message:
Support for PostgreSQL under Windows


Index: Makefile
===================================================================
RCS file: /cvsroot/htoolkit/HSQL/Makefile,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Makefile	22 Feb 2004 11:58:30 -0000	1.13
--- Makefile	10 Apr 2004 17:58:42 -0000	1.14
***************
*** 64,68 ****
  FFIHUGS_FLAGS = $(patsubst %, +L"%", $(CPPFLAGS)) 
  ifeq "$(WIN32)" "YES"
! FFIHUGS_FLAGS += $(patsubst %, +L"%", $(patsubst -l%, %.lib, $(LDFLAGS)) $(HsODBC_o))
  else
  FFIHUGS_FLAGS += $(patsubst %, +L"%", $(LDFLAGS))
--- 64,69 ----
  FFIHUGS_FLAGS = $(patsubst %, +L"%", $(CPPFLAGS)) 
  ifeq "$(WIN32)" "YES"
! ODBC_FFIHUGS_FLAGS = +L"$(HsODBC_o)"
! FFIHUGS_FLAGS += $(patsubst %, +L"%", $(patsubst -l%, %.lib, $(LDFLAGS)))
  else
  FFIHUGS_FLAGS += $(patsubst %, +L"%", $(LDFLAGS))
***************
*** 101,105 ****
  	@:
  %.$(SO_EXT): %.hs
! 	$(FFIHUGS) -98 +G -P$(BUILDDIR): $(FFIHUGS_FLAGS) $<
  %.raw-hs : %.hs
  	$(GHC) -Iincludes $(CPPFLAGS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@
--- 102,106 ----
  	@:
  %.$(SO_EXT): %.hs
! 	$(FFIHUGS) -98 +G -P$(BUILDDIR): $(FFIHUGS_FLAGS) $($(*F)_FFIHUGS_FLAGS) $<
  %.raw-hs : %.hs
  	$(GHC) -Iincludes $(CPPFLAGS) -D__HADDOCK__ -E -cpp $< -o $<.tmp && sed -e 's/^#.*//' <$<.tmp >$@

Index: configure.ac
===================================================================
RCS file: /cvsroot/htoolkit/HSQL/configure.ac,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** configure.ac	9 Apr 2004 20:24:05 -0000	1.14
--- configure.ac	10 Apr 2004 17:58:42 -0000	1.15
***************
*** 277,302 ****
  
  if test $WithPostgreSQL = YES; then
!   AC_PATH_PROG(PG_CONFIG, pg_config)
  
!   if test "$PG_CONFIG" = "" || test ! -f $PG_CONFIG; then
!     AC_MSG_ERROR([pg_config is required to build PostgreSQL binding])
!   fi
  
!   incdir=`$PG_CONFIG --includedir`
!   incdir_server=`$PG_CONFIG --includedir-server`
!   case $ac_cv_target_alias in
!     i[[3456]]86-*-cygwin*|i[[3456]]86-*-mingw32*)
!         LDFLAGS="$LDFLAGS -L$(cygpath -m `$PG_CONFIG --libdir`)"
!         incdir=$(cygpath -m $incdir)
!         CPPFLAGS="$CPPFLAGS -I$(cygpath -m /usr/include) -I$incdir -I$incdir_server"
!         ;;
!     *)  LDFLAGS="$LDFLAGS -L`$PG_CONFIG --libdir`"
!         CPPFLAGS="$CPPFLAGS  -I$incdir -I$incdir_server"
!         ;;
      esac
  
    AC_CHECK_HEADER(libpq-fe.h,,AC_MSG_ERROR([libpq-fe.h header not found]))
    AC_CHECK_HEADER(postgres.h,,AC_MSG_ERROR([postgres.h header not found]))
!   AC_CHECK_LIB(pq,PQsetdbLogin,,AC_MSG_ERROR([libpq.a library not found]))
  fi
  
--- 277,310 ----
  
  if test $WithPostgreSQL = YES; then
!   if test $WIN32 = NO; then
!     AC_PATH_PROG(PG_CONFIG, pg_config)
  
!     if test "$PG_CONFIG" = "" || test ! -f $PG_CONFIG; then
!       AC_MSG_ERROR([pg_config is required to build PostgreSQL binding])
!     fi
  
!     incdir=`$PG_CONFIG --includedir`
!     incdir_server=`$PG_CONFIG --includedir-server`
!     case $ac_cv_target_alias in
!       i[[3456]]86-*-cygwin*|i[[3456]]86-*-mingw32*)
!           LDFLAGS="$LDFLAGS -L$(cygpath -m `$PG_CONFIG --libdir`)"
!           incdir=$(cygpath -m $incdir)
!           CPPFLAGS="$CPPFLAGS -I$(cygpath -m /usr/include) -I$incdir -I$incdir_server"
!           ;;
!       *)  LDFLAGS="$LDFLAGS -L`$PG_CONFIG --libdir`"
!           CPPFLAGS="$CPPFLAGS  -I$incdir -I$incdir_server"
!           ;;
      esac
+   else
+     CPPFLAGS="$CPPFLAGS  -D_MSC_VER"  
+   fi
  
    AC_CHECK_HEADER(libpq-fe.h,,AC_MSG_ERROR([libpq-fe.h header not found]))
    AC_CHECK_HEADER(postgres.h,,AC_MSG_ERROR([postgres.h header not found]))
!   
!   case $WIN32 in
!     YES) AC_CHECK_LIB(libpq,PQsetdbLogin,,AC_MSG_ERROR([liblibpq.a library not found]));;
!      NO) AC_CHECK_LIB(pq,   PQsetdbLogin,,AC_MSG_ERROR([libpq.a library not found]));;
!   esac
  fi