From 8bcff30aba3ed4d8e64a873abcdf9d6d6e864e7e Mon Sep 17 00:00:00 2001 From: ellson Date: Sat, 29 Apr 2006 01:30:55 +0000 Subject: [PATCH] - Less warnings from configure with normal defaults - Turn on --with-ipsepcola in FC6 (Fedora-development) rpms only for testing --- configure.ac | 4 +--- graphviz.spec.in | 4 +++- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 1604777fd..ab2ce1fd7 100644 --- a/configure.ac +++ b/configure.ac @@ -1080,12 +1080,11 @@ AC_SUBST(Z_INCLUDES) AC_SUBST(Z_LIBS) dnl ----------------------------------- -dnl DIGCOLA (enable by default) +dnl DIGCOLA (enabled by default) AC_ARG_WITH(digcola, [AC_HELP_STRING([--with-digcola], [with DIGCOLA features in neato layout engine])]) if test "x$with_digcola" != "xno"; then - AC_MSG_WARN(Optional DIGCOLA is enabled) AC_DEFINE_UNQUOTED(DIGCOLA,1,[Define if you want DIGCOLA]) else AC_MSG_WARN(Optional DIGCOLA is disabled) @@ -1101,7 +1100,6 @@ if test "x$with_digcola" = "xno"; then fi if test "x$with_ipsepcola" != "xyes"; then - AC_MSG_WARN(Optional IPSEPCOLA is disabled) IPSEPCOLA_INCLUDES= IPSEPCOLA_LIBS= else diff --git a/graphviz.spec.in b/graphviz.spec.in index 193caaeb4..09cfaf31d 100644 --- a/graphviz.spec.in +++ b/graphviz.spec.in @@ -19,6 +19,7 @@ Prefix: /usr %define PYTHON 0 %define RUBY 0 %define TCL 1 +%define IPSEPCOLA --without-ipsepcola # Select packages according to dist (set in .rpmmacros on each build host) @@ -89,6 +90,7 @@ Prefix: /usr %{?fc6: %{expand: %%define PYTHON 1}} %{?fc6: %{expand: %%define RUBY 1}} %{?fc6: %{expand: %%define TCL 1}} +%{?fc6: %{expand: %%define IPSEPCOLA --with-ipsepcola}} Summary: Graph Visualization Tools Name: graphviz @@ -399,7 +401,7 @@ CFLAGS="$RPM_OPT_FLAGS" \ --with-x \ --with-mylibgd \ --disable-static \ - --disable-dependency-tracking + --disable-dependency-tracking %{IPSEPCOLA} %__make %{?_smp_mflags} %install -- 2.40.0