[SCM] master: Conditionally set GLADE_DTD_FILE.

[cagney@sourceware.org]

The branch, master has been updated
       via  35cc78c82c7872b85563e4981c8e0603b5bd8893 (commit)
      from  4bed78efb9ade7bdb2446f1f08112edbc5af1e91 (commit)

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

- Log -----------------------------------------------------------------
commit 35cc78c82c7872b85563e4981c8e0603b5bd8893
Author: Andrew Cagney <cagney@toenail.yyz.redhat.com>
Date:   Thu Nov 22 16:44:01 2007 -0500

    Conditionally set GLADE_DTD_FILE.
    
    frysk-gui/ChangeLog
    2007-11-22  Andrew Cagney  <cagney@redhat.com>
    
    	* configure.ac (GLADE_DTD_FILE): Conditionally set.

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

Summary of changes:
 frysk-gui/ChangeLog    |    4 +++-
 frysk-gui/configure.ac |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

First 500 lines of diff:
diff --git a/frysk-gui/ChangeLog b/frysk-gui/ChangeLog
index 5a0d8d6..8461575 100644
--- a/frysk-gui/ChangeLog
+++ b/frysk-gui/ChangeLog
@@ -1,7 +1,9 @@
 2007-11-22  Andrew Cagney  <cagney@redhat.com>
 
-	* configure.ac: Set.
+	* configure.ac (GLADE_DTD_FILE): Conditionally set.
+	
 	* Makefile.am (GLADE_DTD_FILE): Set to @GLADE_DTD_FILE@.
+	* configure.ac (GLADE_DTD_FILE): Set.
 
 2007-11-13  Jose Flavio Aguilar Paulino <jflavio@br.ibm.com>
 
diff --git a/frysk-gui/configure.ac b/frysk-gui/configure.ac
index a345429..ba48e36 100644
--- a/frysk-gui/configure.ac
+++ b/frysk-gui/configure.ac
@@ -67,7 +67,7 @@ AC_SUBST([CONFIG_STATUS_DEPENDENCIES], [$FRYSK_GUI_JARS])
 
 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"
+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)
 


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