git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1839 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes 2001-03-27 18:15:17 +00:00
parent c44d76deae
commit 76e401e0d7
2 changed files with 18 additions and 1 deletions

View File

@ -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> 2001-03-14 Angus Leeming <a.leeming@ic.ac.uk>
* Merging changes from BRANCH_MVC back into HEAD. * Merging changes from BRANCH_MVC back into HEAD.

View File

@ -177,11 +177,23 @@ case "$lyx_use_frontend" in
AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+)) AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
AM_PATH_GNOMEMM 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="gnome"
FRONTEND_GUILIB="\${top_builddir}/src/frontends/gnome/libgnome.la" FRONTEND_GUILIB="\${top_builddir}/src/frontends/gnome/libgnome.la"
FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)" FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)"
FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)" 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)
QT2_DO_IT_ALL QT2_DO_IT_ALL
FRONTEND="qt2" FRONTEND="qt2"