Added two AM_CONDITIONAL for handling if sgmltools and fig2dev are

available. HAVE_SGMLTOOLS is set if sgmltools is installed and
similar HAVE_FIG2DEV set for fig2dev.
Fixed error in 'uninstall' rule in Makefile.in.in in the po/
directory. It was using the $(PACKAGE) variable in the line to remove
the install po libraries. So it was looking for xine-lib.mo in all the
$(localedir)/<catalog>/LC_Messages directory. Switched this to look
for $(LIBNAME).mo files. This change matches the 'install' rule which
names the files libxine1.mo

CVS patchset: 6878
CVS date: 2004/08/08 00:34:17

4 files changed, 29 insertions, 20 deletions

diff --git a/configure.ac b/configure.ac
index c6d70d312..cab74c3c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1985,8 +1985,10 @@ dnl Check for documentation formatting tool
 dnl ---------------------------------------------
 
 AC_CHECK_PROG(SGMLTOOLS, sgmltools, sgmltools, no)
-AC_CHECK_PROG(FIG2DEV, fig2dev, fig2dev, no)
+AM_CONDITIONAL([HAVE_SGMLTOOLS], [test "$sgmltools" != "no"])
 
+AC_CHECK_PROG(FIG2DEV, fig2dev, fig2dev, no)
+AM_CONDITIONAL([HAVE_FIG2DEV], [test "$fig2dev" != "no"])
 
 dnl ---------------------------------------------
 dnl Newest automake workaround
diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am
index 3370a4c5f..d57e08cf9 100644
--- a/doc/faq/Makefile.am
+++ b/doc/faq/Makefile.am
@@ -21,10 +21,11 @@ dist-hook:
 faq.sgml: $(srcdir)/faq.sgml
 	cp $^ .
 
+if HAVE_SGMLTOOLS
+faq.html: faq.sgml
+	  $(SGMLTOOLS) -b onehtml faq.sgml;
+else
 faq.html: faq.sgml
-	@if test "$(SGMLTOOLS)" != "no"; then \
-	  $(SGMLTOOLS) -b onehtml faq.sgml; \
-	else \
 	  if test "$(fail_if_missing)" = "yes"; then \
 	    echo "Please install sgmltools-lite."; \
 	    exit 1; \
@@ -34,11 +35,13 @@ faq.html: faq.sgml
 	    touch $^; \
 	  fi; \
 	fi
+endif
 
+if HAVE_SGMLTOOLS
+faq.txt: faq.sgml
+	  $(SGMLTOOLS) -b txt faq.sgml;
+else
 faq.txt: faq.sgml
-	@if test "$(SGMLTOOLS)" != "no"; then \
-	  $(SGMLTOOLS) -b txt faq.sgml; \
-	else \
 	  if test "$(fail_if_missing)" = "yes"; then \
 	    echo "Please install sgmltools-lite."; \
 	    exit 1; \
@@ -48,3 +51,4 @@ faq.txt: faq.sgml
 	    touch $^; \
 	  fi; \
 	fi
+endif
diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am
index 67283bf8e..f26e3e320 100644
--- a/doc/hackersguide/Makefile.am
+++ b/doc/hackersguide/Makefile.am
@@ -31,30 +31,33 @@ dist-hook:
 $(hackersguide_sgml): %.sgml: $(srcdir)/%.sgml
 	cp $^ .
 
+if HAVE_SGMLTOOLS
 hackersguide.html: $(hackersguide_sgml)
-	@if test "$(SGMLTOOLS)" != "no"; then \
-	  $(SGMLTOOLS) -b onehtml hackersguide.sgml; \
-	else \
-	  if test "$(fail_if_missing)" = "yes"; then \
+	$(SGMLTOOLS) -b onehtml hackersguide.sgml;
+else
+hackersguide.html: $(hackersguide_sgml)
+	if test "$(fail_if_missing)" = "yes"; then \
 	    echo "Please install sgmltools-lite."; \
 	    exit 1; \
-	  else \
+	else \
 	    touch $@; \
 	    sleep 1; \
 	    touch $^; \
-	  fi; \
-	fi
+	fi;
+endif
 
+if HAVE_FIG2DEV
 %.png: $(srcdir)/%.fig
-	@if test "$(FIG2DEV)" != "no"; then \
-	  $(FIG2DEV) -L png -S 4 $< $@; \
-	else \
-	  if test "$(fail_if_missing)" = "yes"; then \
+	  $(FIG2DEV) -L png -S 4 $< $@;
+else
+%.png: $(srcdir)/%.fig
+	if test "$(fail_if_missing)" = "yes"; then \
 	    echo "Please install fig2dev."; \
 	    exit 1; \
-	  else \
+	else \
 	    touch $@; \
 	    sleep 1; \
 	    touch $^; \
 	  fi; \
 	fi
+endif
diff --git a/po/Makefile.in.in b/po/Makefile.in.in
index c5400fe7a..c97225676 100644
--- a/po/Makefile.in.in
+++ b/po/Makefile.in.in
@@ -132,7 +132,7 @@ uninstall:
 	for cat in $$catalogs; do \
 	  cat=`basename $$cat`; \
 	  lang=`echo $$cat | sed 's/\.gmo$$//'`; \
-	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \
+	  rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(LIBNAME).mo; \
 	done
 	if test "$(PACKAGE)" = "gettext"; then \
 	  rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \