[libzapojit/jjardon/gnome-common-removal] Use autoreconf instead deprecated gnome-common
- From: Javier Jardón Cabezas <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libzapojit/jjardon/gnome-common-removal] Use autoreconf instead deprecated gnome-common
- Date: Sat, 9 Feb 2019 13:31:32 +0000 (UTC)
commit 2dace3ffcd9ca60c4adb406cf0e8077cd396f722
Author: Javier Jardón <jjardon gnome org>
Date: Sat Feb 9 13:30:12 2019 +0000
Use autoreconf instead deprecated gnome-common
See https://wiki.gnome.org/Projects/GnomeCommon/Migration
autogen.sh | 49 +++++++++++++++++++++++++++++++++----------------
configure.ac | 7 ++-----
2 files changed, 35 insertions(+), 21 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 2582b63..fd35663 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,24 +1,41 @@
#!/bin/sh
# Run this to generate all the initial makefiles, etc.
+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
+olddir=$(pwd)
-PKG_NAME="libzapojit"
+cd $srcdir
-(test -f $srcdir/src/zpj.h) || {
- echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
- echo " top-level $PKG_NAME directory"
- exit 1
+(test -f configure.ac) || {
+ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
+ exit 1
}
-which gnome-autogen.sh || {
- echo "You need to install gnome-common from the GNOME git"
- 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
+gtkdocize --copy || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install || exit 1
+
+cd "$olddir"
+if [ "$NOCONFIGURE" = "" ]; then
+ $srcdir/configure "$@" || exit 1
-REQUIRED_AUTOCONF_VERSION=2.63
-REQUIRED_AUTOMAKE_VERSION=1.11
-REQUIRED_INTLTOOL_VERSION=0.40.0
-REQUIRED_PKG_CONFIG_VERSION=0.22
-. gnome-autogen.sh
+ if [ "$1" = "--help" ]; then
+ exit 0
+ else
+ echo "Now type 'make' to compile $PKG_NAME" || exit 1
+ fi
+else
+ echo "Skipping configure process."
+fi
diff --git a/configure.ac b/configure.ac
index 89eacec..cadeb45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,8 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
AM_INIT_AUTOMAKE([-Wno-portability])
AM_MAINTAINER_MODE
+AX_CHECK_ENABLE_DEBUG([yes],[GNOME_ENABLE_DEBUG])
+
AC_PROG_CC
AC_PROG_CC_C_O
AC_HEADER_STDC
@@ -22,10 +24,6 @@ AC_HEADER_STDC
GLIB_MIN_VERSION=2.28
SOUP_MIN_VERSION=2.38
-GNOME_COMPILE_WARNINGS([maximum])
-GNOME_DEBUG_CHECK
-GNOME_MAINTAINER_MODE_DEFINES
-
GOBJECT_INTROSPECTION_CHECK([1.30.0])
IT_PROG_INTLTOOL([0.35.0])
@@ -34,7 +32,6 @@ GETTEXT_PACKAGE=AC_PACKAGE_TARNAME
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"],
[GETTEXT package name])
-AM_GLIB_GNU_GETTEXT
LT_INIT
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]