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
|
===================================================================
RCS file: /cvsroot/tora/tora/configure.pl,v
retrieving revision 1.181
retrieving revision 1.182
diff -u -r1.181 -r1.182
--- configure.pl 2005/02/24 18:40:37 1.181
+++ configure.pl 2005/03/13 14:28:52 1.182
@@ -1012,12 +1012,13 @@
print "QSql ";
}
print "\n";
-
+ if ($OracleFound) {
$LFlags.="\"-L".$ENV{ORACLE_HOME}."/lib32\" ";
$LFlags.="\"-L".$ENV{ORACLE_HOME}."/lib\" ";
$LFlags.="\"-L".$ENV{ORACLE_HOME}."\" ";
+ }
$LFlags.="\"-L".$QtLib."\" ";
- if ($OracleRelease =~ /^8.0/) {
+ if ($OracleFound && $OracleRelease =~ /^8.0/) {
$LFlags.="\"$ENV{ORACLE_HOME}/lib/scorept.o\" ";
$LFlags.="\"-lcore4\" ";
$LFlags.="\"-lnlsrtl3\" ";
@@ -1047,17 +1048,21 @@
print "$extra\n";
if (!$NoRPath) {
- $LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."/lib32\" ";
- $LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."/lib\" ";
- $LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."\" ";
+ if ($OracleFound) {
+ $LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."/lib32\" ";
+ $LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."/lib\" ";
+ $LFlags.="-Xlinker \"--rpath=".$ENV{ORACLE_HOME}."\" ";
+ }
$LFlags.="-Xlinker \"--rpath\=$QtLib\" ";
}
- $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/rdbms/demo");
- $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/plsql/public");
- $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/rdbms/public");
- $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/network/public");
- $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/sdk/include");
+ if ($OracleFound) {
+ $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/rdbms/demo");
+ $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/plsql/public");
+ $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/rdbms/public");
+ $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/network/public");
+ $Includes=&addInclude($Includes,$ENV{ORACLE_HOME}."/sdk/include");
+ }
if ( $ENV{C_INCLUDE_PATH} ) {
$Includes=&addInclude($Includes,$ENV{C_INCLUDE_PATH});
}
|
GitWeb
