[htoolkit-cvs] HSQL Makefile,1.15,1.16 configure.ac,1.18,1.19

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	Makefile configure.ac 
Log Message:
Fixed --disable-<backend> to not enable that backend.

Index: Makefile
===================================================================
RCS file: /cvsroot/htoolkit/HSQL/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** Makefile	11 Apr 2004 16:00:00 -0000	1.15
--- Makefile	29 Jul 2004 16:46:57 -0000	1.16
***************
*** 30,46 ****
  HSC_SRC += HSQL.hsc

! ifeq "$(WithODBC)" "YES"
  HSC_SRC += HSQL/ODBC.hsc
  endif

! ifeq "$(WithPostgreSQL)" "YES"
  HSC_SRC += HSQL/PostgreSQL.hsc
  endif

! ifeq "$(WithMySQL)" "YES"
  HSC_SRC += HSQL/MySQL.hsc
  endif

! ifeq "$(WithSQLite)" "YES"
  HSC_SRC += HSQL/SQLite.hsc
  endif
--- 30,46 ----
  HSC_SRC += HSQL.hsc

! ifeq "$(WithODBC)" "yes"
  HSC_SRC += HSQL/ODBC.hsc
  endif

! ifeq "$(WithPostgreSQL)" "yes"
  HSC_SRC += HSQL/PostgreSQL.hsc
  endif

! ifeq "$(WithMySQL)" "yes"
  HSC_SRC += HSQL/MySQL.hsc
  endif

! ifeq "$(WithSQLite)" "yes"
  HSC_SRC += HSQL/SQLite.hsc
  endif
***************
*** 52,57 ****
  HS_DEPS = $(patsubst %.hs,%.d, $(HS_SRC))

! ifeq "$(WithODBC)" "YES"
! ifeq "$(WIN32)" "YES"
  HsODBC_o = $(HOUTDIR)/HSQL/HsODBC.o
  endif
--- 52,57 ----
  HS_DEPS = $(patsubst %.hs,%.d, $(HS_SRC))

! ifeq "$(WithODBC)" "yes"
! ifeq "$(WIN32)" "yes"
  HsODBC_o = $(HOUTDIR)/HSQL/HsODBC.o
  endif
***************
*** 63,67 ****

  FFIHUGS_FLAGS = $(patsubst %, +L"%", $(CPPFLAGS)) 
! ifeq "$(WIN32)" "YES"
  ODBC_FFIHUGS_FLAGS = +L"$(HsODBC_o)"
  FFIHUGS_FLAGS += $(patsubst %, +L"%", $(patsubst -l%, %.lib, $(LDFLAGS)))
--- 63,67 ----

  FFIHUGS_FLAGS = $(patsubst %, +L"%", $(CPPFLAGS)) 
! ifeq "$(WIN32)" "yes"
  ODBC_FFIHUGS_FLAGS = +L"$(HsODBC_o)"
  FFIHUGS_FLAGS += $(patsubst %, +L"%", $(patsubst -l%, %.lib, $(LDFLAGS)))
***************
*** 118,122 ****
  	done
  	$(AR) -q $(HSQLLib) $(HsODBC_o)
! 	
  genclean: distclean
  	rm -rf configure autom4te.cache
--- 118,122 ----
  	done
  	$(AR) -q $(HSQLLib) $(HsODBC_o)
! 
  genclean: distclean
  	rm -rf configure autom4te.cache

Index: configure.ac
===================================================================
RCS file: /cvsroot/htoolkit/HSQL/configure.ac,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** configure.ac	26 Apr 2004 16:28:40 -0000	1.18
--- configure.ac	29 Jul 2004 16:46:57 -0000	1.19
***************
*** 9,17 ****
  dnl ***********************************************
  AC_ARG_ENABLE(odbc,
! [  --enable-odbc
!         Build an ODBC binding for Haskell.
! ],
! [WithODBC=YES],
! [WithODBC=NO]
  )
  AC_SUBST(WithODBC)
--- 9,16 ----
  dnl ***********************************************
  AC_ARG_ENABLE(odbc,
! AC_HELP_STRING([--enable-odbc],
!                [Build the HSQL ODBC binding. (default=no)]),
! [WithODBC="$enableval"],
! [WithODBC=no]
  )
  AC_SUBST(WithODBC)
***************
*** 21,29 ****
  dnl ***********************************************
  AC_ARG_ENABLE(postgres,
! [  --enable-postgres
!         Build a PostgreSQL binding for Haskell.
! ],
! [WithPostgreSQL=YES],
! [WithPostgreSQL=NO]
  )
  AC_SUBST(WithPostgreSQL)
--- 20,27 ----
  dnl ***********************************************
  AC_ARG_ENABLE(postgres,
! AC_HELP_STRING([--enable-postgres],
!                [Build the HSQL PostgreSQL binding. (default=no)]),
! [WithPostgreSQL="$enableval"],
! [WithPostgreSQL=no]
  )
  AC_SUBST(WithPostgreSQL)
***************
*** 33,41 ****
  dnl ***********************************************
  AC_ARG_ENABLE(mysql,
! [  --enable-mysql
!         Build a MySQL binding for Haskell.
! ],
! [WithMySQL=YES],
! [WithMySQL=NO]
  )
  AC_SUBST(WithMySQL)
--- 31,38 ----
  dnl ***********************************************
  AC_ARG_ENABLE(mysql,
! AC_HELP_STRING([--enable-mysql],
!                [Build the HSQL MySQL binding. (default=no)]),
! [WithMySQL="$enableval"],
! [WithMySQL=no]
  )
  AC_SUBST(WithMySQL)
***************
*** 45,53 ****
  dnl ***********************************************
  AC_ARG_ENABLE(sqlite,
! [  --enable-sqlite
!         Build a SQLite binding for Haskell.
! ],
! [WithSQLite=YES],
! [WithSQLite=NO]
  )
  AC_SUBST(WithSQLite)
--- 42,49 ----
  dnl ***********************************************
  AC_ARG_ENABLE(sqlite,
! AC_HELP_STRING([--enable-sqlite],
!                [Build the HSQL SQLite binding. (default=no)]),
! [WithSQLite="$enableval"],
! [WithSQLite=no]
  )
  AC_SUBST(WithSQLite)
***************
*** 208,214 ****
          ac_includes_default="$ac_includes_default
  #include <windows.h>"
!         WIN32=YES
          ;;
!     *)  WIN32=NO
          ;;
  esac
--- 204,210 ----
          ac_includes_default="$ac_includes_default
  #include <windows.h>"
!         WIN32=yes
          ;;
!     *)  WIN32=no
          ;;
  esac
***************
*** 221,228 ****

! 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(
              [
--- 217,224 ----

! 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(
              [
***************
*** 239,243 ****
              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.]))
              ;;
--- 235,239 ----
              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.]))
              ;;
***************
*** 251,256 ****
  dnl ***********************************************

! if test $WithPostgreSQL = YES; then
!   if test $WIN32 = NO; then
      AC_PATH_PROG(PG_CONFIG, pg_config)

--- 247,252 ----
  dnl ***********************************************

! if test $WithPostgreSQL = yes; then
!   if test $WIN32 = no; then
      AC_PATH_PROG(PG_CONFIG, pg_config)

***************
*** 279,284 ****

    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
--- 275,280 ----

    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
***************
*** 288,293 ****
  dnl ***********************************************

! if test $WithMySQL = YES; then
!     if test $WIN32 = NO; then
          AC_PATH_PROG(MYSQL_CONFIG, mysql_config)

--- 284,289 ----
  dnl ***********************************************

! if test $WithMySQL = yes; then
!     if test $WIN32 = no; then
          AC_PATH_PROG(MYSQL_CONFIG, mysql_config)

***************
*** 310,314 ****

      case $WIN32 in
!         YES)
              AC_COMPILE_IFELSE(
              [
--- 306,310 ----

      case $WIN32 in
!         yes)
              AC_COMPILE_IFELSE(
              [
***************
*** 325,329 ****
              AC_MSG_ERROR([liblibmysql.a library not found]))
              ;;
!         NO)
              AC_CHECK_LIB(mysqlclient,mysql_init,,AC_MSG_ERROR([libmysql.a library not found]))
              ;;
--- 321,325 ----
              AC_MSG_ERROR([liblibmysql.a library not found]))
              ;;
!         no)
              AC_CHECK_LIB(mysqlclient,mysql_init,,AC_MSG_ERROR([libmysql.a library not found]))
              ;;
***************
*** 337,341 ****
  dnl ***********************************************

! if test $WithSQLite = YES; then
  AC_CHECK_HEADER(sqlite.h,, AC_MSG_ERROR([sqlite.h header not found]))
  AC_CHECK_LIB(sqlite,sqlite_open,,AC_MSG_ERROR([sqlite.h and libsqlite required to build SQLite building.]))
--- 333,337 ----
  dnl ***********************************************

! if test $WithSQLite = yes; then
  AC_CHECK_HEADER(sqlite.h,, AC_MSG_ERROR([sqlite.h header not found]))
  AC_CHECK_LIB(sqlite,sqlite_open,,AC_MSG_ERROR([sqlite.h and libsqlite required to build SQLite building.]))