]>
Commit | Line | Data |
---|---|---|
779b0eec JB |
1 | --- gdal-1.11.0/m4/ax_oracle_oci.m4.orig 2014-04-16 22:04:00.000000000 +0200 |
2 | +++ gdal-1.11.0/m4/ax_oracle_oci.m4 2014-06-14 17:01:57.071611368 +0200 | |
3 | @@ -156,12 +156,14 @@ | |
4 | dnl Depending on later Oracle version detection, | |
5 | dnl -lnnz10 flag might be removed for older Oracle < 10.x | |
6 | saved_LDFLAGS="$LDFLAGS" | |
7 | + saved_LIBS="$LIBS" | |
8 | if test -n "$oracle_include_dir" ; then | |
9 | - oci_ldflags="-L$oracle_lib_dir -lclntsh" | |
10 | + oci_ldflags="-L$oracle_lib_dir" | |
11 | else | |
12 | - oci_ldflags="-L$oracle_lib_dir -L$oracle_lib_dir2 -lclntsh" | |
13 | + oci_ldflags="-L$oracle_lib_dir -L$oracle_lib_dir2" | |
14 | fi | |
15 | LDFLAGS="$LDFLAGS $oci_ldflags" | |
16 | + LIBS="$LIBS -lclntsh" | |
17 | ||
18 | dnl | |
19 | dnl Check OCI headers | |
20 | @@ -231,7 +233,7 @@ | |
21 | ]] | |
22 | )], | |
23 | [ | |
24 | - ORACLE_OCI_LDFLAGS="$oci_ldflags" | |
25 | + ORACLE_OCI_LDFLAGS="$oci_ldflags -lclntsh" | |
26 | oci_lib_found="yes" | |
27 | AC_MSG_RESULT([yes]) | |
28 | ], | |
29 | @@ -245,6 +247,7 @@ | |
30 | ||
31 | CPPFLAGS="$saved_CPPFLAGS" | |
32 | LDFLAGS="$saved_LDFLAGS" | |
33 | + LIBS="$saved_LIBS" | |
34 | fi | |
35 | ||
36 | dnl |