From: <dun...@us...> - 2003-12-11 22:48:27
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1:/tmp/cvs-serv20828 Modified Files: ChangeLog configure.in Makefile Log Message: Added libglade bindings, including configury and demo program it will build a package called "glade" Index: ChangeLog =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/ChangeLog,v retrieving revision 1.120 retrieving revision 1.121 diff -u -d -r1.120 -r1.121 --- ChangeLog 11 Dec 2003 16:15:56 -0000 1.120 +++ ChangeLog 11 Dec 2003 22:48:23 -0000 1.121 @@ -6,6 +6,24 @@ functions with a class constraint. This saves carrying around so many class dictionaries per object - now only one. + * configure.in: added libglade detection + + * Makefile: added glade and demo/glade targets + + * mk/config.mk.in: added LIBGLADE_* variables + + * tools/hierarchyGen/hierarchy.list: added GladeXML class + + * glade/Glade.chs: new libglade binding module + + * glade/Makefile: new file + + * demo/glade/Makefile: new file + + * demo/glade/GladeTest.hs: simple demo of Glade functionality + + * demo/glade/simple.glade: glade file used by the demo program + 2003-11-26 Duncan Coutts <du...@co...> * tools/hierarchyGen/TypeGen.hs: added extra commandline parameters Index: configure.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.in,v retrieving revision 1.33 retrieving revision 1.34 diff -u -d -r1.33 -r1.34 --- configure.in 17 Nov 2003 17:47:04 -0000 1.33 +++ configure.in 11 Dec 2003 22:48:23 -0000 1.34 @@ -251,6 +251,23 @@ AC_MSG_RESULT($ENABLE_SOURCEVIEW) + +dnl Check if user wants the libglade extension. Make the default value for this +dnl flag dependant on whether it is installed or not. +ENABLE_LIBGLADE=yes; +AC_MSG_CHECKING([if libglade bindings can be built]) + +AC_ARG_ENABLE(libglade, + [ --enable-libglade generate binding for libglade], + [FOUNDLIBGLADE=$enableval],[FOUNDLIBGLADE=yes]) + +dnl Reset the flag if libglade is not installed +$PKG_CONFIG --exists libglade-2.0 || FOUNDLIBGLADE=no; +if test x$FOUNDLIBGLADE = xno; then ENABLE_LIBGLADE=no;fi; + +AC_MSG_RESULT($ENABLE_LIBGLADE) + + dnl Check for the GTK&Co libraries. Use the special PKG_CHECK_MODULES dnl macro from the pkg-config program. PKG_CHECK_MODULES(GTK,[glib-2.0 >= 2.0.0 gdk-2.0 >= 2.0.0 gtk+-2.0 >= 2.0.0 gdk-pixbuf-2.0 >= 0.12.0]) @@ -260,6 +277,9 @@ if test x$ENABLE_SOURCEVIEW = xyes; then PKG_CHECK_MODULES(SOURCEVIEW,[gtksourceview-1.0 >= 0.6.0]) fi +if test x$ENABLE_LIBGLADE = xyes; then + PKG_CHECK_MODULES(LIBGLADE,[libglade-2.0 >= 2.0.0]) +fi dnl The configuration program for GTK is kind of stupid in that it dnl lists directories which don't exist. ghc-pkg in ghc 5.04 or greater @@ -302,6 +322,25 @@ esac; done; +TMPLIBGLADE_CFLAGS=$LIBGLADE_CFLAGS; +LIBGLADE_CFLAGS=; +for FLAG in $TMPLIBGLADE_CFLAGS; do + case $FLAG in + -I*) DIR=`echo $FLAG | $SED "s/-I//"`; + if test -d $DIR; then LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS -I$DIR"; fi;; + *) LIBGLADE_CFLAGS="$LIBGLADE_CFLAGS $FLAG";; + esac; +done; +TMPLIBGLADE_LIBS=$LIBGLADE_LIBS; +LIBGLADE_LIBS=; +for FLAG in $TMPLIBGLADE_LIBS; do + case $FLAG in + -L*) DIR=`echo $FLAG | $SED "s/-L//"`; + if test -d $DIR; then LIBGLADE_LIBS="$LIBGLADE_LIBS -L$DIR"; fi;; + *) LIBGLADE_LIBS="$LIBGLADE_LIBS $FLAG";; + esac; +done; + dnl Have a special marshall list (available in the source tree of Gtk+ under dnl gtk/gtkmarshal.list) @@ -508,6 +547,9 @@ AC_SUBST(ENABLE_SOURCEVIEW) AC_SUBST(SOURCEVIEW_CFLAGS) AC_SUBST(SOURCEVIEW_LIBS) +AC_SUBST(ENABLE_LIBGLADE) +AC_SUBST(LIBGLADE_CFLAGS) +AC_SUBST(LIBGLADE_LIBS) dnl Documentation AC_SUBST(BUILDDOCS) AC_SUBST(XSLTTRANS) Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v retrieving revision 1.23 retrieving revision 1.24 diff -u -d -r1.23 -r1.24 --- Makefile 15 Nov 2003 11:51:44 -0000 1.23 +++ Makefile 11 Dec 2003 22:48:23 -0000 1.24 @@ -22,6 +22,10 @@ MAKE_LIBS += sourceview endif +ifeq ($(strip $(ENABLE_LIBGLADE)),yes) +MAKE_LIBS += glade +endif + MAKE_LIBS += mogul MAKE_APPS = demo/concurrent demo/treeList demo/graphic demo/unicode \ @@ -31,6 +35,9 @@ MAKE_APPS += demo/sourceview endif +ifeq ($(strip $(ENABLE_LIBGLADE)),yes) +MAKE_APPS += demo/glade +endif EXTRA_TARFILES = $(strip AUTHORS COPYING.LIB ChangeLog INSTALL Makefile \ TODO VERSION aclocal.m4 acinclude.m4 \ |