|
From: <kr_...@us...> - 2004-01-04 16:25:04
|
Update of /cvsroot/htoolkit/HSQL
In directory sc8-pr-cvs1:/tmp/cvs-serv30892
Modified Files:
configure.ac
Log Message:
bugfix
Index: configure.ac
===================================================================
RCS file: /cvsroot/htoolkit/HSQL/configure.ac,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** configure.ac 4 Jan 2004 13:14:54 -0000 1.6
--- configure.ac 4 Jan 2004 16:25:00 -0000 1.7
***************
*** 67,71 ****
],
[GHC_DIR="$withval"],
! [GHC_DIR=`$GHC --print-libdir`]
)
--- 67,73 ----
],
[GHC_DIR="$withval"],
! [if test "$GHC" != ""; then
! GHC_DIR=`$GHC --print-libdir`
! fi]
)
***************
*** 142,149 ****
AC_ARG_WITH(hugs-dir,
[ --with-hugs-dir=<hugs directory>
! Install Hugs libraries in the given Hugs directory (default is the path to hugs)
],
[HUGS_DIR="$withval"],
! [HUGS_DIR=$(dirname $HUGS)]
)
--- 144,157 ----
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]
)
***************
*** 226,230 ****
}
],
! [LDFLAGS="${LDFLAGS} -lodbc32"],
AC_MSG_ERROR([sqlext.h and libodbc required to build ODBC building.]))
CPPFLAGS="$CPPFLAGS -DWINODBC"
--- 234,238 ----
}
],
! [LIBS="${LIBS} -lodbc32"],
AC_MSG_ERROR([sqlext.h and libodbc required to build ODBC building.]))
CPPFLAGS="$CPPFLAGS -DWINODBC"
***************
*** 291,294 ****
--- 299,303 ----
dnl ***********************************************
+ LDFLAGS="${LIBS} ${LDFLAGS}"
LIB_DIRS='"'${GHC_DIR}'"'
|