Merge lp:~jbicha/unity-settings-daemon/fix-ftbfs into lp:unity-settings-daemon

[Jeremy Bicha]

Drop dependency on gnome-common to fix FTBFS (backported from gnome-settings-daemon)

[Robert Ancell (robert-ancell)]

LGTM

review: Approve

=== modified file 'autogen.sh'
--- autogen.sh	2013-12-04 23:55:26 +0000
+++ autogen.sh	2017-03-22 16:14:40 +0000
@@ -1,25 +1,40 @@
 #!/bin/sh
 # Run this to generate all the initial makefiles, etc.
-
-REQUIRED_AUTOMAKE_VERSION=1.5
-USE_GNOME2_MACROS=1
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
-PKG_NAME="unity-settings-daemon"
-
-(test -f $srcdir/configure.ac \
-  && test -d $srcdir/gnome-settings-daemon \
-  && test -f $srcdir/gnome-settings-daemon/gnome-settings-manager.h) || {
-    echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
-    echo " top-level unity-settings-daemon directory"
-    exit 1
-}
-
-which gnome-autogen.sh || {
-    echo "You need to install gnome-common from the GNOME SVN"
-    exit 1
-}
-
-. gnome-autogen.sh
+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
+
+olddir=$(pwd)
+
+cd $srcdir
+
+(test -f configure.ac) || {
+	echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
+	exit 1
+}
+
+# shellcheck disable=SC2016
+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
+
+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
+	echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
+	echo "*** If you wish to pass any to it, please specify them on the" >&2
+	echo "*** '$0' command line." >&2
+	echo "" >&2
+fi
+
+aclocal --install || exit 1
+glib-gettextize --force --copy || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install || exit 1
+
+cd "$olddir"
+if [ "$NOCONFIGURE" = "" ]; then
+	$srcdir/configure "$@" || exit 1
+
+	if [ "$1" = "--help" ]; then exit 0 else
+		echo "Now type 'make' to compile $PKG_NAME" || exit 1
+	fi
+else
+	echo "Skipping configure process."
+fi
+

=== modified file 'configure.ac'
--- configure.ac	2016-05-15 01:00:17 +0000
+++ configure.ac	2017-03-22 16:14:40 +0000
@@ -4,6 +4,7 @@
         [1.0])
 
 AC_CONFIG_SRCDIR([gnome-settings-daemon/gnome-settings-manager.c])
+AC_CONFIG_MACRO_DIR([m4])
 
 AM_INIT_AUTOMAKE([1.9 tar-ustar dist-xz no-dist-gzip check-news])
 AM_MAINTAINER_MODE([enable])