From 5f4e22a2b427e5439fb2a8d1af55105d50f97bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Wed, 21 Oct 1998 22:05:08 -0700
Subject: [PATCH] ODBC now works on NT
Rev: NT/tools/grep:1.2
Rev: src/encode.c:1.25
Rev: src/modules/Odbc/configure.in:1.13
Rev: src/run_autoconfig:1.26
---
NT/tools/grep | 2 +-
src/encode.c | 4 ++--
src/modules/Odbc/configure.in | 16 +++++++++++++++-
src/run_autoconfig | 9 ++++++++-
4 files changed, 26 insertions(+), 5 deletions(-)
diff --git a/NT/tools/grep b/NT/tools/grep
index 8e99685953..82d631dcbc 100755
--- a/NT/tools/grep
+++ b/NT/tools/grep
@@ -4,7 +4,7 @@ inherit "lib.pike";
int main(int argc, string *argv)
{
- if(argc>2 && sscanf(argv[-1],"/usr/%s"))
+ if(argc>2 && sscanf(argv[-1],"/usr/%*s"))
exit(1);
exece(find_next_in_path(argv[0],"grep"),argv[1..]);
diff --git a/src/encode.c b/src/encode.c
index b01c27e288..57e774b9d6 100644
--- a/src/encode.c
+++ b/src/encode.c
@@ -23,7 +23,7 @@
#include "stuff.h"
#include "version.h"
-RCSID("$Id: encode.c,v 1.24 1998/10/11 18:17:26 marcus Exp $");
+RCSID("$Id: encode.c,v 1.25 1998/10/22 05:02:22 hubbe Exp $");
#ifdef _AIX
#include <net/nh.h>
@@ -405,10 +405,10 @@ static void encode_value2(struct svalue *val, struct encode_data *data)
if(p->init || p->exit || p->gc_marked || p->gc_check ||
(p->flags & PROGRAM_HAS_C_METHODS))
error("Cannot encode C programs.\n");
+ code_entry(val->type, 1,data);
f_version(0);
encode_value2(sp-1,data);
pop_stack();
- code_entry(val->type, 1,data);
code_number(p->flags,data);
code_number(p->storage_needed,data);
code_number(p->timestamp.tv_sec,data);
diff --git a/src/modules/Odbc/configure.in b/src/modules/Odbc/configure.in
index 1a45ac52bc..28e7d330b7 100644
--- a/src/modules/Odbc/configure.in
+++ b/src/modules/Odbc/configure.in
@@ -1,5 +1,5 @@
#
-# $Id: configure.in,v 1.12 1998/10/19 00:50:23 grubba Exp $
+# $Id: configure.in,v 1.13 1998/10/22 05:05:08 hubbe Exp $
#
# Configure script for the odbc-module
#
@@ -18,6 +18,19 @@ OLD_CPPFLAGS=$CPPFLAGS
AC_ARG_WITH(odbc, [ --without-odbc no support for ODBC databases],[],[with_odbc=yes])
if test x$with_odbc = xyes; then
+ if test "x$pike_cv_sys_os" = "xWindows_NT" ; then
+ AC_DEFINE(HAVE_WINDOWS_H)
+ AC_DEFINE(HAVE_SQL_H)
+ AC_DEFINE(HAVE_SQLEXT_H)
+ AC_DEFINE(HAVE_ODBC)
+ LIBS="-lodbc32 $LIBS"
+ pike_cv_odbc=yes
+ cat <<EOF
+
+ODBC support enabled.
+
+EOF
+ else
AC_MSG_CHECKING(for ODBC library-directory)
@@ -152,6 +165,7 @@ so that libodbc.so finds the appropriate files.
EOF
fi
+ fi
else
:
fi
diff --git a/src/run_autoconfig b/src/run_autoconfig
index b70adbce75..e8c8aeac1e 100755
--- a/src/run_autoconfig
+++ b/src/run_autoconfig
@@ -1,11 +1,18 @@
#!/bin/sh
#
-# $Id: run_autoconfig,v 1.25 1998/09/24 17:36:39 grubba Exp $
+# $Id: run_autoconfig,v 1.26 1998/10/22 05:02:23 hubbe Exp $
#
# Bootstrap script
need_to_make_depend=no
+case :$PATH: in
+ */NT/tools:*)
+ echo Stripping NT/tools from path temporarily...
+ PATH=`echo :$PATH | sed 's@:[^:]*/NT/tools:@@g' | sed 's@^:@@'`
+ ;;
+esac
+
if test "x$1" = "x" ; then
base=`echo $0 | sed 's@[^/]*$@@g'`
if test "x$base" != "x" ; then
--
GitLab