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
82
83
84
85
86
87
88
89
90
91
92
93
94
95
|
x_{includes,libraries} should be set *before* using them...
--- config/configure.in.old
+++ config/configure.in
@@ -9,6 +9,21 @@
ICE_CXX_BOOL
ICE_CXX_LONG_LONG
AC_PATH_X
+
+#
+# On Gentoo and hpux10 both x_includes and x_libraries are set to ""
+# This causes compiler options like '-I' and '-L', which break
+# the build. So, we avoid empty strings here.
+#
+if test -z "$x_includes"
+then
+ x_includes=.
+fi
+if test -z "$x_libraries"
+then
+ x_libraries=.
+fi
+
CXXFLAGS="$CXXFLAGS -I$x_includes"
case $host_os in
linux*)
@@ -306,21 +321,6 @@
AC_SUBST(USE_MOD_VERSIONS)
dnl Check for usleep(). Currently, only HP-UX doesn't have it.
AC_CHECK_FUNCS(usleep)
-
-#
-# On hpux10 both x_includes and x_libraries seem to be set to ""
-# This causes compiler options like '-I' and '-L', which break
-# the build. So, we avoid empty strings here.
-#
-if test -z "$x_includes"
-then
- x_includes=.
-fi
-if test -z "$x_libraries"
-then
- x_libraries=.
-fi
-
AC_SUBST(host_dir)
AC_SUBST(NetMeter_Default_Setting)
--- configure.old
+++ configure
@@ -3163,6 +3163,21 @@
echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
fi
+
+#
+# On Gentoo and hpux10 both x_includes and x_libraries are set to ""
+# This causes compiler options like '-I' and '-L', which break
+# the build. So, we avoid empty strings here.
+#
+if test -z "$x_includes"
+then
+ x_includes=.
+fi
+if test -z "$x_libraries"
+then
+ x_libraries=.
+fi
+
CXXFLAGS="$CXXFLAGS -I$x_includes"
case $host_os in
linux*)
@@ -5218,21 +5233,6 @@
fi
done
-
-#
-# On hpux10 both x_includes and x_libraries seem to be set to ""
-# This causes compiler options like '-I' and '-L', which break
-# the build. So, we avoid empty strings here.
-#
-if test -z "$x_includes"
-then
- x_includes=.
-fi
-if test -z "$x_libraries"
-then
- x_libraries=.
-fi
-
|
GitWeb