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
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
|
diff -ur XSB.orig/packages/dbdrivers/odbc/configure XSB/packages/dbdrivers/odbc/configure
--- XSB.orig/packages/dbdrivers/odbc/configure 2003-09-29 21:40:01.000000000 +1200
+++ XSB/packages/dbdrivers/odbc/configure 2007-01-28 12:01:01.000000000 +1300
@@ -564,10 +564,10 @@
if test -z "$with_config"; then
-echo '
-- You did not tell me what kind of host system you want to configure.
-- I will attempt to guess the kind of system this is.
-' 1>&6
+#echo '
+#- You did not tell me what kind of host system you want to configure.
+#- I will attempt to guess the kind of system this is.
+#' 1>&6
# Make sure we can run config.sub.
if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
@@ -626,8 +626,8 @@
LDFLAGS="-L${with_odbc_libdir} ${LDFLAGS}"
fi
-echo $ac_n "checking for in -lodbc""... $ac_c" 1>&6
-echo "configure:631: checking for in -lodbc" >&5
+echo $ac_n "checking for SQLAllocEnv in -lodbc""... $ac_c" 1>&6
+echo "configure:631: checking for SQLAllocEnv in -lodbc" >&5
ac_lib_var=`echo odbc'_' | sed 'y%./+-%__p_%'`
if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -640,10 +640,10 @@
/* Override any gcc2 internal prototype to avoid an error. */
/* We use char because int might match the return type of a gcc2
builtin and then its argument prototype would still apply. */
-char ();
+char SQLAllocEnv ();
int main() {
-()
+return SQLAllocEnv ();
; return 0; }
EOF
if { (eval echo configure:650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
@@ -661,9 +661,9 @@
fi
if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
echo "$ac_t""yes" 1>&6
- odbc_error=yes
else
echo "$ac_t""no" 1>&6
+ odbc_error=yes
fi
@@ -809,9 +809,9 @@
support=yes
fi
-
-
-
+libdir=`odbc_config --lib-prefix`
+CFLAGS=`odbc_config --cflags`
+LDFLAGS=`odbc_config --libs`
diff -ur XSB.orig/packages/dbdrivers/odbc/odbc_driver_config.P XSB/packages/dbdrivers/odbc/odbc_driver_config.P
--- XSB.orig/packages/dbdrivers/odbc/odbc_driver_config.P 2006-02-12 18:21:03.000000000 +1300
+++ XSB/packages/dbdrivers/odbc/odbc_driver_config.P 2007-01-28 21:05:54.000000000 +1300
@@ -64,9 +64,8 @@
ConfigLibDir, Slash, ConfigLibDir, Slash))
; %% other unixes
fmt_write_string(LD_flags,
- ' %s %s %s%sdriver_manager.so %s%sodbc_driver.so -lodbc -ldl',
- f(OdbcRunpathFlag, ODBC_libdir_flag,
- ConfigLibDir, Slash, ConfigLibDir, Slash))
+ ' %s %s driver_manager.so -lodbc -ldl',
+ f(OdbcRunpathFlag, ODBC_libdir_flag))
),
package_configuration(dir(odbc_driver), ODBCDriverDir),
fmt_write_string(LD_directives_file,
|
GitWeb