From 4d8b501c73cd00706531817aabc129f8a276a022 Mon Sep 17 00:00:00 2001 From: ellson Date: Sun, 19 Oct 2008 13:57:44 +0000 Subject: [PATCH] fixes for VERSION_DATE and --with-ghostscript --- configure.ac | 26 +++++++++++++------------- debian/rules | 1 + graphviz.spec.in | 15 ++++++++------- 3 files changed, 22 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index ed1ce7100..0c84cb2c7 100644 --- a/configure.ac +++ b/configure.ac @@ -1838,20 +1838,20 @@ fi AM_CONDITIONAL(WITH_RSVG, [test "x$use_rsvg" = "xYes"]) dnl ----------------------------------- -dnl INCLUDES and LIBS for GS +dnl INCLUDES and LIBS for GHOSTSCRIPT -AC_ARG_WITH(gs, - [AC_HELP_STRING([--with-gs=yes], [gs library])], - [], [with_gs=yes]) +AC_ARG_WITH(ghostscript, + [AC_HELP_STRING([--with-ghostscript=yes], [ghostscript library])], + [], [with_ghostscript=yes]) -if test "x$with_gs" != "xyes"; then - use_gs="No (disabled)" +if test "x$with_ghostscript" != "xyes"; then + use_ghostscript="No (disabled)" else - AC_CHECK_HEADER(ghostscript/iapi.h, GS_CFLAGS="",use_gs="No (missing headers)") - if test "x$use_gs" = "x"; then - AC_CHECK_LIB(gs, main, GS_LIBS="-lgs", use_gs="No (missing lib)") - if test "x$use_gs" = "x"; then - use_gs="Yes" + AC_CHECK_HEADER(ghostscript/iapi.h, GS_CFLAGS="",use_ghostscript="No (missing headers)") + if test "x$use_ghostscript" = "x"; then + AC_CHECK_LIB(gs, main, GS_LIBS="-lgs", use_ghostscript="No (missing lib)") + if test "x$use_ghostscript" = "x"; then + use_ghostscript="Yes" AC_DEFINE_UNQUOTED(HAVE_GS,1, [Define if you have the gs library]) AC_SUBST(GS_CFLAGS) @@ -1859,7 +1859,7 @@ else fi fi fi -AM_CONDITIONAL(WITH_GS, [test "x$use_gs" = "xYes"]) +AM_CONDITIONAL(WITH_GS, [test "x$use_ghostscript" = "xYes"]) dnl ----------------------------------- dnl INCLUDES and LIBS for PANGO, CAIRO et.al. @@ -3068,8 +3068,8 @@ echo " devil: $use_devil" echo " gd: $use_gd" echo " gdiplus: $use_gdiplus" echo " gdk_pixbuf: $use_gdk_pixbuf" +echo " ghostscript: $use_ghostscript" echo " glitz: $use_glitz" -echo " gs: $use_gs" echo " gtk: $use_gtk" echo " lasi: $use_lasi" echo " ming: $use_ming" diff --git a/debian/rules b/debian/rules index 58e506592..6d6d30ccd 100644 --- a/debian/rules +++ b/debian/rules @@ -53,6 +53,7 @@ configure-stamp: --with-pangocairo \ --with-x \ --with-gdk-pixbuf \ + --without-ghostscript \ --without-gnomeui \ --without-gtk \ --without-gtkgl \ diff --git a/graphviz.spec.in b/graphviz.spec.in index ab4b0f7e2..67958df29 100644 --- a/graphviz.spec.in +++ b/graphviz.spec.in @@ -30,7 +30,7 @@ Prefix: /usr # All features are off (undefined) by default # To enable, use: define FEATURE 1 # Available features are: -# SHARP GUILE _IO JAVA LUA OCAML PERL PHP PYTHON RUBY R_LANG +# SHARP GHOSTSCRIPT GUILE _IO JAVA LUA OCAML PERL PHP PYTHON RUBY R_LANG # TCL IPSEPCOLA MYLIBGD PANGOCAIRO RSVG GLITZ SMYRNA DEVIL MING GDK_PIXBUF # SuSE uses a different mechanism to generate BuildRequires @@ -204,7 +204,7 @@ BuildRequires: R-devel swig >= 1.3.33 %endif %if %fedora >= 9 BuildRequires: ghostscript-devel -%define GS 1 +%define GHOSTSCRIPT 1 #define MING 1 #BuildRequires: ming ming-devel %endif @@ -270,7 +270,7 @@ BuildRequires: R-devel swig >= 1.3.33 %endif %if %att_fedora >= 9 BuildRequires: ghostscript-devel -%define GS 1 +%define GHOSTSCRIPT 1 #define MING 1 #BuildRequires: ming ming-devel %endif @@ -688,15 +688,16 @@ CFLAGS="$RPM_OPT_FLAGS" \ --enable-ruby%{!?RUBY:=no} \ --enable-tcl%{!?TCL:=no} \ --with%{!?DEVIL:out}-devil \ + --with%{!?GDK_PIXBUF:out}-gdk-pixbuf \ + --with%{!?GHOSTSCRIPT:out}-ghostscript \ + --with%{!?GLITZ:out}-glitz \ --with%{!?IPSEPCOLA:out}-ipsepcola \ --with%{!?LASI:out}-lasi \ --with%{!?MING:out}-ming \ - --with%{!?SMYRNA:out}-smyrna \ - --with%{!?SFDP:out}-sfdp \ - --with%{!?GLITZ:out}-glitz \ --with%{!?PANGOCAIRO:out}-pangocairo \ --with%{!?RSVG:out}-rsvg \ - --with%{!?GDK_PIXBUF:out}-gdk-pixbuf + --with%{!?SFDP:out}-sfdp \ + --with%{!?SMYRNA:out}-smyrna make %{?_smp_mflags} %install -- 2.40.0