|
Line
Link Here
|
| 0 |
-- config/configure.in.old |
0 |
++ config/configure.in |
|
Lines 9-14
Link Here
|
| 9 |
ICE_CXX_BOOL |
9 |
ICE_CXX_BOOL |
| 10 |
ICE_CXX_LONG_LONG |
10 |
ICE_CXX_LONG_LONG |
| 11 |
AC_PATH_X |
11 |
AC_PATH_X |
|
|
12 |
|
| 13 |
# |
| 14 |
# On Gentoo and hpux10 both x_includes and x_libraries are set to "" |
| 15 |
# This causes compiler options like '-I' and '-L', which break |
| 16 |
# the build. So, we avoid empty strings here. |
| 17 |
# |
| 18 |
if test -z "$x_includes" |
| 19 |
then |
| 20 |
x_includes=. |
| 21 |
fi |
| 22 |
if test -z "$x_libraries" |
| 23 |
then |
| 24 |
x_libraries=. |
| 25 |
fi |
| 26 |
|
| 12 |
CXXFLAGS="$CXXFLAGS -I$x_includes" |
27 |
CXXFLAGS="$CXXFLAGS -I$x_includes" |
| 13 |
case $host_os in |
28 |
case $host_os in |
| 14 |
linux*) |
29 |
linux*) |
|
Lines 306-326
Link Here
|
| 306 |
AC_SUBST(USE_MOD_VERSIONS) |
321 |
AC_SUBST(USE_MOD_VERSIONS) |
| 307 |
dnl Check for usleep(). Currently, only HP-UX doesn't have it. |
322 |
dnl Check for usleep(). Currently, only HP-UX doesn't have it. |
| 308 |
AC_CHECK_FUNCS(usleep) |
323 |
AC_CHECK_FUNCS(usleep) |
| 309 |
|
|
|
| 310 |
# |
| 311 |
# On hpux10 both x_includes and x_libraries seem to be set to "" |
| 312 |
# This causes compiler options like '-I' and '-L', which break |
| 313 |
# the build. So, we avoid empty strings here. |
| 314 |
# |
| 315 |
if test -z "$x_includes" |
| 316 |
then |
| 317 |
x_includes=. |
| 318 |
fi |
| 319 |
if test -z "$x_libraries" |
| 320 |
then |
| 321 |
x_libraries=. |
| 322 |
fi |
| 323 |
|
| 324 |
|
324 |
|
| 325 |
AC_SUBST(host_dir) |
325 |
AC_SUBST(host_dir) |
| 326 |
AC_SUBST(NetMeter_Default_Setting) |
326 |
AC_SUBST(NetMeter_Default_Setting) |
| 327 |
-- configure.old |
327 |
++ configure |
|
Lines 3163-3168
Link Here
|
| 3163 |
echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 |
3163 |
echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 |
| 3164 |
fi |
3164 |
fi |
| 3165 |
|
3165 |
|
|
|
3166 |
|
| 3167 |
# |
| 3168 |
# On Gentoo and hpux10 both x_includes and x_libraries are set to "" |
| 3169 |
# This causes compiler options like '-I' and '-L', which break |
| 3170 |
# the build. So, we avoid empty strings here. |
| 3171 |
# |
| 3172 |
if test -z "$x_includes" |
| 3173 |
then |
| 3174 |
x_includes=. |
| 3175 |
fi |
| 3176 |
if test -z "$x_libraries" |
| 3177 |
then |
| 3178 |
x_libraries=. |
| 3179 |
fi |
| 3180 |
|
| 3166 |
CXXFLAGS="$CXXFLAGS -I$x_includes" |
3181 |
CXXFLAGS="$CXXFLAGS -I$x_includes" |
| 3167 |
case $host_os in |
3182 |
case $host_os in |
| 3168 |
linux*) |
3183 |
linux*) |
|
Lines 5218-5238
Link Here
|
| 5218 |
fi |
5233 |
fi |
| 5219 |
done |
5234 |
done |
| 5220 |
|
5235 |
|
| 5221 |
|
|
|
| 5222 |
# |
| 5223 |
# On hpux10 both x_includes and x_libraries seem to be set to "" |
| 5224 |
# This causes compiler options like '-I' and '-L', which break |
| 5225 |
# the build. So, we avoid empty strings here. |
| 5226 |
# |
| 5227 |
if test -z "$x_includes" |
| 5228 |
then |
| 5229 |
x_includes=. |
| 5230 |
fi |
| 5231 |
if test -z "$x_libraries" |
| 5232 |
then |
| 5233 |
x_libraries=. |
| 5234 |
fi |
| 5235 |
|
| 5236 |
|
5236 |
|
| 5237 |
|
5237 |
|
| 5238 |
|
5238 |
|
