Compare commits
320 Commits
F-10-start
...
rawhide
Author | SHA1 | Date | |
---|---|---|---|
|
7513cdf248 | ||
|
05e4b1d074 | ||
|
c2276e33ca | ||
|
30971d5a25 | ||
|
ff79a90e46 | ||
|
0ec15827c5 | ||
|
71a7ec6ed1 | ||
|
595919defd | ||
|
9a8b223d88 | ||
|
519230f9de | ||
|
8d8d1dd380 | ||
|
ca5090298b | ||
|
b93a6781b5 | ||
|
5b8ce2dae9 | ||
|
44cc3b4ef2 | ||
|
2e3acff6b5 | ||
|
7180966e60 | ||
|
e9d5ffdbef | ||
|
c68359c5ff | ||
|
f139298a72 | ||
|
73ae39950d | ||
|
f00bcecf72 | ||
|
b0b4b82fa4 | ||
|
e08648fc87 | ||
|
2cbf116dab | ||
|
0661f83df8 | ||
|
fb3b36fdd4 | ||
|
d0fc2af2a8 | ||
|
e806029dbc | ||
|
4b5281594a | ||
|
e40b044aa2 | ||
|
83d1f6b928 | ||
|
6beacc7386 | ||
|
3860123a22 | ||
|
d39cd44462 | ||
|
17cb954c84 | ||
|
0fade7a110 | ||
|
d2e779b8b1 | ||
|
4af46d10ed | ||
|
b1e8d7acda | ||
|
12d8cb99fc | ||
|
67eea448aa | ||
|
f0418c521d | ||
|
1e4347627b | ||
|
7b6d0324be | ||
|
e628403b0a | ||
|
7cef623340 | ||
|
461d06f256 | ||
|
be52e6bf76 | ||
|
57287b1c27 | ||
|
6bb19c4e3e | ||
|
72681cc5f9 | ||
|
5de38a4db1 | ||
|
16173e3c05 | ||
|
cbf4456d94 | ||
|
e549e1ac8f | ||
|
7f0cbf5052 | ||
|
58d199e10b | ||
|
020ff7ace0 | ||
|
03d7cbf578 | ||
|
b51561d2e0 | ||
|
31890f3d63 | ||
|
451c877d6a | ||
|
4b1676d88c | ||
|
a761af07f2 | ||
|
3637b2302d | ||
|
15ea6ec86f | ||
|
be267c8c23 | ||
|
bc444dc713 | ||
|
8d349e144b | ||
|
4b7ae67b9b | ||
|
797f79bf5e | ||
|
3ab9cedbca | ||
|
a53efae604 | ||
|
2a5cc177aa | ||
|
640f0e1704 | ||
|
bd91107b65 | ||
|
0b98417c62 | ||
|
c688204f6c | ||
|
5a646c542a | ||
|
64e0f29620 | ||
|
aecdcea831 | ||
|
e7586429c0 | ||
|
025c3f1380 | ||
|
c0c41e24cc | ||
|
6ca33ddb47 | ||
|
40a160ae42 | ||
|
3f8565d003 | ||
|
7599212ab9 | ||
|
a20508296e | ||
|
dfaaa745ee | ||
|
0d2c834eff | ||
|
5b3bcf621c | ||
|
55b6e7d2be | ||
|
cbd3510f52 | ||
|
4ed72eede5 | ||
|
0c8f002962 | ||
|
ac1bcf2dbb | ||
|
825a1e8290 | ||
|
2bfea14eb0 | ||
|
0500a7ef92 | ||
|
805ff9107d | ||
|
18b77f9048 | ||
|
d29358b7cb | ||
|
7c9119e802 | ||
|
2da01074d3 | ||
|
d021e92254 | ||
|
5461340990 | ||
|
f691870b67 | ||
|
73e2ced459 | ||
|
f92e8ed7e1 | ||
|
d4931cf9fe | ||
|
c9e32e41ae | ||
|
4c84128f6d | ||
|
5e1c0d04ab | ||
|
bfe40ec2d6 | ||
|
420b6df744 | ||
|
8f0b09e730 | ||
|
64d69cd40a | ||
|
90d6678214 | ||
|
8e427bd007 | ||
|
3d25950541 | ||
|
442aa53108 | ||
|
d0e354736b | ||
|
abd8e55730 | ||
|
0946a1a94d | ||
|
9eecf19121 | ||
|
a34c48e7bd | ||
|
cccd8d37a2 | ||
|
1b199dfecd | ||
|
420616ec9d | ||
|
e8a3da06f8 | ||
|
c27974ae21 | ||
|
2763ad6087 | ||
|
3a694df227 | ||
|
e5c39fefcc | ||
|
00975ef640 | ||
|
31ad08a373 | ||
|
f83feb4c39 | ||
|
d90b6cee1f | ||
|
0e3c8ca2d0 | ||
|
e93f504d71 | ||
|
d3970578da | ||
|
6e4637efa6 | ||
|
cc256037ac | ||
|
4f115c2b34 | ||
|
9a23a74d90 | ||
|
09b58c6d2b | ||
|
a3ae878a51 | ||
|
49e23d16a2 | ||
|
5867985c23 | ||
|
2ec89c2f7b | ||
|
43bd022feb | ||
|
9a9c45a767 | ||
|
b6b470bfa1 | ||
|
fac5862484 | ||
|
a4be7ecd35 | ||
|
6fa2e1fe45 | ||
|
85ea6f9ddb | ||
|
afd149afdc | ||
|
2f6567369a | ||
|
436df066b9 | ||
|
b39288fb57 | ||
|
28605e9072 | ||
|
f54de177a4 | ||
|
18547b2cb5 | ||
|
7bad89d8c9 | ||
|
0442595d14 | ||
|
b5ed1e7a30 | ||
|
f3256ffb2c | ||
|
1b33b027fa | ||
|
91f229fac0 | ||
|
c4943b1680 | ||
|
f8c5924ade | ||
|
edba8e8e25 | ||
|
223dbdbb51 | ||
|
c9fbd9eb73 | ||
|
6b124b3974 | ||
|
999e5dffac | ||
|
c5f786a40d | ||
|
a46ba9827c | ||
|
381967c789 | ||
|
0dc2fdba00 | ||
|
4cc7005866 | ||
|
4798d22864 | ||
|
7606a35cc7 | ||
|
8d49402891 | ||
|
8a6562deeb | ||
|
a6f19328f7 | ||
|
cd9a5d5315 | ||
|
1bb7ed4994 | ||
|
827c236ca1 | ||
|
678cc2963a | ||
|
2c1f1f515e | ||
|
dcf4cbcd26 | ||
|
cb19172f78 | ||
|
22418b1ee4 | ||
|
bdfd1f6f0a | ||
|
70fadca40c | ||
|
caac4cf4ae | ||
|
f8ace90a81 | ||
|
0d989b54ef | ||
|
3c1820ac2f | ||
|
2c0eb2dca2 | ||
|
588da00d59 | ||
|
1fe8c83158 | ||
|
f89560b1ae | ||
|
0da52c71ab | ||
|
9afd9d7b6c | ||
|
861de67a76 | ||
|
24e9c20aa0 | ||
|
856457bdcf | ||
|
1f03e63cbc | ||
|
b99f86b43f | ||
|
c413f457af | ||
|
e87f08e8df | ||
|
6db58cdf2d | ||
|
76b3124896 | ||
|
71dfe05783 | ||
|
a41dc2a78d | ||
|
0209bd3dd4 | ||
|
865bf7feda | ||
|
18ec03b9bf | ||
|
8a174ca0bb | ||
|
a2040cdc1f | ||
|
afe4386caa | ||
|
88a0f9082e | ||
|
cf06abaee5 | ||
|
3f4d96265a | ||
|
be14776fd5 | ||
|
1d261a2252 | ||
|
fdeb80a54d | ||
|
a2efec882b | ||
|
88548c9e5e | ||
|
80d1f22da8 | ||
|
805d66008d | ||
|
61b123bfcc | ||
|
254f260f6b | ||
|
dbe5ce58a0 | ||
|
116d6557cd | ||
|
2acfde2007 | ||
|
a891a2cbf5 | ||
|
63353361e0 | ||
|
7f74259b73 | ||
|
41757aac83 | ||
|
cef165d86c | ||
|
950e1c417e | ||
|
bcc522e61a | ||
|
dbf87247d3 | ||
|
005a188a69 | ||
|
6be53103e6 | ||
|
3d745e2ab2 | ||
|
aca33737b9 | ||
|
dc7dc9b18e | ||
|
076dec0f92 | ||
|
35ee1e135e | ||
|
3bacd1291a | ||
|
519f1aa361 | ||
|
0ef948739a | ||
|
a865fbb4fc | ||
|
509c3e091d | ||
|
3dcebe0cb2 | ||
|
db1673da6a | ||
|
9865367b9b | ||
|
59dfa57f55 | ||
|
a2bb395229 | ||
|
640caee988 | ||
|
05ba3affd5 | ||
|
69762fd6a9 | ||
|
7066554dc5 | ||
|
1dbbe1f701 | ||
|
0c1ef5a2d6 | ||
|
4fa2ca1a12 | ||
|
ae79b6df9f | ||
|
bca6b84491 | ||
|
88a0d67a08 | ||
|
dfc2fca145 | ||
|
829d74d36c | ||
|
daec16fdee | ||
|
581764e0d0 | ||
|
7424e395a1 | ||
|
de0cf74bc9 | ||
|
eaf4ae7781 | ||
|
5f3ee7929b | ||
|
46567d07c9 | ||
|
b8d12dadf8 | ||
|
f401723b65 | ||
|
cf004c3398 | ||
|
c5eb0961f0 | ||
|
36b7ab18a3 | ||
|
8db864f181 | ||
|
0216915b48 | ||
|
6cf29f481c | ||
|
4d36c863d2 | ||
|
6ae838353c | ||
|
eb63492fe1 | ||
|
78d30ea817 | ||
|
a121db5f56 | ||
|
4efcf3b846 | ||
|
5a3268a873 | ||
|
63496400d7 | ||
|
b2094e5bc5 | ||
|
20bf27e646 | ||
|
5462a92027 | ||
|
0347b3b4ca | ||
|
f9db76eae0 | ||
|
a862876423 | ||
|
edef0aed30 | ||
|
00e5b5e562 | ||
|
831c618bd8 | ||
|
34b34a56ce | ||
|
3eaeba865a | ||
|
450c3df36f | ||
|
a605966ecf | ||
|
150c53f547 | ||
|
b25fcdc4df | ||
|
796afabb95 | ||
|
d38622c9ab | ||
|
b9c2af2e87 | ||
|
e85ca79935 |
@ -1 +0,0 @@
|
|||||||
graphviz-2.12.tar.gz
|
|
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
/graphviz-*.tar.bz2
|
21
Makefile
21
Makefile
@ -1,21 +0,0 @@
|
|||||||
# Makefile for source rpm: graphviz
|
|
||||||
# $Id: Makefile,v 1.1 2004/11/08 04:30:23 cvsextras Exp $
|
|
||||||
NAME := graphviz
|
|
||||||
SPECFILE = $(firstword $(wildcard *.spec))
|
|
||||||
|
|
||||||
define find-makefile-common
|
|
||||||
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(find-makefile-common))
|
|
||||||
|
|
||||||
ifeq ($(MAKEFILE_COMMON),)
|
|
||||||
# attept a checkout
|
|
||||||
define checkout-makefile-common
|
|
||||||
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
|
|
||||||
endef
|
|
||||||
|
|
||||||
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
|
|
||||||
endif
|
|
||||||
|
|
||||||
include $(MAKEFILE_COMMON)
|
|
15
graphviz-4.0.0-gvpack-neato-static.patch
Normal file
15
graphviz-4.0.0-gvpack-neato-static.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
diff --git a/cmd/tools/Makefile.am b/cmd/tools/Makefile.am
|
||||||
|
index 4978fea..9fbe2e2 100644
|
||||||
|
--- a/cmd/tools/Makefile.am
|
||||||
|
+++ b/cmd/tools/Makefile.am
|
||||||
|
@@ -249,7 +249,9 @@ gvpack_LDADD = \
|
||||||
|
$(top_builddir)/lib/ingraphs/libingraphs_C.la \
|
||||||
|
$(top_builddir)/lib/cgraph/libcgraph.la \
|
||||||
|
$(top_builddir)/lib/cdt/libcdt.la \
|
||||||
|
- $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout.la
|
||||||
|
+ $(top_builddir)/plugin/neato_layout/libgvplugin_neato_layout_C.la \
|
||||||
|
+ $(top_builddir)/lib/pathplan/libpathplan_C.la \
|
||||||
|
+ $(EXPAT_LIBS) $(Z_LIBS) $(GTS_LIBS) $(SOCKET_LIBS) $(IPSEPCOLA_LIBS) $(MATH_LIBS)
|
||||||
|
|
||||||
|
if ENABLE_STATIC
|
||||||
|
gvpack_static_SOURCES = gvpack.cpp
|
13
graphviz-7.0.6-fix-python-3.12.patch
Normal file
13
graphviz-7.0.6-fix-python-3.12.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff --git a/configure.ac b/configure.ac
|
||||||
|
index 49e027f..542c23a 100644
|
||||||
|
--- a/configure.ac
|
||||||
|
+++ b/configure.ac
|
||||||
|
@@ -1141,7 +1141,7 @@ else
|
||||||
|
use_python3="No (python-$PYTHON3_VERSION.pc not found)"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
- PYTHON3_INSTALL_DIR="`$PYTHON3 -c 'from distutils import sysconfig; print(sysconfig.get_python_lib(1,0))'`"
|
||||||
|
+ PYTHON3_INSTALL_DIR="`$PYTHON3 -c 'import sysconfig; print(sysconfig.get_path("platlib"))'`"
|
||||||
|
save_CPPFLAGS=$CPPFLAGS
|
||||||
|
CPPFLAGS="$CPPFLAGS $PYTHON3_INCLUDES"
|
||||||
|
AC_CHECK_HEADER(Python.h,,[
|
@ -1,11 +0,0 @@
|
|||||||
--- graphviz-2.12/lib/expr/Makefile.am.orig 2006-09-26 11:47:54.000000000 -0500
|
|
||||||
+++ graphviz-2.12/lib/expr/Makefile.am 2007-05-05 11:49:49.000000000 -0500
|
|
||||||
@@ -34,7 +34,7 @@
|
|
||||||
|
|
||||||
libexpr_la_LDFLAGS = -version-info @VERSION_INFO@
|
|
||||||
libexpr_la_SOURCES = $(libexpr_C_la_SOURCES)
|
|
||||||
-libexpr_la_LIBADD = $(libexpr_C_la_LIBADD)
|
|
||||||
+libexpr_la_LIBADD = $(libexpr_C_la_LIBADD) \
|
|
||||||
$(top_builddir)/lib/cdt/libcdt.la
|
|
||||||
|
|
||||||
$(libexpr_la_OBJECTS): exparse.h exparse.c exgram.h exop.h
|
|
@ -1,30 +0,0 @@
|
|||||||
diff -urN graphviz-2.12/configure graphviz-2.12-patched/configure
|
|
||||||
--- graphviz-2.12/configure 2006-12-04 16:02:10.000000000 -0600
|
|
||||||
+++ graphviz-2.12-patched/configure 2006-12-08 09:45:19.000000000 -0600
|
|
||||||
@@ -25552,7 +25552,7 @@
|
|
||||||
|
|
||||||
fi;
|
|
||||||
if test "x$enable_php" != "xno"; then
|
|
||||||
-if test `$SWIG -help 2>&1 | $GREP -c '\-php *- Generate'` = 0; then
|
|
||||||
+if test `$SWIG -help 2>&1 | $GREP -c '\-php[5 ]*- Generate'` = 0; then
|
|
||||||
PHP=
|
|
||||||
{ echo "$as_me:$LINENO: WARNING: swig does not support php. The PHP packages will not be built" >&5
|
|
||||||
echo "$as_me: WARNING: swig does not support php. The PHP packages will not be built" >&2;}
|
|
||||||
diff -urN graphviz-2.12/configure.ac graphviz-2.12-patched/configure.ac
|
|
||||||
--- graphviz-2.12/configure.ac 2006-12-04 15:11:58.000000000 -0600
|
|
||||||
+++ graphviz-2.12-patched/configure.ac 2006-12-08 08:07:10.000000000 -0600
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-# $Id: graphviz-php5.patch,v 1.1 2006/12/11 18:42:36 jima Exp $ $Revision: 1.1 $
|
|
||||||
+# $Id: graphviz-php5.patch,v 1.1 2006/12/11 18:42:36 jima Exp $ $Revision: 1.1 $
|
|
||||||
|
|
||||||
# Process this file with autoconf to produce a configure script
|
|
||||||
AC_PREREQ(2.54)
|
|
||||||
@@ -628,7 +628,7 @@
|
|
||||||
AC_ARG_ENABLE(php,
|
|
||||||
[AC_HELP_STRING([--disable-php], [don't support php language bindings])])
|
|
||||||
if test "x$enable_php" != "xno"; then
|
|
||||||
-if test `$SWIG -help 2>&1 | $GREP -c '\-php *- Generate'` = 0; then
|
|
||||||
+if test `$SWIG -help 2>&1 | $GREP -c '\-php[[5 ]]*- Generate'` = 0; then
|
|
||||||
PHP=
|
|
||||||
AC_MSG_WARN([swig does not support php. The PHP packages will not be built])
|
|
||||||
else
|
|
@ -1,237 +0,0 @@
|
|||||||
diff -urN graphviz-2.12/configure graphviz-2.12-patched/configure
|
|
||||||
--- graphviz-2.12/configure 2006-12-04 16:02:10.000000000 -0600
|
|
||||||
+++ graphviz-2.12-patched/configure 2007-02-07 08:20:19.000000000 -0600
|
|
||||||
@@ -26251,8 +26251,8 @@
|
|
||||||
fi;
|
|
||||||
|
|
||||||
if test "x$TCLSH" = "x"; then
|
|
||||||
- # Extract the first word of "tclsh8.4", so it can be a program name with args.
|
|
||||||
-set dummy tclsh8.4; ac_word=$2
|
|
||||||
+ # Extract the first word of "tclsh8.5", so it can be a program name with args.
|
|
||||||
+set dummy tclsh8.5; ac_word=$2
|
|
||||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
||||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
||||||
if test "${ac_cv_path_TCLSH+set}" = set; then
|
|
||||||
@@ -26291,8 +26291,8 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$TCLSH" = "x"; then
|
|
||||||
- # Extract the first word of "tclsh8.3", so it can be a program name with args.
|
|
||||||
-set dummy tclsh8.3; ac_word=$2
|
|
||||||
+ # Extract the first word of "tclsh8.4", so it can be a program name with args.
|
|
||||||
+set dummy tclsh8.4; ac_word=$2
|
|
||||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
||||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
||||||
if test "${ac_cv_path_TCLSH+set}" = set; then
|
|
||||||
@@ -26331,7 +26331,47 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$TCLSH" = "x"; then
|
|
||||||
- # Extract the first word of "tclsh", so it can be a program name with args.
|
|
||||||
+ # Extract the first word of "tclsh8.3", so it can be a program name with args.
|
|
||||||
+set dummy tclsh8.3; ac_word=$2
|
|
||||||
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
||||||
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
||||||
+if test "${ac_cv_path_TCLSH+set}" = set; then
|
|
||||||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
+else
|
|
||||||
+ case $TCLSH in
|
|
||||||
+ [\\/]* | ?:[\\/]*)
|
|
||||||
+ ac_cv_path_TCLSH="$TCLSH" # Let the user override the test with a path.
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
+for as_dir in $PATH
|
|
||||||
+do
|
|
||||||
+ IFS=$as_save_IFS
|
|
||||||
+ test -z "$as_dir" && as_dir=.
|
|
||||||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
||||||
+ ac_cv_path_TCLSH="$as_dir/$ac_word$ac_exec_ext"
|
|
||||||
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
||||||
+ break 2
|
|
||||||
+ fi
|
|
||||||
+done
|
|
||||||
+done
|
|
||||||
+
|
|
||||||
+ ;;
|
|
||||||
+esac
|
|
||||||
+fi
|
|
||||||
+TCLSH=$ac_cv_path_TCLSH
|
|
||||||
+
|
|
||||||
+if test -n "$TCLSH"; then
|
|
||||||
+ echo "$as_me:$LINENO: result: $TCLSH" >&5
|
|
||||||
+echo "${ECHO_T}$TCLSH" >&6
|
|
||||||
+else
|
|
||||||
+ echo "$as_me:$LINENO: result: no" >&5
|
|
||||||
+echo "${ECHO_T}no" >&6
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+ if test "x$TCLSH" = "x"; then
|
|
||||||
+ # Extract the first word of "tclsh", so it can be a program name with args.
|
|
||||||
set dummy tclsh; ac_word=$2
|
|
||||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
||||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
||||||
@@ -26370,6 +26410,7 @@
|
|
||||||
echo "${ECHO_T}no" >&6
|
|
||||||
fi
|
|
||||||
|
|
||||||
+ fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
@@ -26674,8 +26715,8 @@
|
|
||||||
WISH=$withval
|
|
||||||
fi;
|
|
||||||
if test "x$WISH" = "x"; then
|
|
||||||
- # Extract the first word of "wish8.4", so it can be a program name with args.
|
|
||||||
-set dummy wish8.4; ac_word=$2
|
|
||||||
+ # Extract the first word of "wish8.5", so it can be a program name with args.
|
|
||||||
+set dummy wish8.5; ac_word=$2
|
|
||||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
||||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
||||||
if test "${ac_cv_path_WISH+set}" = set; then
|
|
||||||
@@ -26714,7 +26755,47 @@
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test "x$WISH" = "x"; then
|
|
||||||
- # Extract the first word of "wish8.3", so it can be a program name with args.
|
|
||||||
+ # Extract the first word of "wish8.4", so it can be a program name with args.
|
|
||||||
+set dummy wish8.4; ac_word=$2
|
|
||||||
+echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
||||||
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
||||||
+if test "${ac_cv_path_WISH+set}" = set; then
|
|
||||||
+ echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
||||||
+else
|
|
||||||
+ case $WISH in
|
|
||||||
+ [\\/]* | ?:[\\/]*)
|
|
||||||
+ ac_cv_path_WISH="$WISH" # Let the user override the test with a path.
|
|
||||||
+ ;;
|
|
||||||
+ *)
|
|
||||||
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
|
||||||
+for as_dir in $PATH
|
|
||||||
+do
|
|
||||||
+ IFS=$as_save_IFS
|
|
||||||
+ test -z "$as_dir" && as_dir=.
|
|
||||||
+ for ac_exec_ext in '' $ac_executable_extensions; do
|
|
||||||
+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
|
||||||
+ ac_cv_path_WISH="$as_dir/$ac_word$ac_exec_ext"
|
|
||||||
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
|
||||||
+ break 2
|
|
||||||
+ fi
|
|
||||||
+done
|
|
||||||
+done
|
|
||||||
+
|
|
||||||
+ ;;
|
|
||||||
+esac
|
|
||||||
+fi
|
|
||||||
+WISH=$ac_cv_path_WISH
|
|
||||||
+
|
|
||||||
+if test -n "$WISH"; then
|
|
||||||
+ echo "$as_me:$LINENO: result: $WISH" >&5
|
|
||||||
+echo "${ECHO_T}$WISH" >&6
|
|
||||||
+else
|
|
||||||
+ echo "$as_me:$LINENO: result: no" >&5
|
|
||||||
+echo "${ECHO_T}no" >&6
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
+ if test "x$WISH" = "x"; then
|
|
||||||
+ # Extract the first word of "wish8.3", so it can be a program name with args.
|
|
||||||
set dummy wish8.3; ac_word=$2
|
|
||||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
||||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
||||||
@@ -26753,8 +26834,8 @@
|
|
||||||
echo "${ECHO_T}no" >&6
|
|
||||||
fi
|
|
||||||
|
|
||||||
- if test "x$WISH" = "x"; then
|
|
||||||
- # Extract the first word of "wish", so it can be a program name with args.
|
|
||||||
+ if test "x$WISH" = "x"; then
|
|
||||||
+ # Extract the first word of "wish", so it can be a program name with args.
|
|
||||||
set dummy wish; ac_word=$2
|
|
||||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
|
||||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
|
||||||
@@ -26793,6 +26874,7 @@
|
|
||||||
echo "${ECHO_T}no" >&6
|
|
||||||
fi
|
|
||||||
|
|
||||||
+ fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
@@ -26815,7 +26897,7 @@
|
|
||||||
WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'`
|
|
||||||
|
|
||||||
if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then
|
|
||||||
- TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic"
|
|
||||||
+ TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/unix"
|
|
||||||
else
|
|
||||||
if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then
|
|
||||||
TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include
|
|
||||||
@@ -33490,7 +33572,7 @@
|
|
||||||
# -----------------------------------
|
|
||||||
# tkInt.h
|
|
||||||
if test -f "$TK_SRC_DIR/generic/tkInt.h"; then
|
|
||||||
-TKINT_INCLUDES="-I$TK_SRC_DIR/generic"
|
|
||||||
+TKINT_INCLUDES="-I$TK_SRC_DIR/generic -I$TK_SRC_DIR/unix"
|
|
||||||
else
|
|
||||||
if test -f "/usr/include/tkInt.h"; then
|
|
||||||
TKINT_INCLUDES=""
|
|
||||||
diff -urN graphviz-2.12/configure.ac graphviz-2.12-patched/configure.ac
|
|
||||||
--- graphviz-2.12/configure.ac 2006-12-04 15:11:58.000000000 -0600
|
|
||||||
+++ graphviz-2.12-patched/configure.ac 2007-02-07 08:20:02.000000000 -0600
|
|
||||||
@@ -755,11 +755,14 @@
|
|
||||||
TCLSH=$withval,)
|
|
||||||
|
|
||||||
if test "x$TCLSH" = "x"; then
|
|
||||||
- AC_PATH_PROG(TCLSH,tclsh8.4)
|
|
||||||
+ AC_PATH_PROG(TCLSH,tclsh8.5)
|
|
||||||
if test "x$TCLSH" = "x"; then
|
|
||||||
- AC_PATH_PROG(TCLSH,tclsh8.3)
|
|
||||||
+ AC_PATH_PROG(TCLSH,tclsh8.4)
|
|
||||||
if test "x$TCLSH" = "x"; then
|
|
||||||
- AC_PATH_PROG(TCLSH,tclsh)
|
|
||||||
+ AC_PATH_PROG(TCLSH,tclsh8.3)
|
|
||||||
+ if test "x$TCLSH" = "x"; then
|
|
||||||
+ AC_PATH_PROG(TCLSH,tclsh)
|
|
||||||
+ fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
@@ -904,11 +907,14 @@
|
|
||||||
[ --with-wish=PROG build graphviz for specific wish],
|
|
||||||
WISH=$withval,)
|
|
||||||
if test "x$WISH" = "x"; then
|
|
||||||
- AC_PATH_PROG(WISH,wish8.4)
|
|
||||||
+ AC_PATH_PROG(WISH,wish8.5)
|
|
||||||
if test "x$WISH" = "x"; then
|
|
||||||
- AC_PATH_PROG(WISH,wish8.3)
|
|
||||||
- if test "x$WISH" = "x"; then
|
|
||||||
- AC_PATH_PROG(WISH,wish)
|
|
||||||
+ AC_PATH_PROG(WISH,wish8.4)
|
|
||||||
+ if test "x$WISH" = "x"; then
|
|
||||||
+ AC_PATH_PROG(WISH,wish8.3)
|
|
||||||
+ if test "x$WISH" = "x"; then
|
|
||||||
+ AC_PATH_PROG(WISH,wish)
|
|
||||||
+ fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
@@ -930,7 +936,7 @@
|
|
||||||
WISH_EXEC_PREFIX=`echo $WISH|sed -e 's%/bin/wish.*$%%'`
|
|
||||||
|
|
||||||
if test -f ${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/tk.h; then
|
|
||||||
- TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic"
|
|
||||||
+ TK_INCLUDES="-I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND} -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/generic -I${WISH_EXEC_PREFIX}/include/tk${TK_VERSION_FOUND}/unix"
|
|
||||||
else
|
|
||||||
if test "x${WISH_EXEC_PREFIX}" != "x/usr" -a -f ${WISH_EXEC_PREFIX}/include/tk.h; then
|
|
||||||
TK_INCLUDES=-I${WISH_EXEC_PREFIX}/include
|
|
||||||
@@ -1673,7 +1679,7 @@
|
|
||||||
# -----------------------------------
|
|
||||||
# tkInt.h
|
|
||||||
if test -f "$TK_SRC_DIR/generic/tkInt.h"; then
|
|
||||||
-TKINT_INCLUDES="-I$TK_SRC_DIR/generic"
|
|
||||||
+TKINT_INCLUDES="-I$TK_SRC_DIR/generic -I$TK_SRC_DIR/unix"
|
|
||||||
else
|
|
||||||
if test -f "/usr/include/tkInt.h"; then
|
|
||||||
TKINT_INCLUDES=""
|
|
2120
graphviz.spec
2120
graphviz.spec
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user