revert bogus directory added in r20682

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@20685 57a11ea4-9604-0410-9ed3-97b8803252fd

Makefile.am

@@ -46,6 +46,7 @@ EXTRA_DIST = \
   macros/compiler-flags.m4 \
   macros/ac_pkg_swig.m4 \
   macros/legacy_macros.m4 \
+  macros/introspection.m4 \
   po/gnucash.pot \
   po/POTFILES.in \
   po/POTFILES.skip \

configure.ac

@@ -23,6 +23,7 @@ AC_PREREQ(2.59)
 AC_INIT([GnuCash], [2.4.99], [gnucash-devel@gnucash.org])
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_SRCDIR(src/engine/Transaction.h)
+AC_CONFIG_MACRO_DIR(macros)
 
 #Change this in development versions when changing anything that
 #affects stored data structures. Reset to zero when bumping version.
@@ -101,12 +102,6 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
 
 AM_GLIB_GNU_GETTEXT
 
-
-# Enable only when we have autoconf --version >= 2.59
-# on all platforms. Note that AC_PREREQ(2.59) may be
-# insufficient to actually use v2.59 on OSX
-#AC_CONFIG_MACRO_DIR(macros)
-
 AC_PROG_INSTALL
 PKG_PROG_PKG_CONFIG
 
@@ -232,6 +227,8 @@ fi
 # We require glib >= 2.20, released together with gtk-2.16
 PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.20 gthread-2.0 gobject-2.0 gmodule-2.0)
 
+GOBJECT_INTROSPECTION_CHECK([0.6.7])
+
 AC_CHECK_HEADERS(dirent.h dlfcn.h dl.h utmp.h locale.h mcheck.h unistd.h wctype.h)
 
 # Gnucash replaced dlopen/dlsym by the g_module functions; dlsym

src/engine/Account.c

@@ -288,7 +288,7 @@ mark_account (Account *acc)
 \********************************************************************/
 
 /* GObject Initialization */
-G_DEFINE_TYPE(Account, gnc_account, QOF_TYPE_INSTANCE)
+G_DEFINE_TYPE(GncAccount, gnc_account, QOF_TYPE_INSTANCE)
 
 static void
 gnc_account_init(Account* acc)
@@ -534,7 +534,7 @@ gnc_account_set_property (GObject         *object,
 }
 
 static void
-gnc_account_class_init (AccountClass *klass)
+gnc_account_class_init (GncAccountClass *klass)
 {
     GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
 

src/engine/AccountP.h

@@ -49,7 +49,7 @@
  * No one outside of the engine should ever include this file.
 */
 
-/** \struct Account */
+/** \struct GncAccount */
 struct account_s
 {
     QofInstance inst;

src/engine/Makefile.am

@@ -1,5 +1,9 @@
 SUBDIRS = . test-core test 
 
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) --add-include-path=$(top_builddir)/src/libqof/qof
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
 pkglib_LTLIBRARIES = libgncmod-engine.la
 
 AM_CPPFLAGS = \
@@ -216,3 +220,24 @@ CLEANFILES = $(BUILT_SOURCES) gnucash .scm-links \
 MAINTAINERCLEANFILES = swig-engine.c swig-business-core.c
 
 INCLUDES = -DG_LOG_DOMAIN=\"gnc.engine\"
+if HAVE_INTROSPECTION
+include ${INTROSPECTION_MAKEFILE}
+introspection_sources = $(gncinclude_HEADERS)
+
+INTROSPECTION_GIRS += Gncengine.gir
+Gncengine_gir_INCLUDES = GObject-2.0 GLib-2.0 Qof-1
+Gncengine_gir_NAMESPACE = Gnc
+Gncengine_gir_CFLAGS = ${AM_CPPFLAGS} -I$(top_builddir)
+Gncengine_gir_LIBS = libgncmod-engine.la
+Gncengine_gir_FILES = $(introspection_sources)
+
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = GncEngine.typelib
+
+CLEANFILES += $(gir_DATA) $(typelib_DATA)
+endif
+

src/engine/Split.h

@@ -38,8 +38,8 @@ typedef struct _SplitClass SplitClass;
 
 #include <time.h>
 
-#include "gnc-commodity.h"
 #include "gnc-engine.h"
+#include "gnc-commodity.h"
 
 /* --- type macros --- */
 #define GNC_TYPE_SPLIT            (gnc_split_get_type ())

src/libqof/qof/Makefile.am

@@ -1,5 +1,10 @@
 SUBDIRS = . test
 
+INTROSPECTION_GIRS =
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
+INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
+
+
 lib_LTLIBRARIES = libgnc-qof.la
 
 libgnc_qof_la_LDFLAGS= -version-info $(LIBQOF_LIBRARY_VERSION)
@@ -80,6 +85,28 @@ noinst_HEADERS = \
 EXTRA_DIST = \
   qofmath128.c
 
+if HAVE_INTROSPECTION
+include ${INTROSPECTION_MAKEFILE}
+introspection_sources = $(qofinclude_HEADERS)
+
+INTROSPECTION_GIRS += Qof-1.gir
+Qof_1_gir_INCLUDES = GObject-2.0 GLib-2.0
+Qof_1_gir_NAMESPACE = Qof
+Qof_1_gir_VERSION = 1
+Qof_1_gir_CFLAGS = ${AM_CPPFLAGS} -I$(top_builddir)
+Qof_1_gir_LIBS = libgnc-qof.la
+Qof_1_gir_FILES = $(introspection_sources)
+
+
+girdir = $(datadir)/gir-1.0
+gir_DATA = $(INTROSPECTION_GIRS)
+
+typelibdir = $(libdir)/girepository-1.0
+typelib_DATA = Qof-1.typelib
+
+CLEANFILES = $(gir_DATA) $(typelib_DATA)
+endif
+
 if OS_WIN32
 libgnc_qof_la_SOURCES += qof-win32.c
 else

src/libqof/qof/qofutil.h

@@ -32,6 +32,7 @@
 #ifndef QOF_UTIL_H
 #define QOF_UTIL_H
 
+#include <config.h>
 #include <stddef.h>
 #include "qof.h"
 #include "qoflog.h"