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
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
|
$NetBSD: patch-ab,v 1.21 2013/07/06 23:14:07 wiz Exp $
--- configure.orig 2010-01-26 16:01:10.000000000 +0000
+++ configure
@@ -2822,11 +2822,18 @@ case "${host_os}" in
# For the build number: months since Jan 2000, day of month from the timestamp
# For the revision number: hour, minute from the timestamp
if test $GRAPHVIZ_VERSION_MICRO != "0"; then
- GRAPHVIZ_VERSION_BUILD=`expr \( ${GRAPHVIZ_VERSION_MICRO:0:4} - 2000 \) \* 12 + ${GRAPHVIZ_VERSION_MICRO:4:2}`${GRAPHVIZ_VERSION_MICRO:6:2}
- GRAPHVIZ_VERSION_REVISION=${GRAPHVIZ_VERSION_MICRO:9:4}
+ # JR: patch from Michael van Elst:
+ # if we have a shellm we should have a working awk, too
+ eval `echo "$GRAPHVIZ_VERSION_MICRO" | awk '{
+ print "GRAPHVIZ_VERSION_BUILD=" \
+ (substr($1,1,4)-2000)*12+substr($1,5,2) \
+ substr($1,7,2)
+ print "GRAPHVIZ_VERSION_REVISION=" \
+ substr($1,10,4)
+ }'`
fi
;;
-esac
+esac
@@ -2835,7 +2842,7 @@ case "${host_os}" in
*linux* )
case "${host_cpu}" in
powerpc64 | s390x | x86_64 )
- LIBPOSTFIX="64"
+ LIBPOSTFIX=""
;;
esac
;;
@@ -6850,6 +6857,9 @@ test -n "$RC" || RC="false"
;;
*-sgi-irix* )
;;
+ *-ibm-aix* )
+ CC=cc_r
+ ;;
esac
else
for ac_prog in windres
@@ -24867,7 +24877,7 @@ $as_echo_n "checking for Lua headers and
LUA_VERSION=`$PKGCONFIG --modversion lua$l`
LUA_INCLUDES="$LUA_CFLAGS "`$PKGCONFIG --cflags lua$l`
LUA_LIBS="$LUA_LFLAGS "`$PKGCONFIG --libs lua$l`
- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`"
+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/`$PKGCONFIG --variable=V lua`"
pkgconfig_lualib_found=`$PKGCONFIG --exists lualib$l 2>/dev/null`
if test "x$?" = "x0"; then
@@ -24931,7 +24941,7 @@ $as_echo_n "checking for Lua headers and
LUA_INCLUDES=`$LUACONFIG --include`
LUA_LIBS=`$LUACONFIG --libs`
LUA_VERSION="5.0.x"
- LUA_INSTALL_DIR="/usr/lib$LIBPOSTFIX/lua/5.0"
+ LUA_INSTALL_DIR="${PREFIX}/lib$LIBPOSTFIX/lua/5.0"
fi
fi
@@ -25403,7 +25413,7 @@ fi
{ $as_echo "$as_me:$LINENO: checking for Lua compiling and linking" >&5
$as_echo_n "checking for Lua compiling and linking... " >&6; }
- LUA_TEST=`LT=luatest.c ; echo "#include <lua.h>" > $LT; echo "#include <lualib.h>" >> $LT; echo "int main() { luaopen_base((lua_State *)lua_open()); return 0; }" >> $LT ; $CC -Wall $LT -o $LT.out $LUA_INCLUDES $LUA_LIBS $CFLAGS $LDFLAGS 1>/dev/null 2>&1 ; echo $?; rm -f $LT $LT.out 1>/dev/null 2>&1`
+ LUA_TEST=`LT=luatest.c ; echo "#include <lua.h>" > $LT; echo "#include <lualib.h>" >> $LT; echo "int main() { luaopen_base((lua_State *)luaL_newstate()); return 0; }" >> $LT ; $CC -Wall $LT -o $LT.out $LUA_INCLUDES $LUA_LIBS $CFLAGS $LDFLAGS 1>/dev/null 2>&1 ; echo $?; rm -f $LT $LT.out 1>/dev/null 2>&1`
if test "x$LUA_TEST" != "x0" ; then
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
@@ -25535,8 +25545,8 @@ $as_echo "no" >&6; }
fi
- OCAML_INCLUDES=-I/usr/lib$LIBPOSTFIX/ocaml
- OCAML_LIBS=-L/usr/lib$LIBPOSTFIX/ocaml
+ OCAML_INCLUDES=-I${PREFIX}/lib$LIBPOSTFIX/ocaml
+ OCAML_LIBS=-L${PREFIX}/lib$LIBPOSTFIX/ocaml
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
if test "${ac_cv_header_caml_mlvalues_h+set}" = set; then
@@ -26003,13 +26013,13 @@ fi
if test "x$PHP" = "x"; then
use_php="No (php not available)"
else
- if test -d /usr/include/php5; then
- PHP_INCLUDES="-I/usr/include/php5 -I/usr/include/php5/main -I/usr/include/php5/Zend -I/usr/include/php5/TSRM"
+ if test -d ${PREFIX}/include/php5; then
+ PHP_INCLUDES="-I${PREFIX}/include/php5 -I${PREFIX}/include/php5/main -I${PREFIX}/include/php5/Zend -I${PREFIX}/include/php5/TSRM"
else
- PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
+ PHP_INCLUDES="-I${PREFIX}/include/php -I${PREFIX}/include/php/main -I${PREFIX}/include/php/Zend -I${PREFIX}/include/php/TSRM"
fi
- PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules"
- PHP_INSTALL_DATADIR="/usr/share/php"
+ PHP_INSTALL_DIR="${PREFIX}/lib${LIBPOSTFIX}/php/modules"
+ PHP_INSTALL_DATADIR="${PREFIX}/share/php"
PHP_LIBS=
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
@@ -32259,7 +32269,7 @@ fi
# Check whether --with-platformsdkincludedir was given.
if test "${with_platformsdkincludedir+set}" = set; then
- withval=$with_platformsdkincludedir; PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE//'\\'/\\\\}; PLATFORMSDKINCLUDE_ESCAPED=${PLATFORMSDKINCLUDE_ESCAPED// /\\ }
+ withval=$with_platformsdkincludedir; PLATFORMSDKINCLUDE=$withval; PLATFORMSDKINCLUDE_ESCAPED=`echo ${PLATFORMSDKINCLUDE} | sed "s/'\\'/\\\\/g" | sed "s/ /\\ /g"`
fi
@@ -34907,10 +34917,12 @@ cat >>conftest.$ac_ext <<_ACEOF
#include <stdio.h>
#include <assert.h>
+ #include <time.h>
#define PI 3.14159265358979323846
extern void sincos(double x, double *s, double *c);
int main () {
double sinx=0.0, cosx=1.0;
+ sincos(time(NULL)&1,&sinx,&cosx);
sincos(PI/2.0,&sinx,&cosx);
assert(sinx>0.9999999);
assert(sinx<1.0000001);
@@ -38777,7 +38791,7 @@ else
use_gv_tcl="Yes"
fi
if test "x$use_gd" != "xYes"; then
- if test "x$use_gd" == "xYes (internal)"; then
+ if test "x$use_gd" = "xYes (internal)"; then
use_gdtclft="Yes"
else
use_gdtclft="No (gd not available)"
|
