]> granicus.if.org Git - graphviz/commitdiff
deal with missing python3.pc on ubuntu
authorJohn Ellson <ellson@research.att.com>
Wed, 19 Jul 2017 03:42:29 +0000 (23:42 -0400)
committerJohn Ellson <ellson@research.att.com>
Wed, 19 Jul 2017 03:42:29 +0000 (23:42 -0400)
configure.ac
tclpkg/Makefile.am
tclpkg/gv/Makefile.am
tclpkg/gv/demo/Makefile.am

index 9dab60f40e3ff2f360d5d21b50692c92ba4e6ad1..7dd75e7959f6005db2749ee8be29075671d3ee62 100644 (file)
@@ -1208,14 +1208,17 @@ else
         fi
       fi
       if test "x$PYTHON2" = "x"; then
-       use_python2="No (python2 is too old)"
+           use_python2="No (python2 is too old)"
       else
         if test "x$PKG_CONFIG" != "x"; then
           AC_MSG_CHECKING(for Python2 headers and libraries with pkg-config)
+          echo
           pkgconfig_python2_found=`$PKG_CONFIG --exists python-$PYTHON2_VERSION 2>/dev/null`
           if test "x$?" = "x0" ; then
                PYTHON2_INCLUDES="$PYTHON2_CFLAGS "`$PKG_CONFIG --cflags python-$PYTHON2_VERSION`
                PYTHON2_LIBS="$PYTHON2_LFLAGS "`$PKG_CONFIG --libs python-$PYTHON2_VERSION`
+          else
+                  use_python2="No (python-$PYTHON2_VERSION.pc not found)"
           fi
         fi
         PYTHON2_PREFIX=`$PYTHON2 -c "import sys; print(sys.prefix)"`
@@ -1277,10 +1280,13 @@ else
       else
         if test "x$PKG_CONFIG" != "x"; then
           AC_MSG_CHECKING(for Python3 headers and libraries with pkg-config)
+          echo
           pkgconfig_python3_found=`$PKG_CONFIG --exists python-$PYTHON3_VERSION 2>/dev/null`
           if test "x$?" = "x0" ; then
                PYTHON3_INCLUDES="$PYTHON3_CFLAGS "`$PKG_CONFIG --cflags python-$PYTHON3_VERSION`
                PYTHON3_LIBS="$PYTHON3_LFLAGS "`$PKG_CONFIG --libs python-$PYTHON3_VERSION`
+          else
+                  use_python3="No (python-$PYTHON3_VERSION.pc not found)"
           fi
         fi
         PYTHON3_PREFIX=`$PYTHON3 -c "import sys; print(sys.prefix)"`
@@ -1304,388 +1310,6 @@ else
 fi
 AM_CONDITIONAL(WITH_PYTHON3, [test "x$use_python3" = "xYes"])
 
-dnl -----------------------------------
-dnl INCLUDES and LIBS for PYTHON23
-
-AC_ARG_ENABLE(python23,
-  [AS_HELP_STRING([--enable-python23=no],[python23 language bindings])],
-  [], [enable_python23=no])
-
-if test "x$enable_python23" != "xyes"; then
-  use_python23="No (disabled by default - for multiversion installs)"
-else
-  if test "x$use_swig" != "xYes"; then
-    use_python23="No (swig not available)"
-  else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
-      use_python23="No (swig does not support -python option)"
-    else
-      AC_CHECK_PROG(PYTHON23,python2.3,python2.3)
-      if test "x$PYTHON23" = "x"; then
-        use_python23="No (python23 not available)"
-      else
-        PYTHON23_VERSION=`$PYTHON23 -V 2>&1 | $EGREP Python | cut -d ' ' -f 2`
-        if test "x$PYTHON23_VERSION" = "x"; then
-          PYTHON23=
-        else
-          PYTHON23_VERSION_MAJOR=`echo $PYTHON23_VERSION | cut -d '.' -f 1`
-          PYTHON23_VERSION_MINOR=`echo $PYTHON23_VERSION | cut -d '.' -f 2`
-          PYTHON23_VERSION_SHORT=$PYTHON23_VERSION_MAJOR.$PYTHON23_VERSION_MINOR
-          if test $PYTHON23_VERSION_MAJOR -lt 3; then
-            if test $PYTHON23_VERSION_MAJOR -lt 2; then
-             PYTHON23=
-            else
-              if test $PYTHON23_VERSION_MINOR -lt 3; then
-               PYTHON23=
-              fi
-            fi
-          fi
-        fi
-      fi
-      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`"
-        save_CPPFLAGS=$CPPFLAGS
-        CPPFLAGS="$CPPFLAGS $PYTHON23_INCLUDES"
-        AC_CHECK_HEADER(Python.h,,[
-          use_python23="No (missing header)"
-          PYTHON23=
-        ])
-        CPPFLAGS=$save_CPPFLAGS
-       if test "x$PYTHON23" != "x"; then
-         use_python23="Yes"
-          AC_SUBST([PYTHON23_INSTALL_DIR])
-          AC_SUBST([PYTHON23_INCLUDES])
-          AC_SUBST([PYTHON23_LIBS])
-        fi
-      fi
-    fi
-  fi
-fi
-AM_CONDITIONAL(WITH_PYTHON23, [test "x$use_python23" = "xYes"])
-
-dnl -----------------------------------
-dnl INCLUDES and LIBS for PYTHON24
-
-AC_ARG_ENABLE(python24,
-  [AS_HELP_STRING([--enable-python24=no],[python24 language bindings])],
-  [], [enable_python24=no])
-
-if test "x$enable_python24" != "xyes"; then
-  use_python24="No (disabled by default - for multiversion installs)"
-else
-  if test "x$use_swig" != "xYes"; then
-    use_python24="No (swig not available)"
-  else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
-      use_python24="No (swig does not support -python option)"
-    else
-      AC_CHECK_PROG(PYTHON24,python2.4,python2.4)
-      if test "x$PYTHON24" = "x"; then
-        use_python24="No (python24 not available)"
-      else
-        PYTHON24_VERSION=`$PYTHON24 -V 2>&1 | $EGREP Python | cut -d ' ' -f 2`
-        if test "x$PYTHON24_VERSION" = "x"; then
-          PYTHON24=
-        else
-          PYTHON24_VERSION_MAJOR=`echo $PYTHON24_VERSION | cut -d '.' -f 1`
-          PYTHON24_VERSION_MINOR=`echo $PYTHON24_VERSION | cut -d '.' -f 2`
-          PYTHON24_VERSION_SHORT=$PYTHON24_VERSION_MAJOR.$PYTHON24_VERSION_MINOR
-          if test $PYTHON24_VERSION_MAJOR -lt 3; then
-            if test $PYTHON24_VERSION_MAJOR -lt 2; then
-             PYTHON24=
-            else
-              if test $PYTHON24_VERSION_MINOR -lt 4; then
-               PYTHON24=
-              fi
-            fi
-          fi
-        fi
-      fi
-      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`"
-        save_CPPFLAGS=$CPPFLAGS
-        CPPFLAGS="$CPPFLAGS $PYTHON24_INCLUDES"
-        AC_CHECK_HEADER(Python.h,,[
-          use_python24="No (missing header)"
-          PYTHON24=
-        ])
-        CPPFLAGS=$save_CPPFLAGS
-       if test "x$PYTHON24" != "x"; then
-         use_python24="Yes"
-          AC_SUBST([PYTHON24_INSTALL_DIR])
-          AC_SUBST([PYTHON24_INCLUDES])
-          AC_SUBST([PYTHON24_LIBS])
-        fi
-      fi
-    fi
-  fi
-fi
-AM_CONDITIONAL(WITH_PYTHON24, [test "x$use_python24" = "xYes"])
-
-dnl -----------------------------------
-dnl INCLUDES and LIBS for PYTHON25
-
-AC_ARG_ENABLE(python25,
-  [AS_HELP_STRING([--enable-python25=no],[python25 language bindings])],
-  [], [enable_python25=no])
-
-if test "x$enable_python25" != "xyes"; then
-  use_python25="No (disabled by default - for multiversion installs)"
-else
-  if test "x$use_swig" != "xYes"; then
-    use_python25="No (swig not available)"
-  else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
-      use_python25="No (swig does not support -python option)"
-    else
-      AC_CHECK_PROG(PYTHON25,python2.5,python2.5)
-      if test "x$PYTHON25" = "x"; then
-        use_python25="No (python25 not available)"
-      else
-        PYTHON25_VERSION=`$PYTHON25 -V 2>&1 | $EGREP Python | cut -d ' ' -f 2`
-        if test "x$PYTHON25_VERSION" = "x"; then
-          PYTHON25=
-        else
-          PYTHON25_VERSION_MAJOR=`echo $PYTHON25_VERSION | cut -d '.' -f 1`
-          PYTHON25_VERSION_MINOR=`echo $PYTHON25_VERSION | cut -d '.' -f 2`
-          PYTHON25_VERSION_SHORT=$PYTHON25_VERSION_MAJOR.$PYTHON25_VERSION_MINOR
-          if test $PYTHON25_VERSION_MAJOR -lt 3; then
-            if test $PYTHON25_VERSION_MAJOR -lt 2; then
-             PYTHON25=
-            else
-              if test $PYTHON25_VERSION_MINOR -lt 5; then
-               PYTHON25=
-              fi
-            fi
-          fi
-        fi
-      fi
-      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`"
-        save_CPPFLAGS=$CPPFLAGS
-        CPPFLAGS="$CPPFLAGS $PYTHON25_INCLUDES"
-        AC_CHECK_HEADER(Python.h,,[
-          use_python25="No (missing header)"
-          PYTHON25=
-        ])
-        CPPFLAGS=$save_CPPFLAGS
-       if test "x$PYTHON25" != "x"; then
-         use_python25="Yes"
-          AC_SUBST([PYTHON25_INSTALL_DIR])
-          AC_SUBST([PYTHON25_INCLUDES])
-          AC_SUBST([PYTHON25_LIBS])
-        fi
-      fi
-    fi
-  fi
-fi
-AM_CONDITIONAL(WITH_PYTHON25, [test "x$use_python25" = "xYes"])
-
-dnl -----------------------------------
-dnl INCLUDES and LIBS for PYTHON26
-
-AC_ARG_ENABLE(python26,
-  [AS_HELP_STRING([--enable-python26=no],[python26 language bindings])],
-  [], [enable_python26=no])
-
-if test "x$enable_python26" != "xyes"; then
-  use_python26="No (disabled by default - for multiversion installs)"
-else
-  if test "x$use_swig" != "xYes"; then
-    use_python26="No (swig not available)"
-  else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
-      use_python26="No (swig does not support -python option)"
-    else
-      AC_CHECK_PROG(PYTHON26,python2.6,python2.6)
-      if test "x$PYTHON26" = "x"; then
-        use_python26="No (python26 not available)"
-      else
-        PYTHON26_VERSION=`$PYTHON26 -V 2>&1 | $EGREP Python | cut -d ' ' -f 2`
-        if test "x$PYTHON26_VERSION" = "x"; then
-          PYTHON26=
-        else
-          PYTHON26_VERSION_MAJOR=`echo $PYTHON26_VERSION | cut -d '.' -f 1`
-          PYTHON26_VERSION_MINOR=`echo $PYTHON26_VERSION | cut -d '.' -f 2`
-          PYTHON26_VERSION_SHORT=$PYTHON26_VERSION_MAJOR.$PYTHON26_VERSION_MINOR
-          if test $PYTHON26_VERSION_MAJOR -lt 3; then
-            if test $PYTHON26_VERSION_MAJOR -lt 2; then
-             PYTHON26=
-            else
-              if test $PYTHON26_VERSION_MINOR -lt 5; then
-               PYTHON26=
-              fi
-            fi
-          fi
-        fi
-      fi
-      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`"
-        save_CPPFLAGS=$CPPFLAGS
-        CPPFLAGS="$CPPFLAGS $PYTHON26_INCLUDES"
-        AC_CHECK_HEADER(Python.h,,[
-          use_python26="No (missing header)"
-          PYTHON26=
-        ])
-        CPPFLAGS=$save_CPPFLAGS
-       if test "x$PYTHON26" != "x"; then
-         use_python26="Yes"
-          AC_SUBST([PYTHON26_INSTALL_DIR])
-          AC_SUBST([PYTHON26_INCLUDES])
-          AC_SUBST([PYTHON26_LIBS])
-        fi
-      fi
-    fi
-  fi
-fi
-AM_CONDITIONAL(WITH_PYTHON26, [test "x$use_python26" = "xYes"])
-
-dnl -----------------------------------
-dnl INCLUDES and LIBS for PYTHON27
-
-AC_ARG_ENABLE(python27,
-  [AS_HELP_STRING([--enable-python27=no],[python27 language bindings])],
-  [], [enable_python27=no])
-
-if test "x$enable_python27" != "xyes"; then
-  use_python27="No (disabled by default - for multiversion installs)"
-else
-  if test "x$use_swig" != "xYes"; then
-    use_python27="No (swig not available)"
-  else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
-      use_python27="No (swig does not support -python option)"
-    else
-      AC_CHECK_PROG(PYTHON27,python2.7,python2.7)
-      if test "x$PYTHON27" = "x"; then
-        use_python27="No (python27 not available)"
-      else
-        PYTHON27_VERSION=`$PYTHON27 -V 2>&1 | $EGREP Python | cut -d ' ' -f 2`
-        if test "x$PYTHON27_VERSION" = "x"; then
-          PYTHON27=
-        else
-          PYTHON27_VERSION_MAJOR=`echo $PYTHON27_VERSION | cut -d '.' -f 1`
-          PYTHON27_VERSION_MINOR=`echo $PYTHON27_VERSION | cut -d '.' -f 2`
-          PYTHON27_VERSION_SHORT=$PYTHON27_VERSION_MAJOR.$PYTHON27_VERSION_MINOR
-          if test $PYTHON27_VERSION_MAJOR -lt 3; then
-            if test $PYTHON27_VERSION_MAJOR -lt 2; then
-             PYTHON27=
-            else
-              if test $PYTHON27_VERSION_MINOR -lt 5; then
-               PYTHON27=
-              fi
-            fi
-          fi
-        fi
-      fi
-      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`"
-        save_CPPFLAGS=$CPPFLAGS
-        CPPFLAGS="$CPPFLAGS $PYTHON27_INCLUDES"
-        AC_CHECK_HEADER(Python.h,,[
-          use_python27="No (missing header)"
-          PYTHON27=
-        ])
-        CPPFLAGS=$save_CPPFLAGS
-       if test "x$PYTHON27" != "x"; then
-         use_python27="Yes"
-          AC_SUBST([PYTHON27_INSTALL_DIR])
-          AC_SUBST([PYTHON27_INCLUDES])
-          AC_SUBST([PYTHON27_LIBS])
-        fi
-      fi
-    fi
-  fi
-fi
-AM_CONDITIONAL(WITH_PYTHON27, [test "x$use_python27" = "xYes"])
-
-dnl -----------------------------------
-dnl INCLUDES and LIBS for PYTHON34
-
-AC_ARG_ENABLE(python34,
-  [AS_HELP_STRING([--enable-python34=no],[python34 language bindings])],
-  [], [enable_python34=no])
-
-if test "x$enable_python34" != "xyes"; then
-  use_python34="No (disabled by default - for multiversion installs)"
-else
-  if test "x$use_swig" != "xYes"; then
-    use_python34="No (swig not available)"
-  else
-    if test `$SWIG -help 2>&1 | $EGREP -c '\-python *- Generate'` = 0; then
-      use_python34="No (swig does not support -python option)"
-    else
-      AC_CHECK_PROG(PYTHON34,python3.4,python3.4)
-      if test "x$PYTHON34" = "x"; then
-        use_python34="No (python34 not available)"
-      else
-        PYTHON34_VERSION=`$PYTHON34 -V 2>&1 | $EGREP Python | cut -d ' ' -f 2`
-        if test "x$PYTHON34_VERSION" = "x"; then
-          PYTHON34=
-        else
-          PYTHON34_VERSION_MAJOR=`echo $PYTHON34_VERSION | cut -d '.' -f 1`
-          PYTHON34_VERSION_MINOR=`echo $PYTHON34_VERSION | cut -d '.' -f 2`
-          PYTHON34_VERSION_SHORT=$PYTHON34_VERSION_MAJOR.$PYTHON34_VERSION_MINOR
-          if test $PYTHON34_VERSION_MAJOR -lt 3; then
-            if test $PYTHON34_VERSION_MINOR -lt 4; then
-                 PYTHON34=
-            fi
-          fi
-        fi
-      fi
-      if test "x$PYTHON34" = "x"; then
-           use_python34="No (python34 is too old)"
-      else
-        PYTHON34_PREFIX=`$PYTHON3 -c "import sys; print sys.prefix"`
-#        PYTHON34_INCLUDES=-I$PYTHON34_PREFIX/include/python$PYTHON34_VERSION_SHORT
-# FIXME - whats the stupid "m" for?
-        PYTHON34_INCLUDES=-I/usr/include/python3.4m
-        PYTHON34_LIBS="-lpython$PYTHON_VERSION_SHORT"
-        PYTHON34_INSTALL_DIR="`$PYTHON34 $srcdir/config/config_python.py archsitelib`"
-        save_CPPFLAGS=$CPPFLAGS
-        CPPFLAGS="$CPPFLAGS $PYTHON34_INCLUDES"
-        AC_CHECK_HEADER(Python.h,,[
-          use_python34="No (missing header)"
-          PYTHON34=
-        ])
-        CPPFLAGS=$save_CPPFLAGS
-       if test "x$PYTHON34" != "x"; then
-         use_python34="Yes"
-          AC_SUBST([PYTHON34_INSTALL_DIR])
-          AC_SUBST([PYTHON34_INCLUDES])
-          AC_SUBST([PYTHON34_LIBS])
-        fi
-      fi
-    fi
-  fi
-fi
-AM_CONDITIONAL(WITH_PYTHON34, [test "x$use_python34" = "xYes"])
-
 dnl -----------------------------------
 dnl INCLUDES and LIBS for R
 
@@ -3427,12 +3051,6 @@ echo "  gv_php:        $use_php"
 echo "  gv_python:     $use_python"
 echo "  gv_python2:    $use_python2"
 echo "  gv_python3:    $use_python3"
-echo "  gv_python23:   $use_python23"
-echo "  gv_python24:   $use_python24"
-echo "  gv_python25:   $use_python25"
-echo "  gv_python26:   $use_python26"
-echo "  gv_python27:   $use_python27"
-echo "  gv_python34:   $use_python34"
 echo "  gv_R:          $use_r"
 echo "  gv_ruby:       $use_ruby"
 echo "  gv_tcl:        $use_gv_tcl"
index b34c50da3f2a3881d1207bfc748630a7c1db04b1..c5f7a4445ef1cd004665ead90683a194995854e4 100644 (file)
@@ -13,11 +13,6 @@ pkgphpdir = $(pkglibdir)/php
 pkgpythondir = $(pkglibdir)/python
 pkgpython2dir = $(pkglibdir)/python2
 pkgpython3dir = $(pkglibdir)/python3
-pkgpython23dir = $(pkglibdir)/python23
-pkgpython24dir = $(pkglibdir)/python24
-pkgpython25dir = $(pkglibdir)/python25
-pkgpython26dir = $(pkglibdir)/python26
-pkgpython27dir = $(pkglibdir)/python27
 pkgRdir = $(pkglibdir)/R
 pkgrubydir = $(pkglibdir)/ruby
 pkgtcldir = $(pkglibdir)/tcl
@@ -111,61 +106,6 @@ if WITH_PYTHON3
                echo "Skipping system installation of python3 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 \
index 6d69cff2a393fd6fe729be6ca5337bf09e82f684..02d886c1ef3142d884cef56475e13978154e9a65 100644 (file)
@@ -218,72 +218,6 @@ $(PYTHON3_data): gv_python3.cpp
 gv_python3.cpp: gv.i
        $(SWIG) -c++ -python -o gv_python3.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 -classic -o gv_python23.cpp $(srcdir)/gv.i
-
-pkgpython24dir = $(pkglibdir)/python24
-PYTHON24_data = gv.py
-nodist_libgv_python24_la_SOURCES = gv_python24.cpp $(PYTHON24_data)
-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 -classic -o gv_python24.cpp $(srcdir)/gv.i
-
-pkgpython25dir = $(pkglibdir)/python25
-PYTHON25_data = gv.py
-nodist_libgv_python25_la_SOURCES = gv_python25.cpp $(PYTHON25_data)
-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 -classic -o gv_python25.cpp $(srcdir)/gv.i
-
-pkgpython26dir = $(pkglibdir)/python26
-PYTHON26_data = gv.py
-nodist_libgv_python26_la_SOURCES = gv_python26.cpp $(PYTHON26_data)
-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 gv_python26.cpp $(srcdir)/gv.i
-
-pkgpython27dir = $(pkglibdir)/python27
-PYTHON27_data = gv.py
-nodist_libgv_python27_la_SOURCES = gv_python27.cpp $(PYTHON27_data)
-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 gv_python27.cpp $(srcdir)/gv.i
-
-pkgpython34dir = $(pkglibdir)/python34
-PYTHON34_data = gv.py
-nodist_libgv_python34_la_SOURCES = gv_python34.cpp $(PYTHON34_data)
-libgv_python34_la_SOURCES = $(BASESOURCES) gv_dummy_init.c
-libgv_python34_la_LIBADD = $(BASELIBS) $(PYTHON34_LIBS)
-libgv_python34_la_LDFLAGS = -module -avoid-version
-libgv_python34_la_CPPFLAGS = $(BASECPPFLAGS) $(PYTHON34_INCLUDES)
-# $(PYTHON34_data): gv_python34.cpp
-gv_python34.cpp: gv.i
-       $(SWIG) -c++ -python -o gv_python34.cpp $(srcdir)/gv.i
-
 pkgRdir = $(pkglibdir)/R
 R_data = 
 nodist_libgv_R_la_SOURCES = gv_R.cpp $(R_data)
@@ -401,36 +335,6 @@ pkgpython3_DATA = $(PYTHON3_data)
 pkgpython3_LTLIBRARIES = libgv_python3.la
 DEVTSTS += test_python3
 endif
-if WITH_PYTHON23
-pkgpython23_DATA = $(PYTHON23_data)
-pkgpython23_LTLIBRARIES = libgv_python23.la
-#DEVTSTS += test_python23
-endif
-if WITH_PYTHON24
-pkgpython24_DATA = $(PYTHON24_data)
-pkgpython24_LTLIBRARIES = libgv_python24.la
-#DEVTSTS += test_python24
-endif
-if WITH_PYTHON25
-pkgpython25_DATA = $(PYTHON25_data)
-pkgpython25_LTLIBRARIES = libgv_python25.la
-#DEVTSTS += test_python25
-endif
-if WITH_PYTHON26
-pkgpython26_DATA = $(PYTHON26_data)
-pkgpython26_LTLIBRARIES = libgv_python26.la
-#DEVTSTS += test_python26
-endif
-if WITH_PYTHON27
-pkgpython27_DATA = $(PYTHON27_data)
-pkgpython27_LTLIBRARIES = libgv_python27.la
-#DEVTSTS += test_python27
-endif
-if WITH_PYTHON34
-pkgpython34_DATA = $(PYTHON34_data)
-pkgpython34_LTLIBRARIES = libgv_python34.la
-#DEVTSTS += test_python34
-endif
 man_MANS += gv.3python
 pdf_DATA += gv.3python.pdf
 if WITH_R
@@ -467,7 +371,6 @@ man = gv.3sharp gv.3go gv.3guile gv.3io gv.3java gv.3lua gv.3ocaml \
 pdf = gv.3sharp.pdf gv.3go.pdf gv.3guile.pdf gv.3io.pdf gv.3java.pdf gv.3lua.pdf \
       gv.3ocaml.pdf gv.3perl.pdf gv.3php.pdf gv.3python.pdf gv.3r.pdf gv.3ruby.pdf gv.3tcl.pdf
 
-
 $(man): gv.i gv_doc_writer.tcl gv_doc_template.tcl gv_doc_langs.tcl
        $(TCLSH) $(srcdir)/gv_doc_writer.tcl "$(srcdir)"
 
@@ -532,24 +435,6 @@ endif
 if WITH_PYTHON3
        (cd $(DESTDIR)$(pkgpython3dir); 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_PYTHON24
-       (cd $(DESTDIR)$(pkgpython24dir); rm -f _gv.so; $(LN_S) libgv_python24.so _gv.so;)
-endif
-if WITH_PYTHON25
-       (cd $(DESTDIR)$(pkgpython25dir); rm -f _gv.so; $(LN_S) libgv_python25.so _gv.so;)
-endif
-if WITH_PYTHON26
-       (cd $(DESTDIR)$(pkgpython26dir); rm -f _gv.so; $(LN_S) libgv_python26.so _gv.so;)
-endif
-if WITH_PYTHON27
-       (cd $(DESTDIR)$(pkgpython27dir); rm -f _gv.so; $(LN_S) libgv_python27.so _gv.so;)
-endif
-if WITH_PYTHON34
-       (cd $(DESTDIR)$(pkgpython34dir); rm -f _gv.so; $(LN_S) libgv_python34.so _gv.so;)
-endif
 if WITH_R
        (cd $(DESTDIR)$(pkgRdir);   rm -f gv.so;  $(LN_S) libgv_R.so gv.so;)
 endif
@@ -687,15 +572,8 @@ CLEANFILES = test_*/* pkgIndex.tcl \
        gv_python.cpp $(PYTHON_data) gv.pyc \
        gv_python2.cpp $(PYTHON2_data) gv.pyc \
        gv_python3.cpp $(PYTHON3_data) gv.pyc \
-       gv_python23.cpp $(PYTHON23_data) gv.pyc \
-       gv_python24.cpp $(PYTHON24_data) gv.pyc \
-       gv_python25.cpp $(PYTHON25_data) gv.pyc \
-       gv_python26.cpp $(PYTHON26_data) gv.pyc \
-       gv_python27.cpp $(PYTHON27_data) gv.pyc \
-       gv_python34.cpp $(PYTHON34_data) gv.pyc \
        gv_R.cpp $(R_data) \
        gv_ruby.cpp $(RUBY_data) \
        gv_tcl.cpp $(TCL_data) pkgIndex.tcl
 
 DISTCLEANFILES = gv_*.n gv_*.pdf
-
index 1e49749ff2715e301e5b5e1a67091a5169282310..b582cfd85385c33e262652a04cbc705755a2f025 100644 (file)
@@ -12,9 +12,6 @@ demophpdir = $(pkgdatadir)/demo
 demopythondir = $(pkgdatadir)/demo
 demopython2dir = $(pkgdatadir)/demo
 demopython3dir = $(pkgdatadir)/demo
-demopython23dir = $(pkgdatadir)/demo
-demopython24dir = $(pkgdatadir)/demo
-demopython25dir = $(pkgdatadir)/demo
 demoRdir = $(pkgdatadir)/demo
 demorubydir = $(pkgdatadir)/demo
 demotcldir = $(pkgdatadir)/demo
@@ -52,15 +49,6 @@ endif
 if WITH_PYTHON3
 demopython3_SCRIPTS = modgraph.py
 endif
-if WITH_PYTHON23
-demopython23_SCRIPTS =
-endif
-if WITH_PYTHON24
-demopython24_SCRIPTS =
-endif
-if WITH_PYTHON25
-demopython25_SCRIPTS =
-endif
 if WITH_R
 demoR_SCRIPTS =
 endif