From: <as...@us...> - 2003-10-21 23:49:51
|
Update of /cvsroot/gtk2hs/gtk2hs In directory sc8-pr-cvs1:/tmp/cvs-serv19933 Modified Files: Makefile aclocal.m4 configure.in Log Message: Index: Makefile =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/Makefile,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- Makefile 31 Jul 2003 10:30:38 -0000 1.16 +++ Makefile 21 Oct 2003 23:42:03 -0000 1.17 @@ -19,6 +19,9 @@ $(MAKE) -Cc2hs $@ endif $(MAKE) -Cgtk $@ +ifeq ($(ENABLE_SOURCEVIEW), yes) + $(MAKE) -Csourceview $@ +endif $(MAKE) -Cmogul $@ ifeq ($(BUILDDOCS),yes) $(MAKE) -Cdoc all @@ -34,6 +37,9 @@ $(MAKE) -Cdemo/graphic $@ $(MAKE) -Cdemo/unicode $@ $(MAKE) -Cdemo/hello $@ +ifeq ($(ENABLE_SOURCEVIEW), yes) + $(MAKE) -Cdemo/sourceview $@ +endif install install-without-pkg : all $(MAKE) -Cgtk $@ @@ -54,6 +60,10 @@ $(MAKE) -Cdemo/graphic $@ $(MAKE) -Cdemo/treeList $@ $(MAKE) -Cdemo/concurrent $@ +ifeq ($(ENABLE_SOURCEVIEW), yes) + $(MAKE) -Cdemo/sourceview $@ + $(MAKE) -Csourceview $@ +endif ifeq ($(BUILDDOCS),yes) $(MAKE) -Cdoc $@ endif @@ -70,6 +80,8 @@ $(MAKE) -Cdemo/graphic $@ $(MAKE) -Cdemo/treeList $@ $(MAKE) -Cdemo/concurrent $@ + $(MAKE) -Cdemo/sourceview $@ + $(MAKE) -Csourceview $@ EXTRA_TARFILES = $(strip AUTHORS COPYING.LIB ChangeLog INSTALL Makefile \ TODO VERSION aclocal.m4 acinclude.m4 \ @@ -86,12 +98,14 @@ $(addprefix $(TARNAME)/,$(EXTRA_TARFILES))) $(MAKE) -Cc2hs tarsource $(MAKE) -Cgtk tarsource + $(MAKE) -Csourceview tarsource $(MAKE) -Cmogul tarsource $(MAKE) -Cdemo/hello tarsource $(MAKE) -Cdemo/unicode tarsource $(MAKE) -Cdemo/graphic tarsource $(MAKE) -Cdemo/treeList tarsource $(MAKE) -Cdemo/concurrent tarsource + $(MAKE) -Cdemo/sourceview tarsource $(MAKE) -Cgendoc tarsource $(MAKE) -Cdoc tarsource $(GZIP) $(TARNAME).tar Index: aclocal.m4 =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/aclocal.m4,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- aclocal.m4 21 Jan 2003 15:53:07 -0000 1.2 +++ aclocal.m4 21 Oct 2003 23:42:03 -0000 1.3 @@ -1,14 +1,15 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4-p5 +# aclocal.m4t generated automatically by aclocal 1.5 -dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. +# Copyright 1996, 1997, 1998, 1999, 2000, 2001 +# Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. dnl Gtk+HS - Additional macros for `autoconf' @@ -102,203 +103,6 @@ - -# Configure paths for GTK+ -# Owen Taylor 1997-2001 - -dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, -dnl pass to pkg-config -dnl -AC_DEFUN(AM_PATH_GTK_2_0, -[dnl -dnl Get the cflags and libraries from pkg-config -dnl -AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], - , enable_gtktest=yes) - - pkg_config_args=gtk+-2.0 - for module in . $4 - do - case "$module" in - gthread) - pkg_config_args="$pkg_config_args gthread-2.0" - ;; - esac - done - - no_gtk="" - - AC_PATH_PROG(PKG_CONFIG, pkg-config, no) - - if test x$PKG_CONFIG != xno ; then - if pkg-config --atleast-pkgconfig-version 0.7 ; then - : - else - echo *** pkg-config too old; version 0.7 or better required. - no_gtk=yes - PKG_CONFIG=no - fi - else - no_gtk=yes - fi - - min_gtk_version=ifelse([$1], ,2.0.0,$1) - AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) - - if test x$PKG_CONFIG != xno ; then - ## don't try to run the test against uninstalled libtool libs - if $PKG_CONFIG --uninstalled $pkg_config_args; then - echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" - enable_gtktest=no - fi - - if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then - : - else - no_gtk=yes - fi - fi - - if test x"$no_gtk" = x ; then - GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` - GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` - gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$GTK_LIBS $LIBS" -dnl -dnl Now check if the installed GTK+ is sufficiently new. (Also sanity -dnl checks the results of pkg-config to some extent) -dnl - rm -f conf.gtktest - AC_TRY_RUN([ -#include <gtk/gtk.h> -#include <stdio.h> -#include <stdlib.h> - -int -main () -{ - int major, minor, micro; - char *tmp_version; - - system ("touch conf.gtktest"); - - /* HP/UX 9 (%@#!) writes to sscanf strings */ - tmp_version = g_strdup("$min_gtk_version"); - if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { - printf("%s, bad version string\n", "$min_gtk_version"); - exit(1); - } - - if ((gtk_major_version != $gtk_config_major_version) || - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { - printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); - printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); - printf("*** to point to the correct configuration files\n"); - } - else if ((gtk_major_version != GTK_MAJOR_VERSION) || - (gtk_minor_version != GTK_MINOR_VERSION) || - (gtk_micro_version != GTK_MICRO_VERSION)) - { - printf("*** GTK+ header files (version %d.%d.%d) do not match\n", - GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); - printf("*** library (version %d.%d.%d)\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - } - else - { - if ((gtk_major_version > major) || - ((gtk_major_version == major) && (gtk_minor_version > minor)) || - ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) - { - return 0; - } - else - { - printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", - gtk_major_version, gtk_minor_version, gtk_micro_version); - printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", - major, minor, micro); - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); - printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); - printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); - printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } - } - return 1; -} -],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - if test "x$no_gtk" = x ; then - AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) - if test "$PKG_CONFIG" = "no" ; then - echo "*** A new enough version of pkg-config was not found." - echo "*** See http://pkgconfig.sourceforge.net" - else - if test -f conf.gtktest ; then - : - else - echo "*** Could not run GTK+ test program, checking why..." - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -#include <gtk/gtk.h> -#include <stdio.h> -], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], - [ echo "*** The test program compiled, but did not run. This usually means" - echo "*** that the run-time linker is not finding GTK+ or finding the wrong" - echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" - echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" - echo "*** is required on your system" - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK+ was incorrectly installed" - echo "*** or that you have moved GTK+ since it was installed. In the latter case, you" - echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi - fi - GTK_CFLAGS="" - GTK_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(GTK_CFLAGS) - AC_SUBST(GTK_LIBS) - rm -f conf.gtktest -]) dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not) Index: configure.in =================================================================== RCS file: /cvsroot/gtk2hs/gtk2hs/configure.in,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- configure.in 9 Jul 2003 22:42:43 -0000 1.26 +++ configure.in 21 Oct 2003 23:42:03 -0000 1.27 @@ -208,7 +208,7 @@ AC_MSG_CHECKING([if OpenGL extension can be built]) AC_ARG_ENABLE(glext, - [ --enable-glext generate binding for OpenGL rendering], + [ --enable-glext generate binding for OpenGL rendering], [FOUNDGLEXT=$enableval],[FOUNDGLEXT=yes]) dnl Reset the flag if GtkGLExt is not installed @@ -223,12 +223,29 @@ AC_MSG_RESULT($ENABLE_OPENGL) +dnl Check if user wants GtkSourceView extension. Make the default value for this +dnl flag dependant on whether it is installed or not. +ENABLE_SOURCEVIEW=yes; +AC_MSG_CHECKING([if SourceView widget bindings can be built]) + +AC_ARG_ENABLE(sourceview, + [ --enable-sourceview generate binding for GtkSourceView], + [FOUNDSOURCEVIEW=$enableval],[FOUNDSOURCEVIEW=yes]) + +dnl Reset the flag if GtkSourceView is not installed +$PKG_CONFIG --exists gtksourceview-1.0 || FOUNDSOURCEVIEW=no; +if test x$FOUNDSOURCEVIEW = xno; then ENABLE_SOURCEVIEW=no;fi; + +AC_MSG_RESULT($ENABLE_SOURCEVIEW) + dnl Check for the GTK&Co libraries. Use the special PKG_CHECK_MODULES dnl macro from the pkg-config program. -if test x$ENABLE_OPENGL = xno; then - 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]) -else - 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 gtkglext-1.0 >= 0.7.1]) +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]) +if test x$ENABLE_OPENGL = xyes; then + PKG_CHECK_MODULES(GTK,[gtkglext-1.0 >= 0.7.1]) +fi +if test x$ENABLE_SOURCEVIEW = xyes; then + PKG_CHECK_MODULES(GTK,[gtksourceview-1.0 >= 0.6.0]) fi dnl The configuration program for GTK is kind of stupid in that it @@ -261,7 +278,7 @@ [ --with-mlist=GTK-SOURCE use special marshall list from GTK+ sources], [MARSHALLDEFS=$withval; AC_MSG_RESULT($withval)], - [MARSHALLDEFS=$TOP/gtk/signals/gtkmarshal.list; + [MARSHALLDEFS=$TOP/tools/signals/gtkmarshal.list; AC_MSG_RESULT(built-in)]) @@ -455,6 +472,7 @@ dnl AC_SUBST(GTK_MINOR_VERSION) dnl AC_SUBST(GTK_MICRO_VERSION) AC_SUBST(ENABLE_OPENGL) +AC_SUBST(ENABLE_SOURCEVIEW) dnl Documentation AC_SUBST(BUILDDOCS) AC_SUBST(XSLTTRANS) |