Attachment #253353 for bug #344227

View | Details | Raw Unified | Return to bug 344227
Collapse All | Expand All

Lines 9-18 SUBDIRS = icons lib applet properties wizard sendto $(MOBLIN_DIR) docs po help Link Here

(-)a/Makefile.am (-2 / +1 lines)
9	DIST_SUBDIRS = $(DEF_SUBDIRS) moblin	9	DIST_SUBDIRS = $(DEF_SUBDIRS) moblin
10	EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in ChangeLog.pre-2.27 gtk-doc.make gnome-doc-utils.make	10	EXTRA_DIST = intltool-extract.in intltool-update.in intltool-merge.in ChangeLog.pre-2.27 gtk-doc.make gnome-doc-utils.make
11		11
12	# FIXME https://bugzilla.gnome.org/show_bug.cgi?id=595675
13	DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install \	12	DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install \
14	--disable-desktop-update --disable-mime-update --disable-icon-update \	13	--disable-desktop-update --disable-mime-update --disable-icon-update \
15	--enable-gtk-doc --disable-scrollkeeper --enable-introspection=no	14	--enable-gtk-doc --disable-scrollkeeper --enable-introspection
16		15
17	DISTCLEANFILES = intltool-extract intltool-update intltool-merge gnome-doc-utils.make	16	DISTCLEANFILES = intltool-extract intltool-update intltool-merge gnome-doc-utils.make
18		17




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_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
    fi
    AC_SUBST(INTROSPECTION_SCANNER)
    AC_SUBST(INTROSPECTION_COMPILER)
    AC_SUBST(INTROSPECTION_GENERATE)
    AC_SUBST(INTROSPECTION_GIRDIR)
    AC_SUBST(INTROSPECTION_TYPELIBDIR)

    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])
])


dnl as-ac-expand.m4 0.2.0                                   -*- autoconf -*-
dnl autostars m4 macro for expanding directories using configure's prefix


Lines 186-192 AC_SUBST(DBUS_BINDING_TOOL) Link Here

(-)a/configure.ac (-1 / +1 lines)
186	GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`	186	GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0`
187	AC_SUBST(GLIB_GENMARSHAL)	187	AC_SUBST(GLIB_GENMARSHAL)
188		188
189	GOBJECT_INTROSPECTION_CHECK([0.6.3])	189	GOBJECT_INTROSPECTION_CHECK([0.6.7])
190		190
191	GNOME_COMMON_INIT	191	GNOME_COMMON_INIT
192	GNOME_DEBUG_CHECK	192	GNOME_DEBUG_CHECK





AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\"

-include $(INTROSPECTION_MAKEFILE)
INTROSPECTION_GIRS =
INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)

if HAVE_INTROSPECTION
introspection_sources = $(gnomebluetooth_HEADERS)

GnomeBluetooth-1.0.gir: $(libgnome_bluetooth_la_SOURCES)
GnomeBluetooth-1.0.gir: $(gnomebluetooth_HEADERS)
GnomeBluetooth-1.0.gir: libgnome-bluetooth.la
GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 DBusGLib-1.0 GModule-2.0
GnomeBluetooth_1_0_gir_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS)
GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la
GnomeBluetooth_1_0_gir_SCANNERFLAGS = --strip-prefix=Bluetooth --pkg-export=gnome-bluetooth-1.0
GnomeBluetooth_1_0_gir_FILES = $(introspection_sources)
INTROSPECTION_GIRS += GnomeBluetooth-1.0.gir
		--include=GModule-2.0 \
		--libtool="$(LIBTOOL)" \
		--library=gnome-bluetooth \
		--output $@ \
		--pkg gobject-2.0 \
		--pkg gtk+-2.0 \
		--pkg dbus-glib-1 \
		--pkg gmodule-2.0 \
		-I$(srcdir) \
		$(LIBGNOMEBT_CFLAGS) \
		$(gnomebluetooth_HEADERS)

girdir = $(INTROSPECTION_GIRDIR)
dist_gir_DATA = $(BUILT_GIRSOURCES)

gir_DATA = $(INTROSPECTION_GIRS)

typelibdir = $(INTROSPECTION_TYPELIBDIR)
typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)

%.typelib: %.gir $(G_IR_COMPILER)
	$(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
	
endif # HAVE_INTROSPECTION

BUILT_SOURCES = marshal.h marshal.c \


nodist_libcommon_la_SOURCES = $(BUILT_SOURCES)

CLEANFILES = $(BUILT_SOURCES) $(gir_DATA) $(typelib_DATA)

noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class


Return to bug 344227

Lines 55-95 gnomebluetooth_HEADERS = \ Link Here

(-)a/lib/Makefile.am (-28 / +16 lines)
55		55
56	AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\"	56	AM_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS) $(COMMON_CFLAGS) $(WARN_CFLAGS) $(DISABLE_DEPRECATED) -DPLUGINDIR=\"$(libdir)/gnome-bluetooth/plugins\"
57		57
		58	-include $(INTROSPECTION_MAKEFILE)
		59	INTROSPECTION_GIRS =
		60	INTROSPECTION_SCANNER_ARGS = --warn-all --add-include-path=$(srcdir)
		61	INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
		62
58	if HAVE_INTROSPECTION	63	if HAVE_INTROSPECTION
59	BUILT_GIRSOURCES += GnomeBluetooth-1.0.gir	64	introspection_sources = $(gnomebluetooth_HEADERS)
60		65
61	GnomeBluetooth-1.0.gir: $(libgnome_bluetooth_la_SOURCES)
62	GnomeBluetooth-1.0.gir: $(gnomebluetooth_HEADERS)
63	GnomeBluetooth-1.0.gir: libgnome-bluetooth.la	66	GnomeBluetooth-1.0.gir: libgnome-bluetooth.la
64	GnomeBluetooth-1.0.gir: $(INTROSPECTION_SCANNER)	67	GnomeBluetooth_1_0_gir_INCLUDES = GObject-2.0 Gtk-2.0 DBusGLib-1.0 GModule-2.0
65	$(AM_V_GEN) $(INTROSPECTION_SCANNER) -v --namespace GnomeBluetooth --nsversion=1.0 \	68	GnomeBluetooth_1_0_gir_CFLAGS = -I$(srcdir) $(LIBGNOMEBT_CFLAGS)
66	--add-include-path=$(srcdir) --add-include-path=. \	69	GnomeBluetooth_1_0_gir_LIBS = libgnome-bluetooth.la
67	--include=GObject-2.0 \	70	GnomeBluetooth_1_0_gir_SCANNERFLAGS = --strip-prefix=Bluetooth --pkg-export=gnome-bluetooth-1.0
68	--include=Gtk-2.0 \	71	GnomeBluetooth_1_0_gir_FILES = $(introspection_sources)
69	--include=DBusGLib-1.0 \	72	INTROSPECTION_GIRS += GnomeBluetooth-1.0.gir
70	--include=GModule-2.0 \
71	--libtool="$(LIBTOOL)" \
72	--library=gnome-bluetooth \
73	--output $@ \
74	--pkg gobject-2.0 \
75	--pkg gtk+-2.0 \
76	--pkg dbus-glib-1 \
77	--pkg gmodule-2.0 \
78	-I$(srcdir) \
79	$(LIBGNOMEBT_CFLAGS) \
80	$(gnomebluetooth_HEADERS)
81		73
82	girdir = $(INTROSPECTION_GIRDIR)	74	girdir = $(INTROSPECTION_GIRDIR)
83	dist_gir_DATA = $(BUILT_GIRSOURCES)
84		75
85	EXTRA_DIST += $(BUILT_GIRSOURCES)	76	gir_DATA = $(INTROSPECTION_GIRS)
86		77
87	typelibsdir = $(INTROSPECTION_TYPELIBDIR)	78	typelibdir = $(INTROSPECTION_TYPELIBDIR)
88	typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)	79	typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
89		80
90	%.typelib: %.gir $(G_IR_COMPILER)
91	$(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(INTROSPECTION_COMPILER) --includedir=$(srcdir) --includedir=. $(G_IR_COMPILER_OPTS) $< -o $@
92
93	endif # HAVE_INTROSPECTION	81	endif # HAVE_INTROSPECTION
94		82
95	BUILT_SOURCES = marshal.h marshal.c \	83	BUILT_SOURCES = marshal.h marshal.c \
Lines 101-107 BUILT_SOURCES = marshal.h marshal.c \ Link Here
101		89
102	nodist_libcommon_la_SOURCES = $(BUILT_SOURCES)	90	nodist_libcommon_la_SOURCES = $(BUILT_SOURCES)
103		91
104	CLEANFILES = $(BUILT_SOURCES)	92	CLEANFILES = $(BUILT_SOURCES) $(gir_DATA) $(typelib_DATA)
105		93
106	noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class	94	noinst_PROGRAMS = test-client test-agent test-deviceselection test-plugins test-class
107		95

Lines 1-93 Link Here

(-)a/acinclude.m4 (-90 lines)
1	dnl -- mode: autoconf --
2	dnl Copyright 2009 Johan Dahlin
3	dnl
4	dnl This file is free software; the author(s) gives unlimited
5	dnl permission to copy and/or distribute it, with or without
6	dnl modifications, as long as this notice is preserved.
7	dnl
8
9	# serial 1
10
11	m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL],
12	[
13	AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
14	AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
15	AC_BEFORE([LT_INIT],[$0])dnl setup libtool first
16
17	dnl enable/disable introspection
18	m4_if([$2], [require],
19	[dnl
20	enable_introspection=yes
21	],[dnl
22	AC_ARG_ENABLE(introspection,
23	AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]],
24	[Enable introspection for this build]),,
25	[enable_introspection=auto])
26	])dnl
27
28	AC_MSG_CHECKING([for gobject-introspection])
29
30	dnl presence/version checking
31	AS_CASE([$enable_introspection],
32	[no], [dnl
33	found_introspection="no (disabled, use --enable-introspection to enable)"
34	],dnl
35	[yes],[dnl
36	PKG_CHECK_EXISTS([gobject-introspection-1.0],,
37	AC_MSG_ERROR([gobject-introspection-1.0 is not installed]))
38	PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1],
39	found_introspection=yes,
40	AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME]))
41	],dnl
42	[auto],[dnl
43	PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no)
44	],dnl
45	[dnl
46	AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@])
47	])dnl
48
49	AC_MSG_RESULT([$found_introspection])
50
51	INTROSPECTION_SCANNER=
52	INTROSPECTION_COMPILER=
53	INTROSPECTION_GENERATE=
54	INTROSPECTION_GIRDIR=
55	INTROSPECTION_TYPELIBDIR=
56	if test "x$found_introspection" = "xyes"; then
57	INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
58	INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
59	INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
60	INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
61	INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
62	fi
63	AC_SUBST(INTROSPECTION_SCANNER)
64	AC_SUBST(INTROSPECTION_COMPILER)
65	AC_SUBST(INTROSPECTION_GENERATE)
66	AC_SUBST(INTROSPECTION_GIRDIR)
67	AC_SUBST(INTROSPECTION_TYPELIBDIR)
68
69	AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes")
70	])
71
72
73	dnl Usage:
74	dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version])
75
76	AC_DEFUN([GOBJECT_INTROSPECTION_CHECK],
77	[
78	_GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1])
79	])
80
81	dnl Usage:
82	dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version])
83
84
85	AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE],
86	[
87	_GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require])
88	])
89
90
91	dnl as-ac-expand.m4 0.2.0 -- autoconf --	1	dnl as-ac-expand.m4 0.2.0 -- autoconf --
92	dnl autostars m4 macro for expanding directories using configure's prefix	2	dnl autostars m4 macro for expanding directories using configure's prefix
93		3