Attachment #370414 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$PYTHON_VERSION_SHORT"
        PYTHON23_INSTALL_DIR="`$PYTHON23 $srcdir/config/config_python.py archsitelib`"

      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$PYTHON_VERSION_SHORT"
        PYTHON24_INSTALL_DIR="`$PYTHON24 $srcdir/config/config_python.py archsitelib`"

      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$PYTHON_VERSION_SHORT"
        PYTHON25_INSTALL_DIR="`$PYTHON25 $srcdir/config/config_python.py archsitelib`"

      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$PYTHON_VERSION_SHORT"
        PYTHON26_INSTALL_DIR="`$PYTHON26 $srcdir/config/config_python.py archsitelib`"

      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
        PYTHON24_LIBS="-lpython$PYTHON_VERSION_SHORT"
        PYTHON27_INSTALL_DIR="`$PYTHON27 $srcdir/config/config_python.py archsitelib`"

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

dnl -----------------------------------
dnl INCLUDES and LIBS for PYTHON33

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$PYTHON_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"

Return to bug 501318

Lines 1169-1175 Link Here

(-)graphviz-2.36.0.org/configure.ac (-6 / +70 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-1239 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$PYTHON_VERSION_SHORT"
1239	PYTHON23_INSTALL_DIR="`$PYTHON23 $srcdir/config/config_python.py archsitelib`"	1239	PYTHON23_INSTALL_DIR="`$PYTHON23 $srcdir/config/config_python.py archsitelib`"
Lines 1297-1303 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$PYTHON_VERSION_SHORT"
1303	PYTHON24_INSTALL_DIR="`$PYTHON24 $srcdir/config/config_python.py archsitelib`"	1303	PYTHON24_INSTALL_DIR="`$PYTHON24 $srcdir/config/config_python.py archsitelib`"
Lines 1361-1367 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$PYTHON_VERSION_SHORT"
1367	PYTHON25_INSTALL_DIR="`$PYTHON25 $srcdir/config/config_python.py archsitelib`"	1367	PYTHON25_INSTALL_DIR="`$PYTHON25 $srcdir/config/config_python.py archsitelib`"
Lines 1425-1431 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$PYTHON_VERSION_SHORT"
1431	PYTHON26_INSTALL_DIR="`$PYTHON26 $srcdir/config/config_python.py archsitelib`"	1431	PYTHON26_INSTALL_DIR="`$PYTHON26 $srcdir/config/config_python.py archsitelib`"
Lines 1489-1495 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	PYTHON24_LIBS="-lpython$PYTHON_VERSION_SHORT"
1495	PYTHON27_INSTALL_DIR="`$PYTHON27 $srcdir/config/config_python.py archsitelib`"	1495	PYTHON27_INSTALL_DIR="`$PYTHON27 $srcdir/config/config_python.py archsitelib`"
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
		1518	AC_ARG_ENABLE(python33,
		1519	[AS_HELP_STRING([--enable-python33=no],[python33 language bindings])],
		1520	[], [enable_python33=no])
		1521
		1522	if test "x$enable_python33" != "xyes"; then
		1523	use_python33="No (disabled by default - for multiversion installs)"
		1524	else
		1525	if test "x$use_swig" != "xYes"; then
		1526	use_python33="No (swig not available)"
		1527	else
		1528	if test `$SWIG -help 2>&1 \| $EGREP -c '\-python *- Generate'` = 0; then
		1529	use_python33="No (swig does not support -python option)"
		1530	else
		1531	AC_CHECK_PROG(PYTHON33,python3.3,python3.3)
		1532	if test "x$PYTHON33" = "x"; then
		1533	use_python33="No (python33 not available)"
		1534	else
		1535	PYTHON33_VERSION=`$PYTHON33 -V 2>&1 \| $EGREP Python \| cut -d ' ' -f 2`
		1536	if test "x$PYTHON33_VERSION" = "x"; then
		1537	PYTHON33=
		1538	else
		1539	PYTHON33_VERSION_MAJOR=`echo $PYTHON33_VERSION \| cut -d '.' -f 1`
		1540	PYTHON33_VERSION_MINOR=`echo $PYTHON33_VERSION \| cut -d '.' -f 2`
		1541	PYTHON33_VERSION_SHORT=$PYTHON33_VERSION_MAJOR.$PYTHON33_VERSION_MINOR
		1542	if test $PYTHON33_VERSION_MAJOR -eq 3; then
		1543	if test $PYTHON33_VERSION_MINOR -lt 3; then
		1544	PYTHON33=
		1545	fi
		1546	else
		1547	PYTHON33=
		1548	fi
		1549	fi
		1550	fi
		1551	if test "x$PYTHON33" = "x"; then
		1552	# TODO REALLY?
		1553	use_python33="No (python3.3 is too old ;-)"
		1554	else
		1555	PYTHON33_PREFIX=`$PYTHON33 -c "import sys; print(sys.prefix)"`
		1556	PYTHON33_INCLUDES=-I$PYTHON33_PREFIX/include/python$PYTHON33_VERSION_SHORT
		1557	PYTHON33_LIBS="-lpython$PYTHON_VERSION_SHORT"
		1558	PYTHON33_INSTALL_DIR="`$PYTHON33 $srcdir/config/config_python.py archsitelib`"
		1559	save_CPPFLAGS=$CPPFLAGS
		1560	CPPFLAGS="$CPPFLAGS $PYTHON33_INCLUDES"
		1561	AC_CHECK_HEADER(Python.h,,[
		1562	use_python33="No (missing header)"
		1563	PYTHON33=
		1564	])
		1565	CPPFLAGS=$save_CPPFLAGS
		1566	if test "x$PYTHON33" != "x"; then
		1567	use_python33="Yes"
		1568	AC_SUBST([PYTHON33_INSTALL_DIR])
		1569	AC_SUBST([PYTHON33_INCLUDES])
		1570	AC_SUBST([PYTHON33_LIBS])
		1571	fi
		1572	fi
		1573	fi
		1574	fi
		1575	fi
		1576	AM_CONDITIONAL(WITH_PYTHON33, [test "x$use_python33" = "xYes"])
		1577
		1578	dnl -----------------------------------
1516	dnl INCLUDES and LIBS for R	1579	dnl INCLUDES and LIBS for R
1517		1580
1518	AC_ARG_ENABLE(r,	1581	AC_ARG_ENABLE(r,
Lines 3385-3390 Link Here
3385	echo " gv_python25: $use_python25"	3448	echo " gv_python25: $use_python25"
3386	echo " gv_python26: $use_python26"	3449	echo " gv_python26: $use_python26"
3387	echo " gv_python27: $use_python27"	3450	echo " gv_python27: $use_python27"
		3451	echo " gv_python33: $use_python33"
3388	echo " gv_R: $use_r"	3452	echo " gv_R: $use_r"
3389	echo " gv_ruby: $use_ruby"	3453	echo " gv_ruby: $use_ruby"
3390	echo " gv_tcl: $use_gv_tcl"	3454	echo " gv_tcl: $use_gv_tcl"