[Scsh-checkins] CVS: scsh Makefile.in,1.55,1.56 configure,1.19,1.20 configure.in,1.21,1.22 initial.image,1.6,1.7 sysdep.h.in,1.6,1.7

["Brian D. Carlstrom" <bdc@users.sourceforge.net>]

Update of /cvsroot/scsh/scsh
In directory usw-pr-cvs1:/tmp/cvs-serv3286

Modified Files:
        Makefile.in configure configure.in initial.image sysdep.h.in 
Log Message:
Fixing up ODBC stuff so it builds on Unix

Index: Makefile.in
===================================================================
RCS file: /cvsroot/scsh/scsh/Makefile.in,v
retrieving revision 1.55
retrieving revision 1.56
diff -C2 -r1.55 -r1.56
*** Makefile.in 2001/02/25 19:51:55     1.55
--- Makefile.in 2001/02/25 21:07:49     1.56
***************
*** 4,11 ****
  # Documentation in files INSTALL and doc/install.txt
  
! ODBC=/cygdrive/d/Program Files/Microsoft Platform SDK
! #ODBCCPPFLAGS="-I$(ODBC)/Include/"
! ODBCLDFLAGS="-L$(ODBC)/Lib/"
! ODBCLIBS=-lodbc32
  
  srcdir = @srcdir@
--- 4,9 ----
  # Documentation in files INSTALL and doc/install.txt
  
! ODBCDIR       =/cygdrive/c/Program Files/Microsoft Platform SDK
! ODBCLDFLAGS   ="-L$(ODBCDIR)/Lib/"
  
  srcdir = @srcdir@
***************
*** 14,21 ****
  DEFS = @DEFS@
  EXEEXT = @EXEEXT@
! LIBS = @LIBS@ $(ODBCLIBS)
  #DBOPEN = @DBOPEN@
  CFLAGS = @CFLAGS@
! CPPFLAGS= @CPPFLAGS@ -I$(srcdir)/cig -I$(srcdir)/scsh/regexp $(ODBCCPPFLAGS)
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@ -c
--- 12,19 ----
  DEFS = @DEFS@
  EXEEXT = @EXEEXT@
! LIBS = @LIBS@
  #DBOPEN = @DBOPEN@
  CFLAGS = @CFLAGS@
! CPPFLAGS= @CPPFLAGS@ -I$(srcdir)/cig -I$(srcdir)/scsh/regexp
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@ -c
***************
*** 133,137 ****
  #     scsh/dbm.o scsh/dbm1.o
  
! SCSHODBCOBJS = \
        scsh/odbc/scsh-odbc.o  \
        scsh/odbc/odbc0.o \
--- 131,135 ----
  #     scsh/dbm.o scsh/dbm1.o
  
! ODBCOBJS = \
        scsh/odbc/scsh-odbc.o  \
        scsh/odbc/odbc0.o \
***************
*** 139,142 ****
--- 137,142 ----
        scsh/odbc/odbc2.o \
  #
+ 
+ SCSHODBCOBJS = @SCSHODBCOBJS@
  
  OBJS = unix.o dynload.o prescheme.o extension.o scheme48vm.o \

Index: configure
===================================================================
RCS file: /cvsroot/scsh/scsh/configure,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** configure   1999/08/10 17:14:48     1.19
--- configure   2001/02/25 21:07:49     1.20
***************
*** 2,6 ****
  
  # Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.12 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
  #
--- 2,6 ----
  
  # Guess values for system-dependent variables and create Makefiles.
! # Generated automatically using autoconf version 2.13 
  # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
[...1695 lines suppressed...]
  s%@CXXFLAGS@%$CXXFLAGS%g
+ s%@FFLAGS@%$FFLAGS%g
  s%@DEFS@%$DEFS%g
  s%@LDFLAGS@%$LDFLAGS%g
***************
*** 2414,2417 ****
--- 2587,2591 ----
  s%@CC@%$CC%g
  s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
+ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
  s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@RANLIB@%$RANLIB%g
***************
*** 2423,2426 ****
--- 2597,2601 ----
  s%@ENDIAN@%$ENDIAN%g
  s%@LDFLAGS_AIX@%$LDFLAGS_AIX%g
+ s%@SCSHODBCOBJS@%$SCSHODBCOBJS%g
  s%@TMPDIR@%$TMPDIR%g
  

Index: configure.in
===================================================================
RCS file: /cvsroot/scsh/scsh/configure.in,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** configure.in        1999/08/10 17:14:48     1.21
--- configure.in        2001/02/25 21:07:49     1.22
***************
*** 350,357 ****
--- 350,359 ----
  AC_CHECK_LIB(dld, shl_findsym)
  dnl   AC_CHECK_LIB(mld, main)
+ AC_CHECK_LIB(odbc32, SQLAllocConnect)
  
  AC_RETSIGTYPE
  AC_HAVE_HEADERS(libgen.h sys/timeb.h posix/time.h sys/select.h nlist.h)
  AC_HAVE_HEADERS(sys/un.h)
+ AC_HAVE_HEADERS(windows.h)
  AC_HAVE_FUNCS(strerror)
  AC_HAVE_FUNCS(dlopen gettimeofday ftime nlist select setitimer sigaction)
***************
*** 370,373 ****
--- 372,379 ----
  CFLAGS1=${CFLAGS}
  
+ if test ! $HAVE_WINDOWS_H = ""; then
+   SCSHODBCOBJS="ODBCOBJS"
+ fi
+ 
  AC_SUBST(AIX_P)
  AC_SUBST(AR)
***************
*** 380,383 ****
--- 386,390 ----
  AC_SUBST(LDFLAGS_AIX)
  AC_SUBST(LIBS)
+ AC_SUBST(SCSHODBCOBJS)
  AC_SUBST(TMPDIR)
  

Index: initial.image
===================================================================
RCS file: /cvsroot/scsh/scsh/initial.image,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
Binary files /tmp/cvsQTbR3f and /tmp/cvsWGODbn differ

Index: sysdep.h.in
===================================================================
RCS file: /cvsroot/scsh/scsh/sysdep.h.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** sysdep.h.in 1999/07/15 01:24:05     1.6
--- sysdep.h.in 2001/02/25 21:07:49     1.7
***************
*** 141,144 ****
--- 141,148 ----
  #undef HAVE_CONST_SYS_ERRLIST
  
+ /* Define if we have a Windows header file. It's possible even on Unix
+    if we are using ODBC so we don't move it to scsh/win32/sysdep.h */
+ #undef HAVE_WINDOWS_H
+ 
  /* Include info we know about the system from config.scsh */
  #include "scsh/machine/sysdep.h"