From: Lars Gullik Bjønnes <larsbj@gullik.org>
Date: Tue, 27 Mar 2001 18:15:17 +0000 (+0000)
Subject: top.diff
X-Git-Tag: 1.6.10~21389
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=76e401e0d71acf685e07297a581c95896345f482;p=features.git

top.diff


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1839 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/ChangeLog b/ChangeLog
index b95ed7dd10..4f56a9b0ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-26  Baruch Even  <baruch@lyx.org>
+
+	* configure.in: Added libglade detection and libraries for the gnome
+	build. The gnome build will now depend on libglade libraries.
+
 2001-03-14  Angus Leeming  <a.leeming@ic.ac.uk>
 
 	* Merging changes from BRANCH_MVC back into HEAD.
diff --git a/configure.in b/configure.in
index 1511aaf7ee..62a2157561 100644
--- a/configure.in
+++ b/configure.in
@@ -177,11 +177,23 @@ case "$lyx_use_frontend" in
         AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
     AM_PATH_GNOMEMM
 
+dnl ******************************
+dnl LibGlade checking
+dnl ******************************
+dnl Ensure gnome-config is available...
+	AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
+	AC_MSG_CHECKING(for Glade libraries)
+	if $GNOME_CONFIG --libs libglade > /dev/null 2>&1; then 
+    	AC_MSG_RESULT(found)
+	else
+	    AC_MSG_ERROR(Did not find libGlade installed)
+	fi
+		
     FRONTEND="gnome"
     FRONTEND_GUILIB="\${top_builddir}/src/frontends/gnome/libgnome.la"
     FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
     FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)"
-    FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS)";;
+    FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade`";;
   qt2)
     QT2_DO_IT_ALL
     FRONTEND="qt2"