From 50bb0d51b3479f0ad2a12a42f86c534115630090 Mon Sep 17 00:00:00 2001 From: Maxim Ermilov Date: Mon, 24 Jan 2011 22:38:45 +0300 Subject: [PATCH] Add Introspection support https://bugzilla.gnome.org/show_bug.cgi?id=630915 --- Makefile.am | 6 ++- configure.in | 7 +++- lib/Makefile.am | 33 ++++++++++++++++ m4/introspection.m4 | 96 +++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 138 insertions(+), 4 deletions(-) create mode 100644 m4/introspection.m4 diff --git a/Makefile.am b/Makefile.am index 7c67b45e..eca41ffd 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,4 @@ +ACLOCAL_AMFLAGS = -I m4 if EXAMPLES EXAMPLES_DIR = examples @@ -17,7 +18,8 @@ EXTRA_DIST = autogen.sh libgtop.spec.in copyright.txt \ intltool-extract.in \ intltool-merge.in \ libgtop.doap \ - intltool-update.in + intltool-update.in \ + m4/introspection.m4 DISTCLEANFILES = \ intltool-extract \ @@ -33,4 +35,4 @@ pkgconfig_DATA = libgtop-2.0.pc libgtop-features.def: features.def @LN_S@ $< $@ -DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc +DISTCHECK_CONFIGURE_FLAGS=--enable-gtk-doc --enable-introspection diff --git a/configure.in b/configure.in index c799a008..8ad31f0b 100644 --- a/configure.in +++ b/configure.in @@ -25,7 +25,7 @@ m4_define([libgtop_server_version], [5]) # Version code calculation m4_define([libgtop_version_code], [m4_eval(libgtop_major_version * 1000000 + libgtop_minor_version * 1000 + libgtop_micro_version)]) -AC_PREREQ(2.59) +AC_PREREQ(2.62) AC_INIT([libgtop], [libgtop_version], [http://bugzilla.gnome.org/enter_bug.cgi?product=libgtop]) AC_CONFIG_SRCDIR(copyright.txt) @@ -33,7 +33,10 @@ AC_CONFIG_HEADERS(config.h) AC_CANONICAL_HOST -AM_INIT_AUTOMAKE +AM_INIT_AUTOMAKE([-Wno-portability]) +AC_CONFIG_MACRO_DIR([m4]) +GOBJECT_INTROSPECTION_CHECK([0.6.7]) + AC_SUBST(ACLOCAL_AMFLAGS, [\${ACLOCAL_FLAGS}]) AC_SUBST(LIBGTOP_MAJOR_VERSION, [libgtop_major_version]) diff --git a/lib/Makefile.am b/lib/Makefile.am index 5b3320b6..4b003598 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -20,3 +20,36 @@ EXTRA_DIST = lib.pl libgtop.sym CLEANFILES = lib.c +-include $(INTROSPECTION_MAKEFILE) +INTROSPECTION_GIRS = +INTROSPECTION_SCANNER_ARGS = --accept-unprefixed +INTROSPECTION_COMPILER_ARGS = + +if HAVE_INTROSPECTION +introspection_sources = $(libgtop_2_0_la_SOURCES) lib.c ../glibtop.h \ + ../include/glibtop/close.h ../include/glibtop/loadavg.h ../include/glibtop/prockernel.h ../include/glibtop/procstate.h \ + ../include/glibtop/sem_limits.h ../include/glibtop/uptime.h ../include/glibtop/command.h ../include/glibtop/mem.h ../include/glibtop/proclist.h \ + ../include/glibtop/proctime.h ../include/glibtop/shm_limits.h ../include/glibtop/version.h ../include/glibtop/cpu.h ../include/glibtop/msg_limits.h \ + ../include/glibtop/procmem.h ../include/glibtop/procuid.h ../include/glibtop/swap.h \ + ../include/glibtop/procsegment.h ../include/glibtop/sysdeps.h ../include/glibtop/global.h \ + ../include/glibtop/procsignal.h ../include/glibtop/union.h ../include/glibtop/gnuserv.h \ + ../include/glibtop/parameter.h ../include/glibtop/mountlist.h ../include/glibtop/fsusage.h ../include/glibtop/procmap.h ../include/glibtop/signal.h \ + ../include/glibtop/sysinfo.h ../include/glibtop/ppp.h ../include/glibtop/procargs.h ../include/glibtop/netload.h \ + ../include/glibtop/procwd.h ../include/glibtop/procaffinity.h \ + ../include/glibtop/netlist.h ../include/glibtop/procopenfiles.h ../include/glibtop/open.h + +GTop-2.0.gir: libgtop-2.0.la +GTop_2_0_gir_INCLUDES = GObject-2.0 +GTop_2_0_gir_CFLAGS = $(INCLUDES) +GTop_2_0_gir_LIBS = libgtop-2.0.la +GTop_2_0_gir_FILES = $(introspection_sources) +INTROSPECTION_GIRS += GTop-2.0.gir + +girdir = $(datadir)/gir-1.0 +gir_DATA = $(INTROSPECTION_GIRS) + +typelibdir = $(libdir)/girepository-1.0 +typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib) + +CLEANFILES += $(gir_DATA) $(typelib_DATA) +endif diff --git a/m4/introspection.m4 b/m4/introspection.m4 new file mode 100644 index 00000000..91b90513 --- /dev/null +++ b/m4/introspection.m4 @@ -0,0 +1,96 @@ +dnl -*- mode: autoconf -*- +dnl Copyright 2009 Johan Dahlin +dnl +dnl This file is free software; the author(s) gives unlimited +dnl permission to copy and/or distribute it, with or without +dnl modifications, as long as this notice is preserved. +dnl + +# serial 1 + +m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([LT_INIT],[$0])dnl setup libtool first + + dnl enable/disable introspection + m4_if([$2], [require], + [dnl + enable_introspection=yes + ],[dnl + AC_ARG_ENABLE(introspection, + AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], + [Enable introspection for this build]),, + [enable_introspection=auto]) + ])dnl + + AC_MSG_CHECKING([for gobject-introspection]) + + dnl presence/version checking + AS_CASE([$enable_introspection], + [no], [dnl + found_introspection="no (disabled, use --enable-introspection to enable)" + ],dnl + [yes],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0],, + AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], + found_introspection=yes, + AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) + ],dnl + [auto],[dnl + PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) + ],dnl + [dnl + AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) + ])dnl + + AC_MSG_RESULT([$found_introspection]) + + INTROSPECTION_SCANNER= + INTROSPECTION_COMPILER= + INTROSPECTION_GENERATE= + INTROSPECTION_GIRDIR= + INTROSPECTION_TYPELIBDIR= + if test "x$found_introspection" = "xyes"; then + INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` + INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` + INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` + INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` + INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)} + INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" + INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)} + INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` + INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` + INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection + fi + AC_SUBST(INTROSPECTION_SCANNER) + AC_SUBST(INTROSPECTION_COMPILER) + AC_SUBST(INTROSPECTION_GENERATE) + AC_SUBST(INTROSPECTION_GIRDIR) + AC_SUBST(INTROSPECTION_TYPELIBDIR) + AC_SUBST(INTROSPECTION_CFLAGS) + AC_SUBST(INTROSPECTION_LIBS) + AC_SUBST(INTROSPECTION_MAKEFILE) + + AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +]) + + +dnl Usage: +dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) + +AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +]) + +dnl Usage: +dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) + + +AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +[ + _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +])