[htoolkit-cvs] HSQL Makefile,1.14,1.15 config.mk.in,1.3,1.4 configure.ac,1.15,1.16

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

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

Modified Files:
	Makefile config.mk.in configure.ac 
Log Message:
The previous version of HSQL was installed in the GHC/Hugs directory. The new
version will be installed in separated directory. 
This simplifies creation of binary installations.


Index: Makefile
===================================================================
RCS file: /cvsroot/htoolkit/HSQL/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile	10 Apr 2004 17:58:42 -0000	1.14
--- Makefile	11 Apr 2004 16:00:00 -0000	1.15
***************
*** 146,151 ****
  
  install-ghc: $(HSQLLib) $(HI_SRC) docs
  	$(INSTALL) $(HSQLLib) $(GHC_DIR)/libHSsql.a
- 	$(INSTALL) -d $(GHC_DIR)/imports/Database
  	for i in $(patsubst $(BUILDDIR)/%,%,$(HI_SRC)); do \
  	   $(INSTALL) -d $(GHC_DIR)/imports/`dirname $$i`; \
--- 146,151 ----
  
  install-ghc: $(HSQLLib) $(HI_SRC) docs
+ 	$(INSTALL) -d $(GHC_DIR)
  	$(INSTALL) $(HSQLLib) $(GHC_DIR)/libHSsql.a
  	for i in $(patsubst $(BUILDDIR)/%,%,$(HI_SRC)); do \
  	   $(INSTALL) -d $(GHC_DIR)/imports/`dirname $$i`; \
***************
*** 155,160 ****
  	$(GHC_PKG) -u -g -i hsql.pkg
  	if test -f $(DOCDIR)/index.html; then  \
! 	   $(INSTALL) -d $(GHC_DIR)/doc/html/libraries/hsql; \
! 	   $(INSTALL) -c $(DOCDIR)/* $(GHC_DIR)/doc/html/libraries/hsql; \
  	fi
  
--- 155,160 ----
  	$(GHC_PKG) -u -g -i hsql.pkg
  	if test -f $(DOCDIR)/index.html; then  \
! 	   $(INSTALL) -d $(DOC_DIR); \
! 	   $(INSTALL) -c $(DOCDIR)/* $(DOC_DIR); \
  	fi
  

Index: config.mk.in
===================================================================
RCS file: /cvsroot/htoolkit/HSQL/config.mk.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** config.mk.in	26 Jan 2004 13:02:02 -0000	1.3
--- config.mk.in	11 Apr 2004 16:00:00 -0000	1.4
***************
*** 1,26 ****
! WithODBC=@WithODBC@
! WithPostgreSQL=@WithPostgreSQL@
! WithMySQL=@WithMySQL@
! WithSQLite=@WithSQLite@
! 
! SO_EXT = @SO_EXT@
! 
! WIN32=@WIN32@
! 
! AR = @AR@
! LD = @LD@
! INSTALL = @INSTALL@
! 
! CPPFLAGS = @CPPFLAGS@
! LDFLAGS = @LDFLAGS@
! 
! HSC2HS = @HSC2HS@
! HADDOCK = @HADDOCK@
! 
! GHC     = @GHC@
! GHC_DIR = @GHC_DIR@
! GHC_PKG = @GHC_PKG@
! 
! HUGS     = @HUGS@
! HUGS_DIR = @HUGS_DIR@
! FFIHUGS  = @FFIHUGS@
--- 1,28 ----
! WithODBC=@WithODBC@
! WithPostgreSQL=@WithPostgreSQL@
! WithMySQL=@WithMySQL@
! WithSQLite=@WithSQLite@
! 
! SO_EXT = @SO_EXT@
! 
! WIN32=@WIN32@
! 
! AR = @AR@
! LD = @LD@
! INSTALL = @INSTALL@
! 
! CPPFLAGS = @CPPFLAGS@
! LDFLAGS = @LDFLAGS@
! 
! HSC2HS = @HSC2HS@
! 
! HADDOCK = @HADDOCK@
! DOC_DIR = @DOC_DIR@
! 
! GHC     = @GHC@
! GHC_DIR = @GHC_DIR@
! GHC_PKG = @GHC_PKG@
! 
! HUGS     = @HUGS@
! HUGS_DIR = @HUGS_DIR@
! FFIHUGS  = @FFIHUGS@

Index: configure.ac
===================================================================
RCS file: /cvsroot/htoolkit/HSQL/configure.ac,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** configure.ac	10 Apr 2004 17:58:42 -0000	1.15
--- configure.ac	11 Apr 2004 16:00:00 -0000	1.16
***************
*** 69,93 ****
  fi
  
! AC_SUBST(GHC)
! 
! dnl ***********************************************
! dnl GHC directory
! dnl ***********************************************
! AC_ARG_WITH(ghc-dir,
! [  --with-ghc-dir=<ghc directory>
!         Install GHC libraries in the given GHC directory (default is "ghc --print-libdir")
! ],
! [GHC_DIR="$withval"],
! [if test "$GHC" != ""; then
!    GHC_DIR=`$GHC --print-libdir`
!  fi]
! )
! 
! if test "$GHC" != ""; then
! 	if test "$GHC_DIR" = "" || test ! -d $GHC_DIR; then
! 	   AC_MSG_ERROR([GHC_DIR $GHC_DIR does not exist])
! 	fi
  fi
  
  AC_SUBST(GHC_DIR)
  
--- 69,79 ----
  fi
  
! if test "x$prefix" != xNONE; then
!     GHC_DIR="$prefix/lib/HSQL/GHC"
! else
!     GHC_DIR="$ac_default_prefix/lib/HSQL/Hugs"
  fi
  
+ AC_SUBST(GHC)
  AC_SUBST(GHC_DIR)
  
***************
*** 142,145 ****
--- 128,137 ----
  fi
  
+ if test "x$prefix" != xNONE; then
+     HUGS_DIR="$prefix/lib/HSQL/Hugs"
+ else
+     HUGS_DIR="$ac_default_prefix/lib/HSQL/Hugs"
+ fi
+ 
  case $ac_cv_target_alias in
      i[[3456]]86-*-cygwin*|i[[3456]]86-*-mingw32*)
***************
*** 149,178 ****
  
  AC_SUBST(HUGS)
- AC_SUBST(SO_EXT)
- 
- dnl ***********************************************
- dnl Hugs directory
- dnl ***********************************************
- AC_ARG_WITH(hugs-dir,
- [  --with-hugs-dir=<hugs directory>
-         Install Hugs libraries in the given Hugs directory (default is the Hugs libraries directory)
- ],
- [HUGS_DIR="$withval"],
- [if test "$HUGS" != ""; then
-    case $ac_cv_target_alias in
-       i[[3456]]86-*-cygwin*|i[[3456]]86-*-mingw32*)
-           HUGS_DIR=$(dirname $HUGS);;
-       *)  HUGS_DIR=$(dirname $HUGS)/../lib/hugs;;
-    esac
-  fi]
- )
- 
- if test "$HUGS" != ""; then
- 	if test "$HUGS_DIR" = "" || test ! -d $HUGS_DIR; then
- 	   AC_MSG_ERROR([HUGS_DIR $HUGS_DIR does not exist])
- 	fi
- fi
- 
  AC_SUBST(HUGS_DIR)
  
  dnl ***********************************************
--- 141,146 ----
  
  AC_SUBST(HUGS)
  AC_SUBST(HUGS_DIR)
+ AC_SUBST(SO_EXT)
  
  dnl ***********************************************
***************
*** 210,214 ****
--- 178,189 ----
  fi
  
+ if test "x$prefix" != xNONE; then
+     DOC_DIR="$prefix/doc/HSQL"
+ else
+     DOC_DIR="$ac_default_prefix/doc/HSQL"
+ fi
+ 
  AC_SUBST(HADDOCK)
+ AC_SUBST(DOC_DIR)
  
  dnl ***********************************************
***************
*** 351,355 ****
              ;;
          NO)
!             AC_CHECK_LIB(mysql,mysql_init,,AC_MSG_ERROR([libmysql.a library not found]))
              ;;
      esac
--- 326,330 ----
              ;;
          NO)
!             AC_CHECK_LIB(mysqlclient,mysql_init,,AC_MSG_ERROR([libmysql.a library not found]))
              ;;
      esac