[bug-gv] [PATCH] don't install gv_spartan.dat and gv_widgetless.dat with fallback styles

[Bernhard R. Link]

With fallback styles enabled (currently default), gv_spartan.dat and
gv_widgetless.dat are always replaced with compiled in versions,
so do not install those files to not confuse users with installing
files that have no effect if changed.
---

Fixed to apply to the current tree and a little bit cleaner.

 gv/configure.ac    |    1 +
 gv/src/Makefile.am |    8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/gv/configure.ac b/gv/configure.ac
index c9b2341..62b2f8d 100644
--- a/gv/configure.ac
+++ b/gv/configure.ac
@@ -206,6 +206,7 @@ dnl     USE_FALLBACK_STYLES=-DUSE_FALLBACK_STYLES
      AC_DEFINE(USE_FALLBACK_STYLES,[],[Define USE_FALLBACK_STYLES])
 
 }
+AM_CONDITIONAL(ENABLE_FALLBACK_STYLES, test x$opt_fallback_styles = xyes)
 
 AC_ARG_ENABLE(memmove-code, AC_HELP_STRING([--enable-memmove-code],[Use gv's 
own memmove. It defaults to `yes']), opt_memmove_code=$enableval, 
opt_memmove_code=yes)
 
diff --git a/gv/src/Makefile.am b/gv/src/Makefile.am
index c75548d..3831c21 100644
--- a/gv/src/Makefile.am
+++ b/gv/src/Makefile.am
@@ -7,8 +7,11 @@
 # File distribution
 bin_PROGRAMS = gv
 bin_SCRIPTS = gv-update-userconfig
-dist_pkgdata_DATA = gv_spartan.dat gv_user_res.dat gv_copyright.dat 
gv_widgetless.dat
+dist_pkgdata_DATA = gv_user_res.dat gv_copyright.dat
 pkgdata_DATA = gv_system.ad gv_user.ad gv_class.ad
+if !ENABLE_FALLBACK_STYLES
+pkgdata_DATA += gv_spartan.dat gv_widgetless.dat
+endif
 
 appdefaultsdir = $(pkgdatadir)
 
@@ -16,7 +19,8 @@ appdefaults_DATA = ../GV
 
 EXTRA_DIST=ad2c gv_font_res.dat gv_font_res-I18N_mb.dat gv_layout_res.dat 
gv-i18n.pl gv_misc_res.dat Aaa_bison.yacc \
            gv_current.xbm gv_doc.xbm gv_empty.xbm gv_even.xbm gv_icon.xbm 
gv_odd.xbm \
-           gv_selected.xbm gv_unmark.xbm $(srcdir)/nls/*
+           gv_selected.xbm gv_unmark.xbm $(srcdir)/nls/* \
+          gv_spartan.dat gv_widgetless.dat
 
 # Clean files
 CLEANFILES = ../GV \
-- 
1.5.6.5