dev-lang/mercury-extras/files/mercury-extras-0.13.1-odbc.patch


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41

--- mercury-extras-0.13.1.orig/odbc/Mmakefile	2006-04-04 13:49:14.000000000 +1200
+++ mercury-extras-0.13.1/odbc/Mmakefile	2008-08-22 19:27:49.000000000 +1200
@@ -36,22 +36,25 @@
 	MLLIBS=-lodbc32
 else 
 	#ODBC_LIB_DIR=$(IODBC_DIR)/lib
-	#ODBC_INCL_DIR=$(IODBC_DIR)/include
+	ODBC_CFLAGS=`odbc_config --cflags`
 
 	# The following are for Debian.
 
 	# for unixODBC
-	MLLIBS=-lodbc -lpthread -lltdl -ldl
+	MLLIBS=`odbc_config --libs`
 
 	# for iODBC
 	# MLLIBS=-liodbc l-pthread -ldl
 	# note: on a DEC Alpha using OSF1 remove the -ldl.
 endif
 
-MAIN_TARGET=odbc_test
+MAIN_TARGET=libodbc
 
 .PHONY: depend
-depend: odbc_test.depend
+depend: odbc.depend
+
+.PHONY: install
+install: libodbc.install
 
 .PHONY: check
 check:
@@ -62,7 +65,7 @@
 # `--no-ansi' is needed because the ODBC header files include C++-style
 # "//" comments.  `--no-ansi' allows recognition of C++-style "//" comments,
 # presuming you have gcc version 2.7.1 or greater.
-MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) -I$(ODBC_INCL_DIR)
+MGNUCFLAGS=--no-ansi -D$(MODBC_DRIVER) -D$(MODBC_DB) $(ODBC_CFLAGS)
 
 #-----------------------------------------------------------------------------#
 #-----------------------------------------------------------------------------#