Attachment 146785 Details for Bug 223557 – Patch to fix build of odbc lib.

[patch] Patch to fix build of odbc lib.

mdbtools-odbc.patch (text/plain), 3.30 KB, created by Dominik 'Rathann' Mierzejewski on 2007-01-28 21:55:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dominik 'Rathann' Mierzejewski

Created: 2007-01-28 21:55:49 UTC

Size: 3.30 KB

patch

obsolete

>--- mdbtools-0.5/src/odbc/Makefile.am.odbc	2002-12-27 21:31:30.000000000 +0100
>+++ mdbtools-0.5/src/odbc/Makefile.am	2007-01-28 22:35:53.000000000 +0100
>@@ -6,13 +6,13 @@
> 				data.c like.c table.c dump.c file.c mem.c
> bin_PROGRAMS	=	unittest
> lib_LTLIBRARIES	=	libmdbodbc.la
>-INCLUDES	=	-I ../../include `glib-config --cflags`
>+INCLUDES	=	-I ../../include `pkg-config --cflags glib-2.0`
> libmdbodbc_la_SOURCES=	odbc.c connectparams.c
> libmdbodbc_la_LIBADD=	$(patsubst %, $(SQLDIR)/%, \
> 				$(patsubst %.c, %.lo, $(SQLSOURCES))) \
> 				$(patsubst %, $(MDBDIR)/%, \
>-				$(patsubst %.c, %.lo, $(MDBSOURCES))) -lglib
>-LIBS	=	@LEXLIB@ `glib-config --libs`
>+				$(patsubst %.c, %.lo, $(MDBSOURCES))) -lglib-2.0
>+LIBS	=	@LEXLIB@ `pkg-config --libs glib-2.0`
> unittest_LDADD	=	libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
> 
> ## Need blank statement to avoid compiling odbc.c
>--- mdbtools-0.5/src/odbc/connectparams.c.odbc	2002-04-09 03:19:26.000000000 +0200
>+++ mdbtools-0.5/src/odbc/connectparams.c	2007-01-28 22:40:26.000000000 +0100
>@@ -19,6 +19,7 @@
> 
> #include <stdlib.h>
> #include <stdio.h>
>+#include <ctype.h>
> #include <string.h>
> #include <sys/stat.h>
> 
>@@ -77,6 +78,8 @@
>    }
> }
> 
>+int LoadDSN(const gchar* iniFileName, const gchar* dsnName, GHashTable* table);
>+
> /*
>  * Find the settings for the specified ODBC DSN
>  */
>--- mdbtools-0.5/src/odbc/unittest.c.odbc	2002-04-09 03:19:26.000000000 +0200
>+++ mdbtools-0.5/src/odbc/unittest.c	2007-01-28 22:40:54.000000000 +0100
>@@ -20,7 +20,7 @@
> /* #include <windows.h> */
> #include <sql.h>
> #include <sqlext.h>
>-
>+#include <stdlib.h>
> #include <stdio.h>
> 
> static char  software_version[]   = "$Id: unittest.c,v 1.6 2002/04/09 01:19:26 brianb Exp $";
>--- mdbtools-0.5/src/odbc/odbc.c.odbc	2003-01-15 03:02:09.000000000 +0100
>+++ mdbtools-0.5/src/odbc/odbc.c	2007-01-28 22:35:53.000000000 +0100
>@@ -47,7 +47,9 @@
> static SQLRETURN SQL_API _SQLFreeEnv(SQLHENV henv);
> static SQLRETURN SQL_API _SQLFreeStmt(SQLHSTMT hstmt, SQLUSMALLINT fOption);
> 
>-#define MIN(a,b) (a>b ? b : a)
>+#ifndef MIN
>+  #define MIN(a,b) (a>b ? b : a)
>+#endif
> #define _MAX_ERROR_LEN 255
> static char lastError[_MAX_ERROR_LEN+1];
> 
>@@ -176,6 +178,8 @@
> 	return SQL_SUCCESS;
> }
> 
>+static void bind_columns(struct _hstmt *stmt);
>+
> SQLRETURN SQL_API SQLExtendedFetch(
>     SQLHSTMT           hstmt,
>     SQLUSMALLINT       fFetchType,
>@@ -1445,6 +1449,7 @@
> 	case SQL_DECIMAL:
> 	case SQL_NUMERIC:
> 	case SQL_FLOAT:
>+	  break;
> 	}
> }
> static SQLSMALLINT _odbc_get_client_type(int srv_type)
>--- mdbtools-0.5/src/odbc/Makefile.in.odbc	2003-01-19 02:55:42.000000000 +0100
>+++ mdbtools-0.5/src/odbc/Makefile.in	2007-01-28 22:35:53.000000000 +0100
>@@ -110,14 +110,14 @@
> 
> bin_PROGRAMS = unittest
> lib_LTLIBRARIES = libmdbodbc.la
>-INCLUDES = -I ../../include `glib-config --cflags`
>+INCLUDES = -I ../../include `pkg-config --cflags glib-2.0`
> libmdbodbc_la_SOURCES = odbc.c connectparams.c
> libmdbodbc_la_LIBADD = $(patsubst %, $(SQLDIR)/%, \
> 				$(patsubst %.c, %.lo, $(SQLSOURCES))) \
> 				$(patsubst %, $(MDBDIR)/%, \
>-				$(patsubst %.c, %.lo, $(MDBSOURCES))) -lglib
>+				$(patsubst %.c, %.lo, $(MDBSOURCES))) -lglib-2.0
> 
>-LIBS = @LEXLIB@ `glib-config --libs`
>+LIBS = @LEXLIB@ `pkg-config --libs glib-2.0`
> unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
> subdir = src/odbc
> mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs

Actions: View | Diff

Attachments on bug 223557: 146785