Skip to content

Commit 52a1b59

Browse files
authored
Get rid of gnome-common build dependency (#231)
"gnome-common" is deprecated. Replace the autogen.sh script by the template suggested at the gnome-common migration page [1], adding the mentioned aclocal line. [1] https://wiki.gnome.org/Projects/GnomeCommon/Migration
1 parent ea31d6b commit 52a1b59

File tree

2 files changed

+32
-14
lines changed

2 files changed

+32
-14
lines changed

autogen.sh

Lines changed: 32 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,39 @@
11
#!/bin/sh
22
# Run this to generate all the initial makefiles, etc.
3+
test -n "$srcdir" || srcdir=$(dirname "$0")
4+
test -n "$srcdir" || srcdir=.
35

4-
srcdir=`dirname $0`
5-
test -z "$srcdir" && srcdir=.
6+
olddir=$(pwd)
67

7-
REQUIRED_AUTOMAKE_VERSION=1.7
8+
cd $srcdir
89

9-
(test -f $srcdir/configure.ac \
10-
&& test -d $srcdir/src) || {
11-
echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
12-
echo " top-level slick-greeter directory"
13-
exit 1
10+
(test -f configure.ac) || {
11+
echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
12+
exit 1
1413
}
1514

16-
which gnome-autogen.sh || {
17-
echo "You need to install gnome-common from the GNOME CVS"
18-
exit 1
19-
}
20-
. gnome-autogen.sh
15+
# shellcheck disable=SC2016
16+
PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
17+
18+
if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
19+
echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
20+
echo "*** If you wish to pass any to it, please specify them on the" >&2
21+
echo "*** '$0' command line." >&2
22+
echo "" >&2
23+
fi
24+
25+
aclocal --install || exit 1
26+
autoreconf --verbose --force --install || exit 1
27+
28+
cd "$olddir"
29+
if [ "$NOCONFIGURE" = "" ]; then
30+
$srcdir/configure "$@" || exit 1
31+
32+
if [ "$1" = "--help" ]; then
33+
exit 0
34+
else
35+
echo "Now type 'make' to compile $PKG_NAME" || exit 1
36+
fi
37+
else
38+
echo "Skipping configure process."
39+
fi

debian/control

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ Standards-Version: 4.6.1
66
Build-Depends: debhelper-compat (= 12),
77
at-spi2-core,
88
dbus-x11,
9-
gnome-common,
109
fonts-ubuntu,
1110
libcanberra-dev,
1211
libgtk-3-dev,

0 commit comments

Comments
 (0)