fix pangocairo breakage from last commit

diff --git a/ChangeLog b/ChangeLog
index 0d1a01f49aa465d6f5f750b27785c9899e070fca..b48fdcae5df899f198c7bdb1f0767866cf65cc81 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,10 @@
-November 29, 2016
+December 5, 2016
     - Release 2.40.0
        - number rounding added to SVG renderer (same as PS and TK rounding) to
        aid regression testing.
        - additional regressson test framework, used in Travis CI builds. (Erwin
        Janssen)
+       - PHP7 support (requires swig-3.0.11 or later)
        - Allow user to specify clustering algorithm in gvmap.
        - Add Sierpinski graph generator to gvgen
        - Extensive code cleanup (Erwin Janssen)

diff --git a/configure.ac b/configure.ac
index 99dc924253bb0d7976a45eb5670802897d2e85e7..881af8d0a7ce80c0d1334152056e90884179ef2e 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2177,20 +2177,16 @@ AC_ARG_WITH(pangocairo,
 if test "x$with_pangocairo" != "xyes"; then
   use_pangocairo="No (disabled)"
 else
-  if test "x$use_cairo" != "xYes"; then
-    use_pangocairo="No (missing cairo support)"
-  else
-    # require at least the version available on centos5 (fc6 has 1.14.10)
-    PKG_CHECK_MODULES(PANGOCAIRO, [pangocairo >= 1.14.9],[
-      use_pangocairo="Yes"
-      AC_DEFINE_UNQUOTED(HAVE_PANGOCAIRO,1,
-        [Define if you have the pangocairo library])
-      AC_SUBST([PANGOCAIRO_CFLAGS])
-      AC_SUBST([PANGOCAIRO_LIBS])
-    ],[
-      use_pangocairo="No (pangocairo library not available)"
-    ])
-  fi
+  # require at least the version available on centos5 (fc6 has 1.14.10)
+  PKG_CHECK_MODULES(PANGOCAIRO, [pangocairo >= 1.14.9],[
+    use_pangocairo="Yes"
+    AC_DEFINE_UNQUOTED(HAVE_PANGOCAIRO,1,
+      [Define if you have the pangocairo library])
+    AC_SUBST([PANGOCAIRO_CFLAGS])
+    AC_SUBST([PANGOCAIRO_LIBS])
+  ],[
+    use_pangocairo="No (pangocairo library not available)"
+  ])
 fi
 AM_CONDITIONAL(WITH_PANGOCAIRO, [test "x$use_pangocairo" = "xYes"])
 

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 4d70d09749ae51a9457f11daa288b5b36f217fb1..5ba14a298d8241b421bb79fd767f1751743d6ba0 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -169,7 +169,7 @@ BuildRequires: golang >= 1.2 gcc-go swig >= 3.0.2
 %if %fedora <= 24
 %define PHP 1
 BuildRequires: php-devel
-# disable PHP7 in fc25 until swig supports it
+# disable PHP7 in fc25 until swig supports it - requires swig-3.0.11
 %endif
 %endif