[gnome-panel] Revert "fix 'make distcheck'"
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-panel] Revert "fix 'make distcheck'"
- Date: Tue, 24 Mar 2015 14:58:07 +0000 (UTC)
commit 33310ba9b0858acc1e3b8e5619d57f4e853be538
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date: Tue Mar 24 16:17:21 2015 +0200
Revert "fix 'make distcheck'"
This reverts commit 20688be3dccbe51855fb900f20066de327595a8d.
Makefile.am | 4 +---
configure.ac | 20 --------------------
2 files changed, 1 insertions(+), 23 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index d1f8898..b1075aa 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,9 +12,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
DISTCHECK_CONFIGURE_FLAGS = \
--enable-gtk-doc \
- --enable-introspection \
- --with-girdir='$${datadir}/gir-distcheck' \
- --with-typelibdir='$${libdir}/girepository-distcheck'
+ --enable-introspection
EXTRA_DIST = \
COPYING-DOCS \
diff --git a/configure.ac b/configure.ac
index a1f0139..58fe663 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,26 +46,6 @@ GNOME_COMPILE_WARNINGS([maximum])
# Check for introspection
GOBJECT_INTROSPECTION_CHECK([0.9.5])
-AC_ARG_WITH([girdir],
- AS_HELP_STRING([--with-girdir=DIR], [Installation path for .gir files @<:@auto@:>@]),
- [ac_with_girdir=$withval], [ac_with_girdir=""])
-if test "$ac_with_girdir" != ""; then
- INTROSPECTION_GIRDIR=${ac_with_girdir}
-fi
-
-AC_ARG_WITH([typelibdir],
- AS_HELP_STRING([--with-typelibdir=DIR],[Installation path for .typelib files @<:@auto@:>@]),
- [ac_with_typelibdir=$withval], [ac_with_typelibdir=""])
-if test "$ac_with_typelibdir" != ""; then
- INTROSPECTION_TYPELIBDIR=${ac_with_typelibdir}
-fi
-
-AC_MSG_NOTICE([installing .gir files in $INTROSPECTION_GIRDIR])
-AC_MSG_NOTICE([installing .typelib files in $INTROSPECTION_TYPELIBDIR])
-
-AC_SUBST(INTROSPECTION_GIRDIR)
-AC_SUBST(INTROSPECTION_TYPELIBDIR)
-
GLIB_GSETTINGS
m4_pattern_allow([AM_V_GEN])dnl Make autoconf not complain about the rule below
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]