[Scsh-checkins] CVS: scsh Makefile.in,1.56,1.57 configure,1.21,1.22 configure.in,1.23,1.24

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

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

Modified Files:
        Makefile.in configure configure.in 
Log Message:
Hopefully finally ODBC pass. Things working cleanly on cygwin

Index: Makefile.in
===================================================================
RCS file: /cvsroot/scsh/scsh/Makefile.in,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -r1.56 -r1.57
*** Makefile.in 2001/02/25 21:07:49     1.56
--- Makefile.in 2001/02/25 22:52:25     1.57
***************
*** 4,10 ****
  # Documentation in files INSTALL and doc/install.txt
  
- ODBCDIR       =/cygdrive/c/Program Files/Microsoft Platform SDK
- ODBCLDFLAGS   ="-L$(ODBCDIR)/Lib/"
- 
  srcdir = @srcdir@
  VPATH = @srcdir@
--- 4,7 ----
***************
*** 12,16 ****
  DEFS = @DEFS@
  EXEEXT = @EXEEXT@
! LIBS = @LIBS@
  #DBOPEN = @DBOPEN@
  CFLAGS = @CFLAGS@
--- 9,13 ----
  DEFS = @DEFS@
  EXEEXT = @EXEEXT@
! LIBS = @LIBS@ @SCSHODBCLIBS@
  #DBOPEN = @DBOPEN@
  CFLAGS = @CFLAGS@
***************
*** 20,24 ****
  INSTALL_DATA = @INSTALL_DATA@ -c
  
! LDFLAGS = -g @LDFLAGS@ $(ODBCLDFLAGS)
  LDFLAGS_AIX= @LDFLAGS_AIX@
  
--- 17,21 ----
  INSTALL_DATA = @INSTALL_DATA@ -c
  
! LDFLAGS = -g @LDFLAGS@
  LDFLAGS_AIX= @LDFLAGS_AIX@
  

Index: configure
===================================================================
RCS file: /cvsroot/scsh/scsh/configure,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -r1.21 -r1.22
*** configure   2001/02/25 21:44:23     1.21
--- configure   2001/02/25 22:52:25     1.22
***************
*** 1019,1025 ****
  fi
  
  
  echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
! echo "configure:1024: checking whether byte ordering is bigendian" >&5
  if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
    echo $ac_n "(cached) $ac_c" 1>&6
--- 1019,1120 ----
  fi
  
[...1227 lines suppressed...]
  s%@AR@%$AR%g
  s%@CFLAGS1@%$CFLAGS1%g
- s%@EXEEXT@%$EXEEXT%g
  s%@ENDIAN@%$ENDIAN%g
  s%@LDFLAGS_AIX@%$LDFLAGS_AIX%g
  s%@SCSHODBCOBJS@%$SCSHODBCOBJS%g
  s%@TMPDIR@%$TMPDIR%g
--- 2599,2610 ----
  s%@INSTALL_DATA@%$INSTALL_DATA%g
  s%@RANLIB@%$RANLIB%g
+ s%@EXEEXT@%$EXEEXT%g
  s%@CPP@%$CPP%g
  s%@AIX_P@%$AIX_P%g
  s%@AR@%$AR%g
  s%@CFLAGS1@%$CFLAGS1%g
  s%@ENDIAN@%$ENDIAN%g
  s%@LDFLAGS_AIX@%$LDFLAGS_AIX%g
+ s%@SCSHODBCLIBS@%$SCSHODBCLIBS%g
  s%@SCSHODBCOBJS@%$SCSHODBCOBJS%g
  s%@TMPDIR@%$TMPDIR%g

Index: configure.in
===================================================================
RCS file: /cvsroot/scsh/scsh/configure.in,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** configure.in        2001/02/25 21:44:23     1.23
--- configure.in        2001/02/25 22:52:25     1.24
***************
*** 228,231 ****
--- 228,233 ----
  AC_PROG_RANLIB
  AC_C_CONST
+ AC_CYGWIN
+ AC_EXEEXT
  
  AC_C_BIGENDIAN
***************
*** 324,328 ****
    *-*-cygwin32* )
      dir=cygwin32
-     EXEEXT=".exe"
    ;;
    
--- 326,329 ----
***************
*** 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)
--- 351,358 ----
***************
*** 372,376 ****
  CFLAGS1=${CFLAGS}
  
! if grep -c HAVE_WINDOWS_H confdefs.h > /dev/null; then
    SCSHODBCOBJS="\$(ODBCOBJS)"
  fi
--- 371,376 ----
  CFLAGS1=${CFLAGS}
  
! if test "$CYGWIN" = yes; then
!   SCSHODBCLIBS=-lodbc32
    SCSHODBCOBJS="\$(ODBCOBJS)"
  fi
***************
*** 386,389 ****
--- 386,390 ----
  AC_SUBST(LDFLAGS_AIX)
  AC_SUBST(LIBS)
+ AC_SUBST(SCSHODBCLIBS)
  AC_SUBST(SCSHODBCOBJS)
  AC_SUBST(TMPDIR)