modify ming configuration to support unmodified ming sources sinc my ming.pc contribu...

diff --git a/configure.ac b/configure.ac
index 03d3bd42ae5180b1252e3698bebffbc5ca70831e..416c7df7292c026e38118a9fd5964ef159e49a50 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1278,25 +1278,28 @@ AM_GLIB_GNU_GETTEXT
 dnl -----------------------------------
 dnl INCLUDES and LIBS for LIBMING (SWF renderer)
                                                                                 
-AC_ARG_WITH(libming,
-  [AC_HELP_STRING([--with-libming],
-                  [use libming library])])
+GV_PATH_MING
+AM_CONDITIONAL(WITH_MING, [ test x"$MAKESWF" != x ])
 
-### default is to build with libming
-if test "x$with_libming" != "xno"; then
-       with_libming=yes
-fi
-
-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)])
-AC_SUBST(LIBMING_CFAGS)
-AC_SUBST(LIBMING_LIBS)
-fi
-AM_CONDITIONAL(WITH_LIBMING, [test "x$HAVE_LIBMING" != "x"])
+#AC_ARG_WITH(libming,
+#  [AC_HELP_STRING([--with-libming],
+#                  [use libming library])])
+#
+#### default is to build with libming
+#if test "x$with_libming" != "xno"; then
+#      with_libming=yes
+#fi
+#
+#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)])
+#AC_SUBST(LIBMING_CFLAGS)
+#AC_SUBST(LIBMING_LIBS)
+#fi
+#AM_CONDITIONAL(WITH_LIBMING, [test "x$HAVE_LIBMING" != "x"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GD

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 08ad8470cc5974a950e1f86a0136ce6c39e069df..ebfd4cc648d505f4f89fa6ff835a2201071c0054 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -34,7 +34,7 @@ Prefix: /usr
 %define TCL     1
 %define IPSEPCOLA --without-ipsepcola
 %define MYLIBGD --with-mylibgd
-%define LIBMING --without-libming
+%define MING --without-ming
 
 # SuSE uses a different mechanism to generate BuildRequires
 # norootforbuild
@@ -406,7 +406,7 @@ CFLAGS="$RPM_OPT_FLAGS" \
       --mandir=%{_mandir} \
       --with-x \
       --disable-static \
-      --disable-dependency-tracking %{MYLIBGD} %{IPSEPCOLA} %{LIBMING}
+      --disable-dependency-tracking %{MYLIBGD} %{IPSEPCOLA} %{MING}
 %__make %{?_smp_mflags}
 
 %install