[libgda] introspection: removed system installation



commit 6851be31183cbb6919b28be70670a6af36e1a0ed
Author: Daniel Espinosa <esodan gmail com>
Date:   Fri Oct 26 16:35:46 2018 -0500

    introspection: removed system installation
    
    By default introspection files are installed
    relative to prefix

 configure.ac          | 5 -----
 libgda-ui/Makefile.am | 5 -----
 libgda/Makefile.am    | 5 -----
 3 files changed, 15 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 086db2076..46836c110 100644
--- a/configure.ac
+++ b/configure.ac
@@ -547,11 +547,6 @@ fi
 
 AM_CONDITIONAL(ENABLE_GDAUI_GI, [test "$enable_gdaui_gi" = "yes"])
 
-AC_ARG_ENABLE([gi-system-install],
-    AS_HELP_STRING([--enable-gi-system-install[=@<:@no/auto/yes@:>@]], [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"])
-
 if test "x$enable_gda_gi" != "xyes" -a "x$enable_gdaui_gi" = "xyes"
 then
        AC_MSG_ERROR([GObject Introspection for GDA-UI is requested but GObject Introspection for GDA is 
disabled. Use --enable-gda-gi])
diff --git a/libgda-ui/Makefile.am b/libgda-ui/Makefile.am
index faac3dd20..042793188 100644
--- a/libgda-ui/Makefile.am
+++ b/libgda-ui/Makefile.am
@@ -239,13 +239,8 @@ Gdaui_6_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources))
 INTROSPECTION_COMPILER_ARGS = --includedir=$(top_builddir)/libgda
 INTROSPECTION_GIRS += Gdaui-6.0.gir
 
-if ENABLE_GI_SYSTEM_INSTALL
-girdir = $(INTROSPECTION_GIRDIR)
-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)
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index 8b869c806..1d059b7d0 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -372,13 +372,8 @@ Gda_6_0_gir_LIBS = $(lib_LTLIBRARIES)
 Gda_6_0_gir_FILES = $(addprefix $(srcdir)/,$(introspection_sources)) $(gda_built_sources)
 INTROSPECTION_GIRS += Gda-6.0.gir
 
-if ENABLE_GI_SYSTEM_INSTALL
-girdir = $(INTROSPECTION_GIRDIR)
-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)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]