From 2a0c152f523ce964572f3f9f318dac263e52079f Mon Sep 17 00:00:00 2001
From: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Date: Tue, 24 Oct 2017 19:41:24 +0200
Subject: Fork from Ubuntu's indicator-printers.

---
 configure.ac | 32 ++++++++------------------------
 1 file changed, 8 insertions(+), 24 deletions(-)

(limited to 'configure.ac')

diff --git a/configure.ac b/configure.ac
index f257415..35c1640 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,4 @@
-
-AC_INIT(indicator-printers, 0.1.6)
+AC_INIT(ayatana-indicator-printers, 0.1.8)
 
 AC_PREREQ(2.53)
 AM_INIT_AUTOMAKE([])
@@ -24,7 +23,7 @@ AC_DEFUN([AC_DEFINE_PATH], [
 ])
 
 IT_PROG_INTLTOOL([0.35.0])
-GETTEXT_PACKAGE=indicator-printers
+GETTEXT_PACKAGE=ayatana-indicator-printers
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package])
 AC_DEFINE_PATH(GNOMELOCALEDIR, "${datadir}/locale", [locale directory])
@@ -40,10 +39,10 @@ AC_CONFIG_FILES([
 ])
 
 PKG_CHECK_MODULES(APPLET, gtk+-3.0 >= 3.0
-                          indicator3-0.4 >= 0.2
+                          ayatana-indicator3-0.4 >= 0.2
                           dbusmenu-gtk3-0.4 >= 0.2)
 PKG_CHECK_MODULES(SERVICE, gtk+-3.0 >= 3.0
-                           indicator3-0.4 >= 0.2
+                           ayatana-indicator3-0.4 >= 0.2
                            dbusmenu-glib-0.4 >= 0.2)
 
 AC_PATH_PROG(CUPS_CONFIG, cups-config, no)
@@ -59,19 +58,9 @@ SERVICE_LIBS="$SERVICE_LIBS $CUPS_LIBS"
 SYSTEMD_USERDIR=`$PKG_CONFIG --variable=systemduserunitdir systemd`
 AC_SUBST(SYSTEMD_USERDIR)
 
-with_localinstall="no"
-AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall],
-                                           [install all files locally (for distcheck)]),
-              with_localinstall=$enableval,
-              with_localinstall=no)
-
-if test "x$with_localinstall" = "xyes"; then
-	INDICATORDIR="${libdir}/indicators/2/"
-	INDICATORICONSDIR="${datadir}/libindicate/icons/"
-else
-	INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4`
-	INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir indicator3-0.4`
-fi
+INDICATORDIR=`$PKG_CONFIG --variable=indicatordir ayatana-indicator3-0.4`
+INDICATORICONSDIR=`$PKG_CONFIG --variable=iconsdir ayatana-indicator3-0.4`
+
 AC_SUBST(INDICATORDIR)
 AC_SUBST(INDICATORICONSDIR)
 
@@ -79,11 +68,7 @@ AC_SUBST(INDICATORICONSDIR)
 # DBus Service Info
 ###########################
 
-if test "x$with_localinstall" = "xyes"; then
-	DBUSSERVICEDIR="${datadir}/dbus-1/services/"
-else
-	DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
-fi
+DBUSSERVICEDIR=`$PKG_CONFIG --variable=session_bus_services_dir dbus-1`
 AC_SUBST(DBUSSERVICEDIR)
 
 ###########################
@@ -101,4 +86,3 @@ AC_SUBST(COVERAGE_LDFLAGS)
 AC_SUBST(AM_CFLAGS, "-Wall")
 
 AC_OUTPUT
-
-- 
cgit v1.2.3