[libgda] Added --enable-gi-system-install configure option
- From: Vivien Malerba <vivien src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libgda] Added --enable-gi-system-install configure option
- Date: Sat, 21 May 2011 09:11:16 +0000 (UTC)
commit f55b7d1e848b49eb78e8336dcaf5185b4df7435f
Author: Vivien Malerba <malerba gnome-db org>
Date: Sat May 21 10:46:25 2011 +0200
Added --enable-gi-system-install configure option
it allows to specify that GObject Introspection files
have to be installed in the system dir. or in a dir. below $prefix
configure.ac | 5 +++++
libgda-ui/Makefile.am | 9 +++++++--
libgda/Makefile.am | 10 ++++++++--
3 files changed, 20 insertions(+), 4 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 313b573..4e58149 100644
--- a/configure.ac
+++ b/configure.ac
@@ -457,6 +457,11 @@ else
fi
AM_CONDITIONAL(ENABLE_GDAUI_GI, [test "$enable_gdaui_gi" = "yes"])
+AC_ARG_ENABLE([gi-system-install],
+ AS_HELP_STRING([--enable-gi-system-install], [Install GObject Introspection files along with system installed files [default=yes]]),
+ [enable_gi_system_install=$enableval],[enable_gi_system_install=yes])
+AM_CONDITIONAL(ENABLE_GI_SYSTEM_INSTALL, [test x"$enable_gi_system_install" = "xyes"])
+
dnl ******************************
dnl Checks for libcrypto
dnl ******************************
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index acf3c62..e59e399 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -223,10 +223,15 @@ Gdaui_5_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libgda
INTROSPECTION_GIRS += Gdaui-5.0.gir
+if ENABLE_GI_SYSTEM_INSTALL
girdir = $(INTROSPECTION_GIRDIR)
-gir_DATA = $(INTROSPECTION_GIRS)
-
typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+else
+girdir = $(datadir)/gir-1.0
+typelibsdir = $(libdir)/girepository-1.0
+endif
+
+gir_DATA = $(INTROSPECTION_GIRS)
typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
CLEANFILES += $(INTROSPECTION_GIRS) $(typelibs_DATA)
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 866b6f0..0d586c3 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -357,10 +357,16 @@ Gda_5_0_gir_LIBS = $(lib_LTLIBRARIES)
Gda_5_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
INTROSPECTION_GIRS += Gda-5.0.gir
+if ENABLE_GI_SYSTEM_INSTALL
girdir = $(INTROSPECTION_GIRDIR)
-gir_DATA = $(INTROSPECTION_GIRS)
-
typelibsdir = $(INTROSPECTION_TYPELIBDIR)
+else
+girdir = $(datadir)/gir-1.0
+typelibsdir = $(libdir)/girepository-1.0
+endif
+
+gir_DATA = $(INTROSPECTION_GIRS)
typelibs_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
+
CLEANFILES += $(INTROSPECTION_GIRS) $(typelibs_DATA)
endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]