Compare commits
No commits in common. "rawhide" and "graphviz-2_16-3_1_fc9" have entirely different histories.
rawhide
...
graphviz-2
1
.cvsignore
Normal file
1
.cvsignore
Normal file
@ -0,0 +1 @@
|
|||||||
|
graphviz-2.16.tar.gz
|
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +0,0 @@
|
|||||||
/graphviz-*.tar.bz2
|
|
21
Makefile
Normal file
21
Makefile
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
# 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)
|
@ -1,15 +0,0 @@
|
|||||||
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
|
|
@ -1,13 +0,0 @@
|
|||||||
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,,[
|
|
29
graphviz-arith.patch
Normal file
29
graphviz-arith.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
Index: lib/common/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
RCS file: /home/cvsroot/graphviz2/lib/common/Makefile.am,v
|
||||||
|
retrieving revision 1.46
|
||||||
|
retrieving revision 1.47
|
||||||
|
diff -u -r1.46 -r1.47
|
||||||
|
--- lib/common/Makefile.am 26 Jul 2007 13:53:25 -0000 1.46
|
||||||
|
+++ lib/common/Makefile.am 4 Sep 2007 23:39:07 -0000 1.47
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-# $Id: Makefile.am,v 1.46 2007/07/26 13:53:25 erg Exp $ $Revision: 1.46 $
|
||||||
|
+# $Id: Makefile.am,v 1.47 2007/09/04 23:39:07 ellson Exp $ $Revision: 1.47 $
|
||||||
|
## Process this file with automake to produce Makefile.in
|
||||||
|
|
||||||
|
AM_CPPFLAGS = \
|
||||||
|
@@ -14,11 +14,10 @@
|
||||||
|
AM_CFLAGS = -D_BLD_common=1
|
||||||
|
endif
|
||||||
|
|
||||||
|
-pkginclude_HEADERS = geom.h color.h types.h textpara.h usershape.h
|
||||||
|
+pkginclude_HEADERS = arith.h geom.h color.h types.h textpara.h usershape.h
|
||||||
|
noinst_HEADERS = render.h utils.h memory.h \
|
||||||
|
- geomprocs.h colorprocs.h colortbl.h entities.h \
|
||||||
|
- logic.h arith.h globals.h \
|
||||||
|
- const.h macros.h htmllex.h htmltable.h pointset.h
|
||||||
|
+ geomprocs.h colorprocs.h colortbl.h entities.h globals.h \
|
||||||
|
+ logic.h const.h macros.h htmllex.h htmltable.h pointset.h
|
||||||
|
noinst_LTLIBRARIES = libcommon_C.la
|
||||||
|
|
||||||
|
if WITH_CODEGENS
|
29
graphviz-black.patch
Normal file
29
graphviz-black.patch
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
--- graphviz-2.12/lib/common/colxlate.c.orig 2006-07-26 22:44:05.000000000 -0500
|
||||||
|
+++ graphviz-2.12/lib/common/colxlate.c 2007-07-12 14:07:13.000000000 -0500
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-/* $Id: colxlate.c,v 1.11 2006/07/27 03:44:05 erg Exp $ $Revision: 1.11 $ */
|
||||||
|
+/* $Id: colxlate.c,v 1.13 2007/07/12 16:47:57 erg Exp $ $Revision: 1.13 $ */
|
||||||
|
/* vim:set shiftwidth=4 ts=8: */
|
||||||
|
|
||||||
|
/**********************************************************
|
||||||
|
@@ -180,6 +180,10 @@
|
||||||
|
|
||||||
|
/* resolveColor:
|
||||||
|
* Resolve input color str allowing color scheme namespaces.
|
||||||
|
+ * 0) "black" => "black"
|
||||||
|
+ * NB: This is something of a hack due to the remaining codegen.
|
||||||
|
+ * Once these are gone, this case could be removed and all references
|
||||||
|
+ * to "black" could be replaced by "/X11/black".
|
||||||
|
* 1) No initial / =>
|
||||||
|
* if colorscheme is defined and no "X11", return /colorscheme/str
|
||||||
|
* else return str
|
||||||
|
@@ -214,7 +218,8 @@
|
||||||
|
char* ss; /* second slash */
|
||||||
|
char* c2; /* second char */
|
||||||
|
|
||||||
|
- if (*str == '/') { /* if begins with '/' */
|
||||||
|
+ if ((*str == 'b') || !strncmp(str+1,"lack",4)) return str;
|
||||||
|
+ else if (*str == '/') { /* if begins with '/' */
|
||||||
|
c2 = str+1;
|
||||||
|
if ((ss = strchr(c2, '/'))) { /* if has second '/' */
|
||||||
|
if (*c2 == '/') { /* if second '/' is second character */
|
11
graphviz-libcdt.patch
Normal file
11
graphviz-libcdt.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
--- 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
|
30
graphviz-php5.patch
Normal file
30
graphviz-php5.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
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
|
237
graphviz-tk8.5.patch
Normal file
237
graphviz-tk8.5.patch
Normal file
@ -0,0 +1,237 @@
|
|||||||
|
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=""
|
2189
graphviz.spec
2189
graphviz.spec
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user