Attachment #370602 for bug #501318

Lines 2-12 Link Here

(-)graphviz-2.36.0.org/config/config_python.py (-4 / +4 lines)
2	from distutils import sysconfig	2	from distutils import sysconfig
3		3
4	if sys.argv[1] == "archlib":	4	if sys.argv[1] == "archlib":
5	print sysconfig.get_python_lib(1,1)	5	print(sysconfig.get_python_lib(1,1))
6	elif sys.argv[1] == "lib":	6	elif sys.argv[1] == "lib":
7	print sysconfig.get_python_lib(0,1)	7	print(sysconfig.get_python_lib(0,1))
8	elif sys.argv[1] == "archsitelib":	8	elif sys.argv[1] == "archsitelib":
9	print sysconfig.get_python_lib(1,0)	9	print(sysconfig.get_python_lib(1,0))
10	elif sys.argv[1] == "sitelib":	10	elif sys.argv[1] == "sitelib":
11	print sysconfig.get_python_lib(0,0)	11	print(sysconfig.get_python_lib(0,0))
12		12




      if test "x$PYTHON" = "x"; then
	use_python="No (python is too old)"
      else
        PYTHON_PREFIX=`$PYTHON -c "import sys; print(sys.prefix)"`
        PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION_SHORT
        PYTHON_LIBS="-lpython$PYTHON_VERSION_SHORT"
        PYTHON_INSTALL_DIR="`$PYTHON $srcdir/config/config_python.py archsitelib`"

      if test "x$PYTHON23" = "x"; then
	use_python23="No (python2.3 is too old)"
      else
        PYTHON23_PREFIX=`$PYTHON23 -c "import sys; print(sys.prefix)"`
        PYTHON23_INCLUDES=-I$PYTHON23_PREFIX/include/python$PYTHON23_VERSION_SHORT
        PYTHON23_LIBS="-lpython$PYTHON23_VERSION_SHORT"
        PYTHON23_INSTALL_DIR="`$PYTHON23 $srcdir/config/config_python.py archsitelib`"
        save_CPPFLAGS=$CPPFLAGS
        CPPFLAGS="$CPPFLAGS $PYTHON23_INCLUDES"

      if test "x$PYTHON24" = "x"; then
	use_python24="No (python2.4 is too old)"
      else
        PYTHON24_PREFIX=`$PYTHON24 -c "import sys; print(sys.prefix)"`
        PYTHON24_INCLUDES=-I$PYTHON24_PREFIX/include/python$PYTHON24_VERSION_SHORT
        PYTHON24_LIBS="-lpython$PYTHON24_VERSION_SHORT"
        PYTHON24_INSTALL_DIR="`$PYTHON24 $srcdir/config/config_python.py archsitelib`"
        save_CPPFLAGS=$CPPFLAGS
        CPPFLAGS="$CPPFLAGS $PYTHON24_INCLUDES"

      if test "x$PYTHON25" = "x"; then
	use_python25="No (python2.5 is too old)"
      else
        PYTHON25_PREFIX=`$PYTHON25 -c "import sys; print(sys.prefix)"`
        PYTHON25_INCLUDES=-I$PYTHON25_PREFIX/include/python$PYTHON25_VERSION_SHORT
        PYTHON24_LIBS="-lpython$PYTHON25_VERSION_SHORT"
        PYTHON25_INSTALL_DIR="`$PYTHON25 $srcdir/config/config_python.py archsitelib`"
        save_CPPFLAGS=$CPPFLAGS
        CPPFLAGS="$CPPFLAGS $PYTHON25_INCLUDES"

      if test "x$PYTHON26" = "x"; then
	use_python26="No (python2.6 is too old)"
      else
        PYTHON26_PREFIX=`$PYTHON26 -c "import sys; print(sys.prefix)"`
        PYTHON26_INCLUDES=-I$PYTHON26_PREFIX/include/python$PYTHON26_VERSION_SHORT
        PYTHON24_LIBS="-lpython$PYTHON26_VERSION_SHORT"
        PYTHON26_INSTALL_DIR="`$PYTHON26 $srcdir/config/config_python.py archsitelib`"
        save_CPPFLAGS=$CPPFLAGS
        CPPFLAGS="$CPPFLAGS $PYTHON26_INCLUDES"

      if test "x$PYTHON27" = "x"; then
	use_python27="No (python2.7 is too old)"
      else
        PYTHON27_PREFIX=`$PYTHON27 -c "import sys; print(sys.prefix)"`
        PYTHON27_INCLUDES=-I$PYTHON27_PREFIX/include/python$PYTHON27_VERSION_SHORT
        PYTHON27_LIBS="-lpython$PYTHON27_VERSION_SHORT"
        PYTHON27_INSTALL_DIR="`$PYTHON27 $srcdir/config/config_python.py archsitelib`"
        save_CPPFLAGS=$CPPFLAGS
        CPPFLAGS="$CPPFLAGS $PYTHON27_INCLUDES"

AM_CONDITIONAL(WITH_PYTHON27, [test "x$use_python27" = "xYes"])

dnl -----------------------------------
dnl INCLUDES and LIBS for PYTHON33
dnl TODO This is a really stupid way to do that!
dnl Better (and reliable) to use `pkg-config`!

AC_ARG_ENABLE(python33,
  [AS_HELP_STRING([--enable-python33=no],[python33 language bindings])],
  [], [enable_python33=no])

if test "x$enable_python33" != "xyes"; then
  use_python33="No (disabled by default - for multiversion installs)"
else
  if test "x$use_swig" != "xYes"; then
    use_python33="No (swig not available)"
  else
    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
      use_python33="No (swig does not support -python option)"
    else
      AC_CHECK_PROG(PYTHON33,python3.3,python3.3)
      if test "x$PYTHON33" = "x"; then
        use_python33="No (python33 not available)"
      else
        PYTHON33_VERSION=`$PYTHON33 -V 2>&1 | $EGREP Python | cut -d ' ' -f 2`
        if test "x$PYTHON33_VERSION" = "x"; then
          PYTHON33=
        else
          PYTHON33_VERSION_MAJOR=`echo $PYTHON33_VERSION | cut -d '.' -f 1`
          PYTHON33_VERSION_MINOR=`echo $PYTHON33_VERSION | cut -d '.' -f 2`
          PYTHON33_VERSION_SHORT=$PYTHON33_VERSION_MAJOR.$PYTHON33_VERSION_MINOR
          if test $PYTHON33_VERSION_MAJOR -eq 3; then
            if test $PYTHON33_VERSION_MINOR -lt 3; then
               PYTHON33=
            fi
          else
            PYTHON33=
          fi
        fi
      fi
      if test "x$PYTHON33" = "x"; then
        # TODO REALLY?
        use_python33="No (python3.3 is too old ;-)"
      else
        PYTHON33_PREFIX=`$PYTHON33 -c "import sys; print(sys.prefix)"`
        PYTHON33_INCLUDES=-I$PYTHON33_PREFIX/include/python$PYTHON33_VERSION_SHORT
        PYTHON33_LIBS="-lpython$PYTHON33_VERSION_SHORT"
        PYTHON33_INSTALL_DIR="`$PYTHON33 $srcdir/config/config_python.py archsitelib`"
        save_CPPFLAGS=$CPPFLAGS
        CPPFLAGS="$CPPFLAGS $PYTHON33_INCLUDES"
        AC_CHECK_HEADER(Python.h,,[
          use_python33="No (missing header)"
          PYTHON33=
        ])
        CPPFLAGS=$save_CPPFLAGS
        if test "x$PYTHON33" != "x"; then
          use_python33="Yes"
          AC_SUBST([PYTHON33_INSTALL_DIR])
          AC_SUBST([PYTHON33_INCLUDES])
          AC_SUBST([PYTHON33_LIBS])
        fi
      fi
    fi
  fi
fi
AM_CONDITIONAL(WITH_PYTHON33, [test "x$use_python33" = "xYes"])

dnl -----------------------------------
dnl INCLUDES and LIBS for R

AC_ARG_ENABLE(r,

echo "  gv_python25:   $use_python25"
echo "  gv_python26:   $use_python26"
echo "  gv_python27:   $use_python27"
echo "  gv_python33:   $use_python33"
echo "  gv_R:          $use_r"
echo "  gv_ruby:       $use_ruby"
echo "  gv_tcl:        $use_gv_tcl"




gv_php.cpp: gv.i
	$(SWIG) -c++ -php5 -o gv_php.cpp $(srcdir)/gv.i

pkgpython23dir = $(libdir)/python2.3/site-packages
PYTHON23_data = $(builddir)/gv.py
nodist_libgv_python23_la_SOURCES = gv_python23.cpp
libgv_python_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
libgv_python_la_LIBADD = $(BASELIBS) $(PYTHON_LIBS)
libgv_python_la_LDFLAGS = -module -avoid-version
libgv_python_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON_INCLUDES)
$(PYTHON_data): gv_python.cpp
gv_python.cpp: gv.i
	$(SWIG) -c++ -python -o gv_python.cpp $(srcdir)/gv.i

pkgpython23dir = $(pkglibdir)/python23
PYTHON23_data = gv.py
nodist_libgv_python23_la_SOURCES = gv_python23.cpp $(PYTHON23_data)
libgv_python23_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
libgv_python23_la_LIBADD = $(BASELIBS) $(PYTHON23_LIBS)
libgv_python23_la_LDFLAGS = -module -avoid-version
libgv_python23_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON23_INCLUDES)
# $(PYTHON23_data): gv_python23.cpp
gv_python23.cpp: gv.i
	$(SWIG) -c++ -python -o $@ $<

pkgpython24dir = $(libdir)/python2.4/site-packages
PYTHON24_data = $(builddir)/gv.py
nodist_libgv_python24_la_SOURCES = gv_python24.cpp
libgv_python24_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
libgv_python24_la_LIBADD = $(BASELIBS) $(PYTHON24_LIBS)
libgv_python24_la_LDFLAGS = -module -avoid-version
libgv_python24_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON24_INCLUDES)
# $(PYTHON24_data): gv_python24.cpp
gv_python24.cpp: gv.i
	$(SWIG) -c++ -python -o $@ $<

pkgpython25dir = $(libdir)/python2.5/site-packages
PYTHON25_data = $(builddir)/gv.py
nodist_libgv_python25_la_SOURCES = gv_python25.cpp
libgv_python25_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
libgv_python25_la_LIBADD = $(BASELIBS) $(PYTHON25_LIBS)
libgv_python25_la_LDFLAGS = -module -avoid-version
libgv_python25_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON25_INCLUDES)
# $(PYTHON25_data): gv_python25.cpp
gv_python25.cpp: gv.i
	$(SWIG) -c++ -python -o $@ $<

pkgpython26dir = $(libdir)/python2.6/site-packages
PYTHON26_data = $(builddir)/gv.py
nodist_libgv_python26_la_SOURCES = gv_python26.cpp
libgv_python26_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
libgv_python26_la_LIBADD = $(BASELIBS) $(PYTHON26_LIBS)
libgv_python26_la_LDFLAGS = -module -avoid-version
libgv_python26_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON26_INCLUDES)
# $(PYTHON26_data): gv_python26.cpp
gv_python26.cpp: gv.i
	$(SWIG) -c++ -python -o $@ $<

pkgpython27dir = $(libdir)/python2.7/site-packages
PYTHON27_data = $(builddir)/gv.py
nodist_libgv_python27_la_SOURCES = gv_python27.cpp
libgv_python27_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
libgv_python27_la_LIBADD = $(BASELIBS) $(PYTHON27_LIBS)
libgv_python27_la_LDFLAGS = -module -avoid-version
libgv_python27_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON27_INCLUDES)
# $(PYTHON27_data): gv_python27.cpp
gv_python27.cpp: gv.i
	$(SWIG) -c++ -python -o $@ $<

pkgpython33dir = $(libdir)/python3.3/site-packages
PYTHON33_data = $(builddir)/gv.py
nodist_libgv_python33_la_SOURCES = gv_python33.cpp
libgv_python33_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
libgv_python33_la_LIBADD = $(BASELIBS) $(PYTHON33_LIBS)
libgv_python33_la_LDFLAGS = -module -avoid-version
libgv_python33_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON33_INCLUDES)
# $(PYTHON33_data): gv_python33.cpp
gv_python33.cpp: gv.i
	$(SWIG) -c++ -python -o $@ $<

BUILT_SOURCES = $(builddir)/gv.py

$(builddir)/gv.py: gv.i
	swig -c++ -python -o dummy.cpp $<

pkgRdir = $(pkglibdir)/R
R_data = 

gv_tcl.cpp: gv.i
	$(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i

pkginclude_HEADERS = 
pkglib_LTLIBRARIES = 
man_MANS =
pdf_DATA = 

DEVTSTS += test_php
endif
if WITH_PYTHON
pkgpython_DATA = $(PYTHON_data)
py_mans = gv.3python
py_data = gv.3python.pdf
pkgpython_LTLIBRARIES = libgv_python.la
DEVTSTS += test_python
endif
if WITH_PYTHON23
pkgpython23_DATA = $(PYTHON23_data)
py_mans = gv.3python
py_data = gv.3python.pdf
pkgpython23_LTLIBRARIES = libgv_python23.la
#DEVTSTS += test_python23
endif
if WITH_PYTHON24
pkgpython24_DATA = $(PYTHON24_data)
py_mans = gv.3python
py_data = gv.3python.pdf
pkgpython24_LTLIBRARIES = libgv_python24.la
#DEVTSTS += test_python24
endif
if WITH_PYTHON25
pkgpython25_DATA = $(PYTHON25_data)
py_mans = gv.3python
py_data = gv.3python.pdf
pkgpython25_LTLIBRARIES = libgv_python25.la
#DEVTSTS += test_python25
endif
if WITH_PYTHON26
pkgpython26_DATA = $(PYTHON26_data)
py_mans = gv.3python
py_data = gv.3python.pdf
pkgpython26_LTLIBRARIES = libgv_python26.la
#DEVTSTS += test_python26
endif
if WITH_PYTHON27
pkgpython27_DATA = $(PYTHON27_data)
py_mans = gv.3python
py_data = gv.3python.pdf
pkgpython27_LTLIBRARIES = libgv_python27.la
#DEVTSTS += test_python27
endif
if WITH_PYTHON33
pkgpython33_DATA = $(PYTHON33_data)
pkgpython33_LTLIBRARIES = libgv_python33.la
endif
man_MANS += $(py_mans)
pdf_DATA += $(py_data)
if WITH_R

if WITH_PHP
	(cd $(DESTDIR)$(pkgphpdir);   rm -f gv.so;  $(LN_S) libgv_php.so gv.so;)
endif
if WITH_PYTHON
	(cd $(DESTDIR)$(pkgpythondir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;)
endif
if WITH_PYTHON23
	(cd $(DESTDIR)$(pkgpython23dir); rm -f _gv.so; $(LN_S) libgv_python23.so _gv.so;)
endif

if WITH_PYTHON27
	(cd $(DESTDIR)$(pkgpython27dir); rm -f _gv.so; $(LN_S) libgv_python27.so _gv.so;)
endif
if WITH_PYTHON33
	(cd $(DESTDIR)$(pkgpython33dir); rm -f _gv.so; $(LN_S) libgv_python33.so _gv.so;)
endif
if WITH_R
	(cd $(DESTDIR)$(pkgRdir);   rm -f gv.so;  $(LN_S) libgv_R.so gv.so;)
endif

	gv_perl.cpp $(PERL_data) \
	gv_php.cpp $(PHP_data) \
	gv_python.cpp $(PYTHON_data) gv.pyc \
	gv_python23.cpp $(PYTHON23_data) \
	gv_python24.cpp $(PYTHON24_data) \
	gv_python25.cpp $(PYTHON25_data) \
	gv_python26.cpp $(PYTHON26_data) \
	gv_python27.cpp $(PYTHON27_data) \
	gv_python33.cpp $(PYTHON27_data) \
	gv_R.cpp $(R_data) \
	gv_ruby.cpp $(RUBY_data) \
	gv_tcl.cpp $(TCL_data) pkgIndex.tcl

DISTCLEANFILES = gv_*.n gv_*.pdf





pkgocamldir = $(pkglibdir)/ocaml
pkgperldir = $(pkglibdir)/perl
pkgphpdir = $(pkglibdir)/php
pkgpythondir = $(pkglibdir)/python
pkgpython23dir = $(pkglibdir)/python23
pkgpython24dir = $(pkglibdir)/python24
pkgpython25dir = $(pkglibdir)/python25
pkgpython26dir = $(pkglibdir)/python26
pkgpython27dir = $(pkglibdir)/python27
pkgRdir = $(pkglibdir)/R
pkgrubydir = $(pkglibdir)/ruby
pkgtcldir = $(pkglibdir)/tcl

		echo "Skipping system installation of php binding."; \
	fi
endif
if WITH_PYTHON
	-mkdir -p $(DESTDIR)@PYTHON_INSTALL_DIR@;
	if test -w $(DESTDIR)@PYTHON_INSTALL_DIR@; then \
		(cd $(DESTDIR)@PYTHON_INSTALL_DIR@; \
			cp -f $(DESTDIR)$(pkgpythondir)/libgv_python.so _gv.so; \
			cp -f $(DESTDIR)$(pkgpythondir)/gv.py gv.py;) \
	else \
		echo "Warning: @PYTHON_INSTALL_DIR@ is not writable."; \
		echo "Skipping system installation of python binding."; \
	fi
endif
if WITH_PYTHON23
	-mkdir -p $(DESTDIR)@PYTHON23_INSTALL_DIR@;
	if test -w $(DESTDIR)@PYTHON23_INSTALL_DIR@; then \
		(cd $(DESTDIR)@PYTHON23_INSTALL_DIR@; \
			cp -f $(DESTDIR)$(pkgpython23dir)/libgv_python23.so _gv.so; \
			cp -f $(DESTDIR)$(pkgpython23dir)/gv.py gv.py;) \
	else \
		echo "Warning: @PYTHON23_INSTALL_DIR@ is not writable."; \
		echo "Skipping system installation of python23 binding."; \
	fi
endif
if WITH_PYTHON24
	-mkdir -p $(DESTDIR)@PYTHON24_INSTALL_DIR@;
	if test -w $(DESTDIR)@PYTHON24_INSTALL_DIR@; then \
		(cd $(DESTDIR)@PYTHON24_INSTALL_DIR@; \
			cp -f $(DESTDIR)$(pkgpython24dir)/libgv_python24.so _gv.so; \
			cp -f $(DESTDIR)$(pkgpython24dir)/gv.py gv.py;) \
	else \
		echo "Warning: @PYTHON24_INSTALL_DIR@ is not writable."; \
		echo "Skipping system installation of python24 binding."; \
	fi
endif
if WITH_PYTHON25
	-mkdir -p $(DESTDIR)@PYTHON25_INSTALL_DIR@;
	if test -w $(DESTDIR)@PYTHON25_INSTALL_DIR@; then \
		(cd $(DESTDIR)@PYTHON25_INSTALL_DIR@; \
			cp -f $(DESTDIR)$(pkgpython25dir)/libgv_python25.so _gv.so; \
			cp -f $(DESTDIR)$(pkgpython25dir)/gv.py gv.py;) \
	else \
		echo "Warning: @PYTHON25_INSTALL_DIR@ is not writable."; \
		echo "Skipping system installation of python25 binding."; \
	fi
endif
if WITH_PYTHON26
	-mkdir -p $(DESTDIR)@PYTHON26_INSTALL_DIR@;
	if test -w $(DESTDIR)@PYTHON26_INSTALL_DIR@; then \
		(cd $(DESTDIR)@PYTHON26_INSTALL_DIR@; \
			cp -f $(DESTDIR)$(pkgpython26dir)/libgv_python26.so _gv.so; \
			cp -f $(DESTDIR)$(pkgpython26dir)/gv.py gv.py;) \
	else \
		echo "Warning: @PYTHON26_INSTALL_DIR@ is not writable."; \
		echo "Skipping system installation of python26 binding."; \
	fi
endif
if WITH_PYTHON27
	-mkdir -p $(DESTDIR)@PYTHON27_INSTALL_DIR@;
	if test -w $(DESTDIR)@PYTHON27_INSTALL_DIR@; then \
		(cd $(DESTDIR)@PYTHON27_INSTALL_DIR@; \
			cp -f $(DESTDIR)$(pkgpython27dir)/libgv_python27.so _gv.so; \
			cp -f $(DESTDIR)$(pkgpython27dir)/gv.py gv.py;) \
	else \
		echo "Warning: @PYTHON27_INSTALL_DIR@ is not writable."; \
		echo "Skipping system installation of python27 binding."; \
	fi
endif
if WITH_RUBY
	-mkdir -p $(DESTDIR)@RUBY_INSTALL_DIR@;
	if test -w $(DESTDIR)@RUBY_INSTALL_DIR@; then \

	-rm -rf $(DESTDIR)@PERL_INSTALL_DIR@/gv.so $(DESTDIR)@PERL_INSTALL_DIR@/gv.pm;
	-rm -rf $(DESTDIR)$(pkgphpdir);
	-rm -rf $(DESTDIR)@PHP_INSTALL_DIR@/gv.so $(DESTDIR)@PHP_INSTALL_DATADIR@/gv.php;
	-rm -rf $(DESTDIR)$(pkgpythondir);
	-rm -rf $(DESTDIR)@PYTHON_INSTALL_DIR@/_gv.so $(DESTDIR)@PYTHON_INSTALL_DIR@/gv.py;
	-rm -rf $(DESTDIR)$(pkgpython23dir);
	-rm -rf $(DESTDIR)@PYTHON23_INSTALL_DIR@/_gv.so $(DESTDIR)@PYTHON_INSTALL_DIR@/gv.py;
	-rm -rf $(DESTDIR)$(pkgpython24dir);
	-rm -rf $(DESTDIR)@PYTHON24_INSTALL_DIR@/_gv.so $(DESTDIR)@PYTHON_INSTALL_DIR@/gv.py;
	-rm -rf $(DESTDIR)$(pkgpython25dir);
	-rm -rf $(DESTDIR)@PYTHON25_INSTALL_DIR@/_gv.so $(DESTDIR)@PYTHON_INSTALL_DIR@/gv.py;
	-rm -rf $(DESTDIR)$(pkgpython26dir);
	-rm -rf $(DESTDIR)@PYTHON26_INSTALL_DIR@/_gv.so $(DESTDIR)@PYTHON_INSTALL_DIR@/gv.py;
	-rm -rf $(DESTDIR)$(pkgpython27dir);
	-rm -rf $(DESTDIR)@PYTHON27_INSTALL_DIR@/_gv.so $(DESTDIR)@PYTHON_INSTALL_DIR@/gv.py;
	-rm -rf $(DESTDIR)$(pkgRdir);
	-rm -rf $(DESTDIR)$(pkgrubydir);
	-rm -rf $(DESTDIR)@RUBY_INSTALL_DIR@/gv.so;

Return to bug 501318

Lines 1169-1175 Link Here

(-)graphviz-2.36.0.org/configure.ac (-11 / +77 lines)
1169	if test "x$PYTHON" = "x"; then	1169	if test "x$PYTHON" = "x"; then
1170	use_python="No (python is too old)"	1170	use_python="No (python is too old)"
1171	else	1171	else
1172	PYTHON_PREFIX=`$PYTHON -c "import sys; print sys.prefix"`	1172	PYTHON_PREFIX=`$PYTHON -c "import sys; print(sys.prefix)"`
1173	PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION_SHORT	1173	PYTHON_INCLUDES=-I$PYTHON_PREFIX/include/python$PYTHON_VERSION_SHORT
1174	PYTHON_LIBS="-lpython$PYTHON_VERSION_SHORT"	1174	PYTHON_LIBS="-lpython$PYTHON_VERSION_SHORT"
1175	PYTHON_INSTALL_DIR="`$PYTHON $srcdir/config/config_python.py archsitelib`"	1175	PYTHON_INSTALL_DIR="`$PYTHON $srcdir/config/config_python.py archsitelib`"
Lines 1233-1241 Link Here
1233	if test "x$PYTHON23" = "x"; then	1233	if test "x$PYTHON23" = "x"; then
1234	use_python23="No (python2.3 is too old)"	1234	use_python23="No (python2.3 is too old)"
1235	else	1235	else
1236	PYTHON23_PREFIX=`$PYTHON23 -c "import sys; print sys.prefix"`	1236	PYTHON23_PREFIX=`$PYTHON23 -c "import sys; print(sys.prefix)"`
1237	PYTHON23_INCLUDES=-I$PYTHON23_PREFIX/include/python$PYTHON23_VERSION_SHORT	1237	PYTHON23_INCLUDES=-I$PYTHON23_PREFIX/include/python$PYTHON23_VERSION_SHORT
1238	PYTHON23_LIBS="-lpython$PYTHON_VERSION_SHORT"	1238	PYTHON23_LIBS="-lpython$PYTHON23_VERSION_SHORT"
1239	PYTHON23_INSTALL_DIR="`$PYTHON23 $srcdir/config/config_python.py archsitelib`"	1239	PYTHON23_INSTALL_DIR="`$PYTHON23 $srcdir/config/config_python.py archsitelib`"
1240	save_CPPFLAGS=$CPPFLAGS	1240	save_CPPFLAGS=$CPPFLAGS
1241	CPPFLAGS="$CPPFLAGS $PYTHON23_INCLUDES"	1241	CPPFLAGS="$CPPFLAGS $PYTHON23_INCLUDES"
Lines 1297-1305 Link Here
1297	if test "x$PYTHON24" = "x"; then	1297	if test "x$PYTHON24" = "x"; then
1298	use_python24="No (python2.4 is too old)"	1298	use_python24="No (python2.4 is too old)"
1299	else	1299	else
1300	PYTHON24_PREFIX=`$PYTHON24 -c "import sys; print sys.prefix"`	1300	PYTHON24_PREFIX=`$PYTHON24 -c "import sys; print(sys.prefix)"`
1301	PYTHON24_INCLUDES=-I$PYTHON24_PREFIX/include/python$PYTHON24_VERSION_SHORT	1301	PYTHON24_INCLUDES=-I$PYTHON24_PREFIX/include/python$PYTHON24_VERSION_SHORT
1302	PYTHON24_LIBS="-lpython$PYTHON_VERSION_SHORT"	1302	PYTHON24_LIBS="-lpython$PYTHON24_VERSION_SHORT"
1303	PYTHON24_INSTALL_DIR="`$PYTHON24 $srcdir/config/config_python.py archsitelib`"	1303	PYTHON24_INSTALL_DIR="`$PYTHON24 $srcdir/config/config_python.py archsitelib`"
1304	save_CPPFLAGS=$CPPFLAGS	1304	save_CPPFLAGS=$CPPFLAGS
1305	CPPFLAGS="$CPPFLAGS $PYTHON24_INCLUDES"	1305	CPPFLAGS="$CPPFLAGS $PYTHON24_INCLUDES"
Lines 1361-1369 Link Here
1361	if test "x$PYTHON25" = "x"; then	1361	if test "x$PYTHON25" = "x"; then
1362	use_python25="No (python2.5 is too old)"	1362	use_python25="No (python2.5 is too old)"
1363	else	1363	else
1364	PYTHON25_PREFIX=`$PYTHON25 -c "import sys; print sys.prefix"`	1364	PYTHON25_PREFIX=`$PYTHON25 -c "import sys; print(sys.prefix)"`
1365	PYTHON25_INCLUDES=-I$PYTHON25_PREFIX/include/python$PYTHON25_VERSION_SHORT	1365	PYTHON25_INCLUDES=-I$PYTHON25_PREFIX/include/python$PYTHON25_VERSION_SHORT
1366	PYTHON24_LIBS="-lpython$PYTHON_VERSION_SHORT"	1366	PYTHON24_LIBS="-lpython$PYTHON25_VERSION_SHORT"
1367	PYTHON25_INSTALL_DIR="`$PYTHON25 $srcdir/config/config_python.py archsitelib`"	1367	PYTHON25_INSTALL_DIR="`$PYTHON25 $srcdir/config/config_python.py archsitelib`"
1368	save_CPPFLAGS=$CPPFLAGS	1368	save_CPPFLAGS=$CPPFLAGS
1369	CPPFLAGS="$CPPFLAGS $PYTHON25_INCLUDES"	1369	CPPFLAGS="$CPPFLAGS $PYTHON25_INCLUDES"
Lines 1425-1433 Link Here
1425	if test "x$PYTHON26" = "x"; then	1425	if test "x$PYTHON26" = "x"; then
1426	use_python26="No (python2.6 is too old)"	1426	use_python26="No (python2.6 is too old)"
1427	else	1427	else
1428	PYTHON26_PREFIX=`$PYTHON26 -c "import sys; print sys.prefix"`	1428	PYTHON26_PREFIX=`$PYTHON26 -c "import sys; print(sys.prefix)"`
1429	PYTHON26_INCLUDES=-I$PYTHON26_PREFIX/include/python$PYTHON26_VERSION_SHORT	1429	PYTHON26_INCLUDES=-I$PYTHON26_PREFIX/include/python$PYTHON26_VERSION_SHORT
1430	PYTHON24_LIBS="-lpython$PYTHON_VERSION_SHORT"	1430	PYTHON24_LIBS="-lpython$PYTHON26_VERSION_SHORT"
1431	PYTHON26_INSTALL_DIR="`$PYTHON26 $srcdir/config/config_python.py archsitelib`"	1431	PYTHON26_INSTALL_DIR="`$PYTHON26 $srcdir/config/config_python.py archsitelib`"
1432	save_CPPFLAGS=$CPPFLAGS	1432	save_CPPFLAGS=$CPPFLAGS
1433	CPPFLAGS="$CPPFLAGS $PYTHON26_INCLUDES"	1433	CPPFLAGS="$CPPFLAGS $PYTHON26_INCLUDES"
Lines 1489-1497 Link Here
1489	if test "x$PYTHON27" = "x"; then	1489	if test "x$PYTHON27" = "x"; then
1490	use_python27="No (python2.7 is too old)"	1490	use_python27="No (python2.7 is too old)"
1491	else	1491	else
1492	PYTHON27_PREFIX=`$PYTHON27 -c "import sys; print sys.prefix"`	1492	PYTHON27_PREFIX=`$PYTHON27 -c "import sys; print(sys.prefix)"`
1493	PYTHON27_INCLUDES=-I$PYTHON27_PREFIX/include/python$PYTHON27_VERSION_SHORT	1493	PYTHON27_INCLUDES=-I$PYTHON27_PREFIX/include/python$PYTHON27_VERSION_SHORT
1494	PYTHON24_LIBS="-lpython$PYTHON_VERSION_SHORT"	1494	PYTHON27_LIBS="-lpython$PYTHON27_VERSION_SHORT"
1495	PYTHON27_INSTALL_DIR="`$PYTHON27 $srcdir/config/config_python.py archsitelib`"	1495	PYTHON27_INSTALL_DIR="`$PYTHON27 $srcdir/config/config_python.py archsitelib`"
1496	save_CPPFLAGS=$CPPFLAGS	1496	save_CPPFLAGS=$CPPFLAGS
1497	CPPFLAGS="$CPPFLAGS $PYTHON27_INCLUDES"	1497	CPPFLAGS="$CPPFLAGS $PYTHON27_INCLUDES"
Lines 1513-1518 Link Here
1513	AM_CONDITIONAL(WITH_PYTHON27, [test "x$use_python27" = "xYes"])	1513	AM_CONDITIONAL(WITH_PYTHON27, [test "x$use_python27" = "xYes"])
1514		1514
1515	dnl -----------------------------------	1515	dnl -----------------------------------
		1516	dnl INCLUDES and LIBS for PYTHON33
		1517	dnl TODO This is a really stupid way to do that!
		1518	dnl Better (and reliable) to use `pkg-config`!
		1519
		1520	AC_ARG_ENABLE(python33,
		1521	[AS_HELP_STRING([--enable-python33=no],[python33 language bindings])],
		1522	[], [enable_python33=no])
		1523
		1524	if test "x$enable_python33" != "xyes"; then
		1525	use_python33="No (disabled by default - for multiversion installs)"
		1526	else
		1527	if test "x$use_swig" != "xYes"; then
		1528	use_python33="No (swig not available)"
		1529	else
		1530	if test `$SWIG -help 2>&1 \| $EGREP -c '\-python *- Generate'` = 0; then
		1531	use_python33="No (swig does not support -python option)"
		1532	else
		1533	AC_CHECK_PROG(PYTHON33,python3.3,python3.3)
		1534	if test "x$PYTHON33" = "x"; then
		1535	use_python33="No (python33 not available)"
		1536	else
		1537	PYTHON33_VERSION=`$PYTHON33 -V 2>&1 \| $EGREP Python \| cut -d ' ' -f 2`
		1538	if test "x$PYTHON33_VERSION" = "x"; then
		1539	PYTHON33=
		1540	else
		1541	PYTHON33_VERSION_MAJOR=`echo $PYTHON33_VERSION \| cut -d '.' -f 1`
		1542	PYTHON33_VERSION_MINOR=`echo $PYTHON33_VERSION \| cut -d '.' -f 2`
		1543	PYTHON33_VERSION_SHORT=$PYTHON33_VERSION_MAJOR.$PYTHON33_VERSION_MINOR
		1544	if test $PYTHON33_VERSION_MAJOR -eq 3; then
		1545	if test $PYTHON33_VERSION_MINOR -lt 3; then
		1546	PYTHON33=
		1547	fi
		1548	else
		1549	PYTHON33=
		1550	fi
		1551	fi
		1552	fi
		1553	if test "x$PYTHON33" = "x"; then
		1554	# TODO REALLY?
		1555	use_python33="No (python3.3 is too old ;-)"
		1556	else
		1557	PYTHON33_PREFIX=`$PYTHON33 -c "import sys; print(sys.prefix)"`
		1558	PYTHON33_INCLUDES=-I$PYTHON33_PREFIX/include/python$PYTHON33_VERSION_SHORT
		1559	PYTHON33_LIBS="-lpython$PYTHON33_VERSION_SHORT"
		1560	PYTHON33_INSTALL_DIR="`$PYTHON33 $srcdir/config/config_python.py archsitelib`"
		1561	save_CPPFLAGS=$CPPFLAGS
		1562	CPPFLAGS="$CPPFLAGS $PYTHON33_INCLUDES"
		1563	AC_CHECK_HEADER(Python.h,,[
		1564	use_python33="No (missing header)"
		1565	PYTHON33=
		1566	])
		1567	CPPFLAGS=$save_CPPFLAGS
		1568	if test "x$PYTHON33" != "x"; then
		1569	use_python33="Yes"
		1570	AC_SUBST([PYTHON33_INSTALL_DIR])
		1571	AC_SUBST([PYTHON33_INCLUDES])
		1572	AC_SUBST([PYTHON33_LIBS])
		1573	fi
		1574	fi
		1575	fi
		1576	fi
		1577	fi
		1578	AM_CONDITIONAL(WITH_PYTHON33, [test "x$use_python33" = "xYes"])
		1579
1580	dnl -----------------------------------
1516	dnl INCLUDES and LIBS for R	1581	dnl INCLUDES and LIBS for R
1517		1582
1518	AC_ARG_ENABLE(r,	1583	AC_ARG_ENABLE(r,
Lines 3385-3390 Link Here
3385	echo " gv_python25: $use_python25"	3450	echo " gv_python25: $use_python25"
3386	echo " gv_python26: $use_python26"	3451	echo " gv_python26: $use_python26"
3387	echo " gv_python27: $use_python27"	3452	echo " gv_python27: $use_python27"
		3453	echo " gv_python33: $use_python33"
3388	echo " gv_R: $use_r"	3454	echo " gv_R: $use_r"
3389	echo " gv_ruby: $use_ruby"	3455	echo " gv_ruby: $use_ruby"
3390	echo " gv_tcl: $use_gv_tcl"	3456	echo " gv_tcl: $use_gv_tcl"

Lines 168-238 Link Here

(-)graphviz-2.36.0.org/tclpkg/gv/Makefile.am (-54 / +50 lines)
168	gv_php.cpp: gv.i	168	gv_php.cpp: gv.i
169	$(SWIG) -c++ -php5 -o gv_php.cpp $(srcdir)/gv.i	169	$(SWIG) -c++ -php5 -o gv_php.cpp $(srcdir)/gv.i
170		170
171	pkgpythondir = $(pkglibdir)/python	171	pkgpython23dir = $(libdir)/python2.3/site-packages
172	PYTHON_data = gv.py	172	PYTHON23_data = $(builddir)/gv.py
173	nodist_libgv_python_la_SOURCES = gv_python.cpp $(PYTHON_data)	173	nodist_libgv_python23_la_SOURCES = gv_python23.cpp
174	libgv_python_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
175	libgv_python_la_LIBADD = $(BASELIBS) $(PYTHON_LIBS)
176	libgv_python_la_LDFLAGS = -module -avoid-version
177	libgv_python_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON_INCLUDES)
178	$(PYTHON_data): gv_python.cpp
179	gv_python.cpp: gv.i
180	$(SWIG) -c++ -python -o gv_python.cpp $(srcdir)/gv.i
181
182	pkgpython23dir = $(pkglibdir)/python23
183	PYTHON23_data = gv.py
184	nodist_libgv_python23_la_SOURCES = gv_python23.cpp $(PYTHON23_data)
185	libgv_python23_la_SOURCES = $(BASESOURCES) gv_dummy_init.c	174	libgv_python23_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
186	libgv_python23_la_LIBADD = $(BASELIBS) $(PYTHON23_LIBS)	175	libgv_python23_la_LIBADD = $(BASELIBS) $(PYTHON23_LIBS)
187	libgv_python23_la_LDFLAGS = -module -avoid-version	176	libgv_python23_la_LDFLAGS = -module -avoid-version
188	libgv_python23_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON23_INCLUDES)	177	libgv_python23_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON23_INCLUDES)
189	# $(PYTHON23_data): gv_python23.cpp	178	# $(PYTHON23_data): gv_python23.cpp
190	gv_python23.cpp: gv.i	179	gv_python23.cpp: gv.i
191	$(SWIG) -c++ -python -classic -o gv_python23.cpp $(srcdir)/gv.i	180	$(SWIG) -c++ -python -o $@ $<
192		181
193	pkgpython24dir = $(pkglibdir)/python24	182	pkgpython24dir = $(libdir)/python2.4/site-packages
194	PYTHON24_data = gv.py	183	PYTHON24_data = $(builddir)/gv.py
195	nodist_libgv_python24_la_SOURCES = gv_python24.cpp $(PYTHON24_data)	184	nodist_libgv_python24_la_SOURCES = gv_python24.cpp
196	libgv_python24_la_SOURCES = $(BASESOURCES) gv_dummy_init.c	185	libgv_python24_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
197	libgv_python24_la_LIBADD = $(BASELIBS) $(PYTHON24_LIBS)	186	libgv_python24_la_LIBADD = $(BASELIBS) $(PYTHON24_LIBS)
198	libgv_python24_la_LDFLAGS = -module -avoid-version	187	libgv_python24_la_LDFLAGS = -module -avoid-version
199	libgv_python24_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON24_INCLUDES)	188	libgv_python24_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON24_INCLUDES)
200	# $(PYTHON24_data): gv_python24.cpp	189	# $(PYTHON24_data): gv_python24.cpp
201	gv_python24.cpp: gv.i	190	gv_python24.cpp: gv.i
202	$(SWIG) -c++ -python -classic -o gv_python24.cpp $(srcdir)/gv.i	191	$(SWIG) -c++ -python -o $@ $<
203		192
204	pkgpython25dir = $(pkglibdir)/python25	193	pkgpython25dir = $(libdir)/python2.5/site-packages
205	PYTHON25_data = gv.py	194	PYTHON25_data = $(builddir)/gv.py
206	nodist_libgv_python25_la_SOURCES = gv_python25.cpp $(PYTHON25_data)	195	nodist_libgv_python25_la_SOURCES = gv_python25.cpp
207	libgv_python25_la_SOURCES = $(BASESOURCES) gv_dummy_init.c	196	libgv_python25_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
208	libgv_python25_la_LIBADD = $(BASELIBS) $(PYTHON25_LIBS)	197	libgv_python25_la_LIBADD = $(BASELIBS) $(PYTHON25_LIBS)
209	libgv_python25_la_LDFLAGS = -module -avoid-version	198	libgv_python25_la_LDFLAGS = -module -avoid-version
210	libgv_python25_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON25_INCLUDES)	199	libgv_python25_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON25_INCLUDES)
211	# $(PYTHON25_data): gv_python25.cpp	200	# $(PYTHON25_data): gv_python25.cpp
212	gv_python25.cpp: gv.i	201	gv_python25.cpp: gv.i
213	$(SWIG) -c++ -python -classic -o gv_python25.cpp $(srcdir)/gv.i	202	$(SWIG) -c++ -python -o $@ $<
214		203
215	pkgpython26dir = $(pkglibdir)/python26	204	pkgpython26dir = $(libdir)/python2.6/site-packages
216	PYTHON26_data = gv.py	205	PYTHON26_data = $(builddir)/gv.py
217	nodist_libgv_python26_la_SOURCES = gv_python26.cpp $(PYTHON26_data)	206	nodist_libgv_python26_la_SOURCES = gv_python26.cpp
218	libgv_python26_la_SOURCES = $(BASESOURCES) gv_dummy_init.c	207	libgv_python26_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
219	libgv_python26_la_LIBADD = $(BASELIBS) $(PYTHON26_LIBS)	208	libgv_python26_la_LIBADD = $(BASELIBS) $(PYTHON26_LIBS)
220	libgv_python26_la_LDFLAGS = -module -avoid-version	209	libgv_python26_la_LDFLAGS = -module -avoid-version
221	libgv_python26_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON26_INCLUDES)	210	libgv_python26_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON26_INCLUDES)
222	# $(PYTHON26_data): gv_python26.cpp	211	# $(PYTHON26_data): gv_python26.cpp
223	gv_python26.cpp: gv.i	212	gv_python26.cpp: gv.i
224	$(SWIG) -c++ -python -o gv_python26.cpp $(srcdir)/gv.i	213	$(SWIG) -c++ -python -o $@ $<
225		214
226	pkgpython27dir = $(pkglibdir)/python27	215	pkgpython27dir = $(libdir)/python2.7/site-packages
227	PYTHON27_data = gv.py	216	PYTHON27_data = $(builddir)/gv.py
228	nodist_libgv_python27_la_SOURCES = gv_python27.cpp $(PYTHON27_data)	217	nodist_libgv_python27_la_SOURCES = gv_python27.cpp
229	libgv_python27_la_SOURCES = $(BASESOURCES) gv_dummy_init.c	218	libgv_python27_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
230	libgv_python27_la_LIBADD = $(BASELIBS) $(PYTHON27_LIBS)	219	libgv_python27_la_LIBADD = $(BASELIBS) $(PYTHON27_LIBS)
231	libgv_python27_la_LDFLAGS = -module -avoid-version	220	libgv_python27_la_LDFLAGS = -module -avoid-version
232	libgv_python27_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON27_INCLUDES)	221	libgv_python27_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON27_INCLUDES)
233	# $(PYTHON27_data): gv_python27.cpp	222	# $(PYTHON27_data): gv_python27.cpp
234	gv_python27.cpp: gv.i	223	gv_python27.cpp: gv.i
235	$(SWIG) -c++ -python -o gv_python27.cpp $(srcdir)/gv.i	224	$(SWIG) -c++ -python -o $@ $<
		225
		226	pkgpython33dir = $(libdir)/python3.3/site-packages
		227	PYTHON33_data = $(builddir)/gv.py
		228	nodist_libgv_python33_la_SOURCES = gv_python33.cpp
		229	libgv_python33_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
		230	libgv_python33_la_LIBADD = $(BASELIBS) $(PYTHON33_LIBS)
		231	libgv_python33_la_LDFLAGS = -module -avoid-version
		232	libgv_python33_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON33_INCLUDES)
		233	# $(PYTHON33_data): gv_python33.cpp
		234	gv_python33.cpp: gv.i
		235	$(SWIG) -c++ -python -o $@ $<
		236
		237	BUILT_SOURCES = $(builddir)/gv.py
		238
		239	$(builddir)/gv.py: gv.i
		240	swig -c++ -python -o dummy.cpp $<
236		241
237	pkgRdir = $(pkglibdir)/R	242	pkgRdir = $(pkglibdir)/R
238	R_data =	243	R_data =
Lines 267-273 Link Here
267	gv_tcl.cpp: gv.i	272	gv_tcl.cpp: gv.i
268	$(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i	273	$(SWIG) -c++ -tcl -namespace -o gv_tcl.cpp $(srcdir)/gv.i
269		274
270	pkginclude_HEADERS = gv.i gv.cpp	275	pkginclude_HEADERS =
271	pkglib_LTLIBRARIES =	276	pkglib_LTLIBRARIES =
272	man_MANS =	277	man_MANS =
273	pdf_DATA =	278	pdf_DATA =
Lines 337-383 Link Here
337	DEVTSTS += test_php	342	DEVTSTS += test_php
338	endif	343	endif
339	if WITH_PYTHON	344	if WITH_PYTHON
340	pkgpython_DATA = $(PYTHON_data)
341	py_mans = gv.3python	345	py_mans = gv.3python
342	py_data = gv.3python.pdf	346	py_data = gv.3python.pdf
343	pkgpython_LTLIBRARIES = libgv_python.la
344	DEVTSTS += test_python
345	endif	347	endif
346	if WITH_PYTHON23	348	if WITH_PYTHON23
347	pkgpython23_DATA = $(PYTHON23_data)	349	pkgpython23_DATA = $(PYTHON23_data)
348	py_mans = gv.3python
349	py_data = gv.3python.pdf
350	pkgpython23_LTLIBRARIES = libgv_python23.la	350	pkgpython23_LTLIBRARIES = libgv_python23.la
351	#DEVTSTS += test_python23	351	#DEVTSTS += test_python23
352	endif	352	endif
353	if WITH_PYTHON24	353	if WITH_PYTHON24
354	pkgpython24_DATA = $(PYTHON24_data)	354	pkgpython24_DATA = $(PYTHON24_data)
355	py_mans = gv.3python
356	py_data = gv.3python.pdf
357	pkgpython24_LTLIBRARIES = libgv_python24.la	355	pkgpython24_LTLIBRARIES = libgv_python24.la
358	#DEVTSTS += test_python24	356	#DEVTSTS += test_python24
359	endif	357	endif
360	if WITH_PYTHON25	358	if WITH_PYTHON25
361	pkgpython25_DATA = $(PYTHON25_data)	359	pkgpython25_DATA = $(PYTHON25_data)
362	py_mans = gv.3python
363	py_data = gv.3python.pdf
364	pkgpython25_LTLIBRARIES = libgv_python25.la	360	pkgpython25_LTLIBRARIES = libgv_python25.la
365	#DEVTSTS += test_python25	361	#DEVTSTS += test_python25
366	endif	362	endif
367	if WITH_PYTHON26	363	if WITH_PYTHON26
368	pkgpython26_DATA = $(PYTHON26_data)	364	pkgpython26_DATA = $(PYTHON26_data)
369	py_mans = gv.3python
370	py_data = gv.3python.pdf
371	pkgpython26_LTLIBRARIES = libgv_python26.la	365	pkgpython26_LTLIBRARIES = libgv_python26.la
372	#DEVTSTS += test_python26	366	#DEVTSTS += test_python26
373	endif	367	endif
374	if WITH_PYTHON27	368	if WITH_PYTHON27
375	pkgpython27_DATA = $(PYTHON27_data)	369	pkgpython27_DATA = $(PYTHON27_data)
376	py_mans = gv.3python
377	py_data = gv.3python.pdf
378	pkgpython27_LTLIBRARIES = libgv_python27.la	370	pkgpython27_LTLIBRARIES = libgv_python27.la
379	#DEVTSTS += test_python27	371	#DEVTSTS += test_python27
380	endif	372	endif
		373	if WITH_PYTHON33
		374	pkgpython33_DATA = $(PYTHON33_data)
		375	pkgpython33_LTLIBRARIES = libgv_python33.la
		376	endif
381	man_MANS += $(py_mans)	377	man_MANS += $(py_mans)
382	pdf_DATA += $(py_data)	378	pdf_DATA += $(py_data)
383	if WITH_R	379	if WITH_R
Lines 468-476 Link Here
468	if WITH_PHP	464	if WITH_PHP
469	(cd $(DESTDIR)$(pkgphpdir); rm -f gv.so; $(LN_S) libgv_php.so gv.so;)	465	(cd $(DESTDIR)$(pkgphpdir); rm -f gv.so; $(LN_S) libgv_php.so gv.so;)
470	endif	466	endif
471	if WITH_PYTHON
472	(cd $(DESTDIR)$(pkgpythondir); rm -f _gv.so; $(LN_S) libgv_python.so _gv.so;)
473	endif
474	if WITH_PYTHON23	467	if WITH_PYTHON23
475	(cd $(DESTDIR)$(pkgpython23dir); rm -f _gv.so; $(LN_S) libgv_python23.so _gv.so;)	468	(cd $(DESTDIR)$(pkgpython23dir); rm -f _gv.so; $(LN_S) libgv_python23.so _gv.so;)
476	endif	469	endif
Lines 486-491 Link Here
486	if WITH_PYTHON27	479	if WITH_PYTHON27
487	(cd $(DESTDIR)$(pkgpython27dir); rm -f _gv.so; $(LN_S) libgv_python27.so _gv.so;)	480	(cd $(DESTDIR)$(pkgpython27dir); rm -f _gv.so; $(LN_S) libgv_python27.so _gv.so;)
488	endif	481	endif
		482	if WITH_PYTHON33
		483	(cd $(DESTDIR)$(pkgpython33dir); rm -f _gv.so; $(LN_S) libgv_python33.so _gv.so;)
		484	endif
489	if WITH_R	485	if WITH_R
490	(cd $(DESTDIR)$(pkgRdir); rm -f gv.so; $(LN_S) libgv_R.so gv.so;)	486	(cd $(DESTDIR)$(pkgRdir); rm -f gv.so; $(LN_S) libgv_R.so gv.so;)
491	endif	487	endif
Lines 604-617 Link Here
604	gv_perl.cpp $(PERL_data) \	600	gv_perl.cpp $(PERL_data) \
605	gv_php.cpp $(PHP_data) \	601	gv_php.cpp $(PHP_data) \
606	gv_python.cpp $(PYTHON_data) gv.pyc \	602	gv_python.cpp $(PYTHON_data) gv.pyc \
607	gv_python23.cpp $(PYTHON23_data) gv.pyc \	603	gv_python23.cpp $(PYTHON23_data) \
608	gv_python24.cpp $(PYTHON24_data) gv.pyc \	604	gv_python24.cpp $(PYTHON24_data) \
609	gv_python25.cpp $(PYTHON25_data) gv.pyc \	605	gv_python25.cpp $(PYTHON25_data) \
610	gv_python26.cpp $(PYTHON26_data) gv.pyc \	606	gv_python26.cpp $(PYTHON26_data) \
611	gv_python27.cpp $(PYTHON27_data) gv.pyc \	607	gv_python27.cpp $(PYTHON27_data) \
		608	gv_python33.cpp $(PYTHON27_data) \
612	gv_R.cpp $(R_data) \	609	gv_R.cpp $(R_data) \
613	gv_ruby.cpp $(RUBY_data) \	610	gv_ruby.cpp $(RUBY_data) \
614	gv_tcl.cpp $(TCL_data) pkgIndex.tcl	611	gv_tcl.cpp $(TCL_data) pkgIndex.tcl
615		612
616	DISTCLEANFILES = gv_.n gv_.pdf	613	DISTCLEANFILES = gv_.n gv_.pdf
617

Lines 10-21 Link Here

(-)graphviz-2.36.0.org/tclpkg/Makefile.am (-84 lines)
10	pkgocamldir = $(pkglibdir)/ocaml	10	pkgocamldir = $(pkglibdir)/ocaml
11	pkgperldir = $(pkglibdir)/perl	11	pkgperldir = $(pkglibdir)/perl
12	pkgphpdir = $(pkglibdir)/php	12	pkgphpdir = $(pkglibdir)/php
13	pkgpythondir = $(pkglibdir)/python
14	pkgpython23dir = $(pkglibdir)/python23
15	pkgpython24dir = $(pkglibdir)/python24
16	pkgpython25dir = $(pkglibdir)/python25
17	pkgpython26dir = $(pkglibdir)/python26
18	pkgpython27dir = $(pkglibdir)/python27
19	pkgRdir = $(pkglibdir)/R	13	pkgRdir = $(pkglibdir)/R
20	pkgrubydir = $(pkglibdir)/ruby	14	pkgrubydir = $(pkglibdir)/ruby
21	pkgtcldir = $(pkglibdir)/tcl	15	pkgtcldir = $(pkglibdir)/tcl
Lines 76-147 Link Here
76	echo "Skipping system installation of php binding."; \	70	echo "Skipping system installation of php binding."; \
77	fi	71	fi
78	endif	72	endif
79	if WITH_PYTHON
80	-mkdir -p $(DESTDIR)@PYTHON_INSTALL_DIR@;
81	if test -w $(DESTDIR)@PYTHON_INSTALL_DIR@; then \
82	(cd $(DESTDIR)@PYTHON_INSTALL_DIR@; \
83	cp -f $(DESTDIR)$(pkgpythondir)/libgv_python.so _gv.so; \
84	cp -f $(DESTDIR)$(pkgpythondir)/gv.py gv.py;) \
85	else \
86	echo "Warning: @PYTHON_INSTALL_DIR@ is not writable."; \
87	echo "Skipping system installation of python binding."; \
88	fi
89	endif
90	if WITH_PYTHON23
91	-mkdir -p $(DESTDIR)@PYTHON23_INSTALL_DIR@;
92	if test -w $(DESTDIR)@PYTHON23_INSTALL_DIR@; then \
93	(cd $(DESTDIR)@PYTHON23_INSTALL_DIR@; \
94	cp -f $(DESTDIR)$(pkgpython23dir)/libgv_python23.so _gv.so; \
95	cp -f $(DESTDIR)$(pkgpython23dir)/gv.py gv.py;) \
96	else \
97	echo "Warning: @PYTHON23_INSTALL_DIR@ is not writable."; \
98	echo "Skipping system installation of python23 binding."; \
99	fi
100	endif
101	if WITH_PYTHON24
102	-mkdir -p $(DESTDIR)@PYTHON24_INSTALL_DIR@;
103	if test -w $(DESTDIR)@PYTHON24_INSTALL_DIR@; then \
104	(cd $(DESTDIR)@PYTHON24_INSTALL_DIR@; \
105	cp -f $(DESTDIR)$(pkgpython24dir)/libgv_python24.so _gv.so; \
106	cp -f $(DESTDIR)$(pkgpython24dir)/gv.py gv.py;) \
107	else \
108	echo "Warning: @PYTHON24_INSTALL_DIR@ is not writable."; \
109	echo "Skipping system installation of python24 binding."; \
110	fi
111	endif
112	if WITH_PYTHON25
113	-mkdir -p $(DESTDIR)@PYTHON25_INSTALL_DIR@;
114	if test -w $(DESTDIR)@PYTHON25_INSTALL_DIR@; then \
115	(cd $(DESTDIR)@PYTHON25_INSTALL_DIR@; \
116	cp -f $(DESTDIR)$(pkgpython25dir)/libgv_python25.so _gv.so; \
117	cp -f $(DESTDIR)$(pkgpython25dir)/gv.py gv.py;) \
118	else \
119	echo "Warning: @PYTHON25_INSTALL_DIR@ is not writable."; \
120	echo "Skipping system installation of python25 binding."; \
121	fi
122	endif
123	if WITH_PYTHON26
124	-mkdir -p $(DESTDIR)@PYTHON26_INSTALL_DIR@;
125	if test -w $(DESTDIR)@PYTHON26_INSTALL_DIR@; then \
126	(cd $(DESTDIR)@PYTHON26_INSTALL_DIR@; \
127	cp -f $(DESTDIR)$(pkgpython26dir)/libgv_python26.so _gv.so; \
128	cp -f $(DESTDIR)$(pkgpython26dir)/gv.py gv.py;) \
129	else \
130	echo "Warning: @PYTHON26_INSTALL_DIR@ is not writable."; \
131	echo "Skipping system installation of python26 binding."; \
132	fi
133	endif
134	if WITH_PYTHON27
135	-mkdir -p $(DESTDIR)@PYTHON27_INSTALL_DIR@;
136	if test -w $(DESTDIR)@PYTHON27_INSTALL_DIR@; then \
137	(cd $(DESTDIR)@PYTHON27_INSTALL_DIR@; \
138	cp -f $(DESTDIR)$(pkgpython27dir)/libgv_python27.so _gv.so; \
139	cp -f $(DESTDIR)$(pkgpython27dir)/gv.py gv.py;) \
140	else \
141	echo "Warning: @PYTHON27_INSTALL_DIR@ is not writable."; \
142	echo "Skipping system installation of python27 binding."; \
143	fi
144	endif
145	if WITH_RUBY	73	if WITH_RUBY
146	-mkdir -p $(DESTDIR)@RUBY_INSTALL_DIR@;	74	-mkdir -p $(DESTDIR)@RUBY_INSTALL_DIR@;
147	if test -w $(DESTDIR)@RUBY_INSTALL_DIR@; then \	75	if test -w $(DESTDIR)@RUBY_INSTALL_DIR@; then \
Lines 178-195 Link Here
178	-rm -rf $(DESTDIR)@PERL_INSTALL_DIR@/gv.so $(DESTDIR)@PERL_INSTALL_DIR@/gv.pm;	106	-rm -rf $(DESTDIR)@PERL_INSTALL_DIR@/gv.so $(DESTDIR)@PERL_INSTALL_DIR@/gv.pm;
179	-rm -rf $(DESTDIR)$(pkgphpdir);	107	-rm -rf $(DESTDIR)$(pkgphpdir);
180	-rm -rf $(DESTDIR)@PHP_INSTALL_DIR@/gv.so $(DESTDIR)@PHP_INSTALL_DATADIR@/gv.php;	108	-rm -rf $(DESTDIR)@PHP_INSTALL_DIR@/gv.so $(DESTDIR)@PHP_INSTALL_DATADIR@/gv.php;
181	-rm -rf $(DESTDIR)$(pkgpythondir);
182	-rm -rf $(DESTDIR)@PYTHON_INSTALL_DIR@/_gv.so $(DESTDIR)@PYTHON_INSTALL_DIR@/gv.py;
183	-rm -rf $(DESTDIR)$(pkgpython23dir);
184	-rm -rf $(DESTDIR)@PYTHON23_INSTALL_DIR@/_gv.so $(DESTDIR)@PYTHON_INSTALL_DIR@/gv.py;
185	-rm -rf $(DESTDIR)$(pkgpython24dir);
186	-rm -rf $(DESTDIR)@PYTHON24_INSTALL_DIR@/_gv.so $(DESTDIR)@PYTHON_INSTALL_DIR@/gv.py;
187	-rm -rf $(DESTDIR)$(pkgpython25dir);
188	-rm -rf $(DESTDIR)@PYTHON25_INSTALL_DIR@/_gv.so $(DESTDIR)@PYTHON_INSTALL_DIR@/gv.py;
189	-rm -rf $(DESTDIR)$(pkgpython26dir);
190	-rm -rf $(DESTDIR)@PYTHON26_INSTALL_DIR@/_gv.so $(DESTDIR)@PYTHON_INSTALL_DIR@/gv.py;
191	-rm -rf $(DESTDIR)$(pkgpython27dir);
192	-rm -rf $(DESTDIR)@PYTHON27_INSTALL_DIR@/_gv.so $(DESTDIR)@PYTHON_INSTALL_DIR@/gv.py;
193	-rm -rf $(DESTDIR)$(pkgRdir);	109	-rm -rf $(DESTDIR)$(pkgRdir);
194	-rm -rf $(DESTDIR)$(pkgrubydir);	110	-rm -rf $(DESTDIR)$(pkgrubydir);
195	-rm -rf $(DESTDIR)@RUBY_INSTALL_DIR@/gv.so;	111	-rm -rf $(DESTDIR)@RUBY_INSTALL_DIR@/gv.so;