more ming cleanup - don't break current builds

diff --git a/configure.ac b/configure.ac
index 769ef7a4857d39b52af46b242c1edf50a4b1b266..e65d40d43f19e048a3d96bc298a434b64f80e210 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1682,20 +1682,20 @@ AM_GLIB_GNU_GETTEXT
 dnl -----------------------------------
 dnl INCLUDES and LIBS for MING (SWF renderer)
 
-AC_ARG_WITH(libming,
-  [AC_HELP_STRING([--with-libming=yes], [libming library (plugin for -Tswf)])],
-  [], [with_libming=yes])
-
-if test "x$with_libming" = "xyes"; then
-PKG_CHECK_MODULES(LIBMING, [libming >= 0.4],
-       [HAVE_LIBMING=1
-       AC_DEFINE_UNQUOTED(HAVE_LIBMING,1,
-               [Define if you have the libming library for SWF support])],
-       [AC_MSG_WARN(libming library not available)])
-fi
-AC_SUBST(LIBMING_CFLAGS)
-AC_SUBST(LIBMING_LIBS)
-AM_CONDITIONAL(WITH_LIBMING, [test "x$HAVE_LIBMING" != "x"])
+AC_ARG_WITH(ming,
+  [AC_HELP_STRING([--with-ming=yes], [ming library (plugin for -Tswf)])],
+  [], [with_ming=yes])
+
+if test "x$with_ming" = "xyes"; then
+PKG_CHECK_MODULES(MING, [libming >= 0.4],
+       [HAVE_MING=1
+       AC_DEFINE_UNQUOTED(HAVE_MING,1,
+               [Define if you have the ming library for SWF support])],
+       [AC_MSG_WARN(ming library not available)])
+fi
+AC_SUBST(MING_CFLAGS)
+AC_SUBST(MING_LIBS)
+AM_CONDITIONAL(WITH_MING, [test "x$HAVE_MING" != "x"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GD

diff --git a/graphviz.spec.in b/graphviz.spec.in
index aedd92da85f4aa0491983c36499c1ec39e429d44..0eb25d6b2f7c65c0371cbefb7ac8e05ea216796c 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -41,7 +41,6 @@ Prefix: /usr
 %define TCL    1
 %define IPSEPCOLA --without-ipsepcola
 %define MYLIBGD --with-mylibgd
-%define MING --without-ming
 %define PANGOCAIRO --without-pangocairo
 %define DEVIL 0
 %define MING 0
@@ -146,6 +145,10 @@ BuildRequires: cairo-devel >= 1.1.10 pango-devel gmp-devel lua-devel gtk2-devel
 %define GDK_PIXBUF --with-gdk-pixbuf
 BuildRequires: gd gd-devel perl-devel DevIL-devel
 %endif
+%if "%fedora" >= "9"
+%define MING 1
+BuildRequires: ming ming-devel
+%endif
 %endif
 
 #-- main graphviz rpm ------------------------------------------------

diff --git a/plugin/ming/Makefile.am b/plugin/ming/Makefile.am
index b1561aecb3286dbe648f26c66d457a8508c51804..21636b85a44d0cc7af2532d469cca424e0c03f5c 100644 (file)
--- a/plugin/ming/Makefile.am
+++ b/plugin/ming/Makefile.am
@@ -8,9 +8,9 @@ AM_CPPFLAGS = \
        -I$(top_srcdir)/lib/gvc \
        -I$(top_srcdir)/lib/graph \
        -I$(top_srcdir)/lib/cdt \
-       $(LIBMING_CFLAGS)
+       $(MING_CFLAGS)
 
-if WITH_LIBMING
+if WITH_MING
 noinst_LTLIBRARIES = libgvplugin_ming_C.la
 pkglib_LTLIBRARIES = libgvplugin_ming.la
 pkglib_DATA = Bitstream_Vera_Sans.fdb  Bitstream_Vera_Serif.fdb
@@ -22,6 +22,6 @@ libgvplugin_ming_C_la_SOURCES = \
 
 libgvplugin_ming_la_LDFLAGS = -version-info @GVPLUGIN_VERSION_INFO@
 libgvplugin_ming_la_SOURCES = $(libgvplugin_ming_C_la_SOURCES)
-libgvplugin_ming_la_LIBADD = @LIBMING_LIBS@ @MATH_LIBS@
+libgvplugin_ming_la_LIBADD = @MING_LIBS@ @MATH_LIBS@
 
 EXTRA_DIST = Makefile.old Bitstream_Vera_Sans.fdb Bitstream_Vera_Serif.fdb