[SCM] master: Make GLADE_DTD_FILE configurable; update build notes.

[SCM] master: Make GLADE_DTD_FILE configurable; update build notes.

[cagney]

The branch, master has been updated
       via  aa593ea5965e213d521a48092a7785f5195170c5 (commit)
      from  af8238b8a4e17e2022f32197ce7030ecbb8e231a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email.

- Log -----------------------------------------------------------------
commit aa593ea5965e213d521a48092a7785f5195170c5
Author: Andrew Cagney <cagney@redhat.com>
Date:   Thu Nov 22 13:43:28 2007 -0500

    Make GLADE_DTD_FILE configurable; update build notes.
    
    frysk-gui/ChangeLog
    2007-11-22  Andrew Cagney  <cagney@redhat.com>
    
    	* configure.ac: Set.
    	* Makefile.am (GLADE_DTD_FILE): Set to @GLADE_DTD_FILE@.

-----------------------------------------------------------------------

Summary of changes:
 frysk-gui/ChangeLog          |    5 +++++
 frysk-gui/Makefile.am        |    2 +-
 frysk-gui/configure.ac       |    5 +++++
 htdocs/build/rhel/index.html |    5 +++--
 4 files changed, 14 insertions(+), 3 deletions(-)

First 500 lines of diff:
diff --git a/frysk-gui/ChangeLog b/frysk-gui/ChangeLog
index 7fa3697..5a0d8d6 100644
--- a/frysk-gui/ChangeLog
+++ b/frysk-gui/ChangeLog
@@ -1,3 +1,8 @@
+2007-11-22  Andrew Cagney  <cagney@redhat.com>
+
+	* configure.ac: Set.
+	* Makefile.am (GLADE_DTD_FILE): Set to @GLADE_DTD_FILE@.
+
 2007-11-13  Jose Flavio Aguilar Paulino <jflavio@br.ibm.com>
 
         * Makefile.am: Add libunwind-ppc32 to gcj linker dependencies.
diff --git a/frysk-gui/Makefile.am b/frysk-gui/Makefile.am
index 1ba069c..3d2c7aa 100644
--- a/frysk-gui/Makefile.am
+++ b/frysk-gui/Makefile.am
@@ -138,7 +138,7 @@ checked-glade-xml-with-xmllint: $(glade_DATA) glade.catalog
 	done
 	touch $@
 CLEANFILES += glade.catalog
-GLADE_DTD_FILE = file://$(LIBGLADE_PREFIX)/share/xml/libglade/glade-2.0.dtd 
+GLADE_DTD_FILE = @GLADE_DTD_FILE@
 glade.catalog:
 	rm -f $@.tmp
 	$(XMLCATALOG) --noout -v --create $@.tmp
diff --git a/frysk-gui/configure.ac b/frysk-gui/configure.ac
index 3e84a76..a345429 100644
--- a/frysk-gui/configure.ac
+++ b/frysk-gui/configure.ac
@@ -64,7 +64,12 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES], [$FRYSK_GUI_JARS])
 
 # Grab the libglade prefix at config time, used to find the .xml
 # definitions for glade.
+
 FRYSK_PKG_MODULE_VARIABLE(LIBGLADE_PREFIX, prefix, [libglade-2.0])
+AC_MSG_CHECKING([GLADE_DTD_FILE])
+GLADE_DTD_FILE="file://${LIBGLADE_PREFIX}/share/xml/libglade/glade-2.0.dtd"
+AC_MSG_RESULT(${GLADE_DTD_FILE})
+AC_SUBST(GLADE_DTD_FILE)
 
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT
diff --git a/htdocs/build/rhel/index.html b/htdocs/build/rhel/index.html
index 78a3dfe..764f6b7 100644
--- a/htdocs/build/rhel/index.html
+++ b/htdocs/build/rhel/index.html
@@ -111,8 +111,9 @@ git-core
 To configure <em>frysk</em> use:
 
 <pre>
-( mkdir build && cd build && ../frysk/configure \
-     PKG_CONFIG_PATH=/usr/lib/frysk/pkgconfig:/usr/lib/pkgconfig )
+$ ( mkdir build && cd build && ../frysk/configure \
+     PKG_CONFIG_PATH=/usr/lib/frysk/pkgconfig:/usr/lib/pkgconfig \
+     GLADE_DTD_FILE=/usr/share/frysk/xml/libglade/glade-2.0.dtd )
 </pre>
 
 For additional updates, check Red Hat Enterprise Linux 4's tracker


hooks/post-receive
--
frysk system monitor/debugger