Commit 0fe9e1d9 authored by John Ellson's avatar John Ellson

incorporate bits from Redhat's spec, merge back into one

parent a529bfd1
...@@ -58,7 +58,6 @@ Makefile.in ...@@ -58,7 +58,6 @@ Makefile.in
/config.log /config.log
/config.status /config.status
/libtool /libtool
/graphviz.spec
/redhat/graphviz.spec.fedora /redhat/graphviz.spec.fedora
/redhat/graphviz.spec.rhel /redhat/graphviz.spec.rhel
/stamp-h1 /stamp-h1
......
...@@ -35,7 +35,7 @@ BUILT_SOURCES = $(top_builddir)/graphviz_version.h ...@@ -35,7 +35,7 @@ BUILT_SOURCES = $(top_builddir)/graphviz_version.h
$(top_builddir)/graphviz_version.h: config.h $(top_builddir)/graphviz_version.h: config.h
$(EGREP) 'PACKAGE|VERSION|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h $(EGREP) 'PACKAGE|VERSION|GVPLUGIN' config.h > $(top_builddir)/graphviz_version.h
EXTRA_DIST = $(txt) $(html) graphviz.spec.in graphviz.spec \ EXTRA_DIST = $(txt) $(html) graphviz.spec \
autogen.sh config/depcomp config/config.rpath \ autogen.sh config/depcomp config/config.rpath \
builddate.h compat.h \ builddate.h compat.h \
Makeargs iffe config.iffe \ Makeargs iffe config.iffe \
......
...@@ -22,6 +22,8 @@ AM_CPPFLAGS = \ ...@@ -22,6 +22,8 @@ AM_CPPFLAGS = \
$(GTK_CFLAGS) $(GLUT_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS) $(GTS_CFLAGS) $(GTK_CFLAGS) $(GLUT_CFLAGS) $(GTKGLEXT_CFLAGS) $(GLADE_CFLAGS) $(FREETYPE2_CFLAGS) $(FONTCONFIG_CFLAGS) $(GTS_CFLAGS)
bin_PROGRAMS = bin_PROGRAMS =
man_MANS =
pdf_DATA =
if WITH_SMYRNA if WITH_SMYRNA
if ENABLE_SHARED if ENABLE_SHARED
bin_PROGRAMS += smyrna bin_PROGRAMS += smyrna
...@@ -29,11 +31,10 @@ endif ...@@ -29,11 +31,10 @@ endif
if ENABLE_STATIC if ENABLE_STATIC
bin_PROGRAMS += smyrna_static bin_PROGRAMS += smyrna_static
endif endif
man_MANS += smyrna.1
pdf_DATA += smyrna.1.pdf
endif endif
man_MANS = smyrna.1
pdf_DATA = smyrna.1.pdf
noinst_HEADERS = arcball.h draw.h glexpose.h \ noinst_HEADERS = arcball.h draw.h glexpose.h \
glmotion.h gltemplate.h gui/appmouse.h gui/callbacks.h \ glmotion.h gltemplate.h gui/appmouse.h gui/callbacks.h \
hotkeymap.h materials.h md5.h polytess.h selectionfuncs.h \ hotkeymap.h materials.h md5.h polytess.h selectionfuncs.h \
......
...@@ -602,11 +602,11 @@ dnl ----------------------------------- ...@@ -602,11 +602,11 @@ dnl -----------------------------------
dnl INCLUDES and LIBS for GO dnl INCLUDES and LIBS for GO
AC_ARG_ENABLE(go, AC_ARG_ENABLE(go,
[AS_HELP_STRING([--enable-go=no],[go language bindings])], [AS_HELP_STRING([--enable-go=yes],[go language bindings])],
[], [enable_go=no]) [], [enable_go=yes])
if test "x$enable_go" != "xyes"; then if test "x$enable_go" != "xyes"; then
use_go="No (disabled by default - experimental)" use_go="No (disabled)"
else else
if test "x$use_swig" != "xYes"; then if test "x$use_swig" != "xYes"; then
use_go="No (swig not available)" use_go="No (swig not available)"
...@@ -1773,11 +1773,11 @@ dnl ----------------------------------- ...@@ -1773,11 +1773,11 @@ dnl -----------------------------------
dnl INCLUDES and LIBS for WEBP dnl INCLUDES and LIBS for WEBP
AC_ARG_WITH(webp, AC_ARG_WITH(webp,
[AS_HELP_STRING([--with-webp=no],[webp library])], [AS_HELP_STRING([--with-webp=yes],[webp library])],
[], [with_webp=no]) [], [with_webp=yes])
if test "x$with_webp" != "xyes"; then if test "x$with_webp" != "xyes"; then
use_webp="No (disabled by default - experimental)" use_webp="No (disabled)"
else else
PKG_CHECK_MODULES(WEBP, [libwebp],[ PKG_CHECK_MODULES(WEBP, [libwebp],[
use_webp="Yes" use_webp="Yes"
...@@ -2626,11 +2626,11 @@ dnl ----------------------------------- ...@@ -2626,11 +2626,11 @@ dnl -----------------------------------
dnl SMYRNA dnl SMYRNA
AC_ARG_WITH(smyrna, AC_ARG_WITH(smyrna,
[AS_HELP_STRING([--with-smyrna=no],[SMYRNA large graph viewer])], [AS_HELP_STRING([--with-smyrna=yes],[SMYRNA large graph viewer])],
[], [with_smyrna=no]) [], [with_smyrna=yes])
if test "x$with_smyrna" != "xyes"; then if test "x$with_smyrna" != "xyes"; then
use_smyrna="No (disabled by default - experimental)" use_smyrna="No (disabled)"
else else
if test "x$use_gtk" != "xYes"; then if test "x$use_gtk" != "xYes"; then
AC_MSG_WARN(SMYRNA requires GTK) AC_MSG_WARN(SMYRNA requires GTK)
...@@ -2949,7 +2949,6 @@ AC_CONFIG_FILES(Makefile ...@@ -2949,7 +2949,6 @@ AC_CONFIG_FILES(Makefile
share/Makefile share/Makefile
share/examples/Makefile share/examples/Makefile
share/gui/Makefile share/gui/Makefile
graphviz.spec
redhat/graphviz.spec.fedora redhat/graphviz.spec.fedora
redhat/graphviz.spec.rhel redhat/graphviz.spec.rhel
Doxyfile Doxyfile
......
redhat/graphviz.spec.fedora
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
graphviz.spec.fedora.in
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment