Menu
▾
▴
[Xbgtk-list] xbgtk ChangeLog, 1.52, 1.53 Makefile.in, 1.7, 1.8 aclocal.m4, 1.10, 1.11 configure, 1.15, 1.16 configure.in, 1.9, 1.10
|
From: <lik...@us...> - 2006-07-05 22:04:24
|
Update of /cvsroot/xbgtk/xbgtk In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv17282 Modified Files: ChangeLog Makefile.in aclocal.m4 configure configure.in Log Message: 2006-07-06 Phil Krylov <phil a t newstar.rinet.ru> * configure.in * include/xbgtk.h * source/Makefile.am * source/gtk_xb.override * source/libglade_xb.override * source/xbgobject.h * source/xbgobject.prg * examples/Makefile.am * examples/glade/ * examples/glade/Makefile.am * examples/glade/README * examples/glade/glade-demo.prg * examples/glade/autoconnect.prg * examples/glade/test.glade * examples/glade/test2.glade Added libglade wrappers and samples. Increased version number to 0.5. * source/gdk_xb.override Added gdk_pixbuf_new_from_xpm_data() Index: ChangeLog =================================================================== RCS file: /cvsroot/xbgtk/xbgtk/ChangeLog,v retrieving revision 1.52 retrieving revision 1.53 diff -u -d -r1.52 -r1.53 --- ChangeLog 6 Apr 2006 13:29:25 -0000 1.52 +++ ChangeLog 5 Jul 2006 22:04:06 -0000 1.53 @@ -1,5 +1,27 @@ /* $Id$ */ +2006-07-06 Phil Krylov <phil a t newstar.rinet.ru> + * configure.in + * include/xbgtk.h + * source/Makefile.am + * source/gtk_xb.override + * source/libglade_xb.override + * source/xbgobject.h + * source/xbgobject.prg + * examples/Makefile.am + * examples/glade/ + * examples/glade/Makefile.am + * examples/glade/README + * examples/glade/glade-demo.prg + * examples/glade/autoconnect.prg + * examples/glade/test.glade + * examples/glade/test2.glade + Added libglade wrappers and samples. Increased version number to + 0.5. + + * source/gdk_xb.override + Added gdk_pixbuf_new_from_xpm_data() + 2006-04-06 Phil Krylov <phil a t newstar.rinet.ru> * README * configure.in Index: Makefile.in =================================================================== RCS file: /cvsroot/xbgtk/xbgtk/Makefile.in,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- Makefile.in 6 Apr 2006 13:29:25 -0000 1.7 +++ Makefile.in 5 Jul 2006 22:04:06 -0000 1.8 @@ -89,6 +89,10 @@ HBLNK = @HBLNK@ HB_MKSLIB = @HB_MKSLIB@ INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBGLADE_CFLAGS = @LIBGLADE_CFLAGS@ +LIBGLADE_CFLAGS_FOR_BUILD = @LIBGLADE_CFLAGS_FOR_BUILD@ +LIBGLADE_LIBS = @LIBGLADE_LIBS@ +LIBGLADE_LIBS_FOR_BUILD = @LIBGLADE_LIBS_FOR_BUILD@ LIBTOOL = @LIBTOOL@ LN_S = @LN_S@ OBJDUMP = @OBJDUMP@ Index: aclocal.m4 =================================================================== RCS file: /cvsroot/xbgtk/xbgtk/aclocal.m4,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- aclocal.m4 6 Apr 2006 13:29:25 -0000 1.10 +++ aclocal.m4 5 Jul 2006 22:04:06 -0000 1.11 @@ -7749,3 +7749,160 @@ rm -f conf.gtktest ]) +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# +# Copyright © 2004 Scott James Remnant <sc...@ne...>. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_PATH)?$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi + +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# +# Similar to PKG_CHECK_MODULES, make sure that the first instance of +# this or PKG_CHECK_MODULES is called, or make sure to call +# PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_ifval([$2], [$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$PKG_CONFIG"; then + if test -n "$$1"; then + pkg_cv_[]$1="$$1" + else + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`], + [pkg_failed=yes]) + fi +else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "$2"` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + ifelse([$4], , [AC_MSG_ERROR(dnl +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT +])], + [$4]) +elif test $pkg_failed = untried; then + ifelse([$4], , [AC_MSG_FAILURE(dnl +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])], + [$4]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + ifelse([$3], , :, [$3]) +fi[]dnl +])# PKG_CHECK_MODULES + Index: configure =================================================================== RCS file: /cvsroot/xbgtk/xbgtk/configure,v retrieving revision 1.15 retrieving revision 1.16 diff -u -d -r1.15 -r1.16 --- configure 6 Apr 2006 13:29:25 -0000 1.15 +++ configure 5 Jul 2006 22:04:06 -0000 1.16 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for xbgtk 0.4. +# Generated by GNU Autoconf 2.59 for xbgtk 0.5. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -421,8 +421,8 @@ # Identity of this package. PACKAGE_NAME='xbgtk' PACKAGE_TARNAME='xbgtk' [...658 lines suppressed...] "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; @@ -20758,11 +21078,18 @@ s,@PKG_CONFIG@,$PKG_CONFIG,;t t s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t s,@GTK_LIBS@,$GTK_LIBS,;t t +s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t +s,@LIBGLADE_CFLAGS@,$LIBGLADE_CFLAGS,;t t +s,@LIBGLADE_LIBS@,$LIBGLADE_LIBS,;t t +s,@BUILD_LIBGLADE_TRUE@,$BUILD_LIBGLADE_TRUE,;t t +s,@BUILD_LIBGLADE_FALSE@,$BUILD_LIBGLADE_FALSE,;t t s,@USE_HBCMP_TRUE@,$USE_HBCMP_TRUE,;t t s,@USE_HBCMP_FALSE@,$USE_HBCMP_FALSE,;t t s,@CC_FOR_BUILD@,$CC_FOR_BUILD,;t t s,@GTK_CFLAGS_FOR_BUILD@,$GTK_CFLAGS_FOR_BUILD,;t t s,@GTK_LIBS_FOR_BUILD@,$GTK_LIBS_FOR_BUILD,;t t +s,@LIBGLADE_CFLAGS_FOR_BUILD@,$LIBGLADE_CFLAGS_FOR_BUILD,;t t +s,@LIBGLADE_LIBS_FOR_BUILD@,$LIBGLADE_LIBS_FOR_BUILD,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF Index: configure.in =================================================================== RCS file: /cvsroot/xbgtk/xbgtk/configure.in,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- configure.in 6 Apr 2006 13:29:25 -0000 1.9 +++ configure.in 5 Jul 2006 22:04:06 -0000 1.10 @@ -3,23 +3,23 @@ dnl We need AC_CONFIG_SRCDIR AC_PREREQ([2.53]) -AC_INIT([xbgtk], [0.4]) +AC_INIT([xbgtk], [0.5]) dnl =========================================================================== # libtool shared library version # Increment if the interface has additions, changes, removals. -LT_CURRENT=2 +LT_CURRENT=3 # Increment any time the source changes; set to # 0 if you increment CURRENT -LT_REVISION=1 +LT_REVISION=0 # Increment if any interfaces have been added; set to 0 # if any interfaces have been removed. removal has # precedence over adding, so set to 0 if both happened. -LT_AGE=0 +LT_AGE=1 VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE" AC_SUBST(VERSION_INFO) @@ -54,12 +54,19 @@ *** GTK+ 2.8.0 or better is required. The latest version of *** GTK+ is always available from ftp://ftp.gtk.org/.])) +PKG_CHECK_MODULES(LIBGLADE, [libglade-2.0 >= 2.5.0], + build_libglade=true, build_libglade=false) +AC_SUBST(LIBGLADE_CFLAGS) +AC_SUBST(LIBGLADE_LIBS) +AM_CONDITIONAL(BUILD_LIBGLADE, $build_libglade) + dnl Checks for header files. dnl Checks for typedefs, structures, and compiler characteristics. AC_C_CONST dnl Checks for library functions. +AC_CHECK_FUNCS(bind_textdomain_codeset) AM_CONDITIONAL(USE_HBCMP, test x$USE_HBCMP = xyes) @@ -67,15 +74,21 @@ if test x$cross_compiling != xno ; then GTK_CFLAGS_FOR_BUILD="$GTK_CFLAGS" GTK_LIBS_FOR_BUILD="$GTK_LIBS" - GTK_CFLAGS="-mms-bitfields `echo $GTK_CFLAGS|sed 's/-I\\/usr/-I\\/mnt\\/hda1\\/compiler\\/gtk/g'`" - GTK_LIBS="-L/mnt/hda1/compiler/gtk/lib `echo $GTK_LIBS|sed 's/x11/win32/g;s/-ldl//g'`" + LIBGLADE_CFLAGS_FOR_BUILD="$LIBGLADE_CFLAGS" + LIBGLADE_LIBS_FOR_BUILD="$LIBGLADE_LIBS" + GTK_CFLAGS="-mms-bitfields `echo $GTK_CFLAGS $LIBGLADE_CFLAGS|sed 's/-I\\/usr/-I\\/mnt\\/hda1\\/compiler\\/gtk/g'`" + GTK_LIBS="-L/mnt/hda1/compiler/gtk/lib `echo $GTK_LIBS $LIBGLADE_LIBS|sed 's/x11/win32/g;s/-ldl//g'`" else CC_FOR_BUILD="$CC" GTK_CFLAGS_FOR_BUILD="$GTK_CFLAGS" GTK_LIBS_FOR_BUILD="$GTK_LIBS" + LIBGLADE_CFLAGS_FOR_BUILD="$LIBGLADE_CFLAGS" + LIBGLADE_LIBS_FOR_BUILD="$LIBGLADE_LIBS" fi AC_SUBST(CC_FOR_BUILD) AC_SUBST(GTK_CFLAGS_FOR_BUILD) AC_SUBST(GTK_LIBS_FOR_BUILD) +AC_SUBST(LIBGLADE_CFLAGS_FOR_BUILD) +AC_SUBST(LIBGLADE_LIBS_FOR_BUILD) -AC_OUTPUT(xbgtk.pc codegen/Makefile source/Makefile Makefile examples/Makefile examples/xbgtk_demo/Makefile include/Makefile) +AC_OUTPUT(xbgtk.pc codegen/Makefile source/Makefile Makefile examples/Makefile examples/glade/Makefile examples/xbgtk_demo/Makefile include/Makefile) |
