|
0 |
Index: xapp/autogen.sh
|
|
1 |
===================================================================
|
|
2 |
--- xapp.orig/autogen.sh 2016-11-19 18:32:42.305346265 +0100
|
|
3 |
+++ xapp/autogen.sh 2016-11-19 18:32:42.293345934 +0100
|
|
4 |
@@ -1,11 +1,39 @@
|
|
5 |
#!/bin/sh
|
|
6 |
+# Run this to generate all the initial makefiles, etc.
|
|
7 |
+test -n "$srcdir" || srcdir=$(dirname "$0")
|
|
8 |
+test -n "$srcdir" || srcdir=.
|
|
9 |
|
|
10 |
-srcdir=`dirname $0`
|
|
11 |
-test -z "$srcdir" && srcdir=.
|
|
12 |
+olddir=$(pwd)
|
|
13 |
|
|
14 |
-which gnome-autogen.sh || {
|
|
15 |
- echo "You need to install gnome-common from GNOME Git (or from"
|
|
16 |
- echo "your OS vendor's package manager)."
|
|
17 |
+cd $srcdir
|
|
18 |
+
|
|
19 |
+(test -f configure.ac) || {
|
|
20 |
+ echo "*** ERROR: Directory '$srcdir' does not look like the top-level project directory ***"
|
|
21 |
exit 1
|
|
22 |
}
|
|
23 |
-. gnome-autogen.sh
|
|
24 |
+
|
|
25 |
+# shellcheck disable=SC2016
|
|
26 |
+PKG_NAME=$(autoconf --trace 'AC_INIT:$1' configure.ac)
|
|
27 |
+
|
|
28 |
+if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
|
|
29 |
+ echo "*** WARNING: I am going to run 'configure' with no arguments." >&2
|
|
30 |
+ echo "*** If you wish to pass any to it, please specify them on the" >&2
|
|
31 |
+ echo "*** '$0' command line." >&2
|
|
32 |
+ echo "" >&2
|
|
33 |
+fi
|
|
34 |
+
|
|
35 |
+aclocal --install || exit 1
|
|
36 |
+glib-gettextize --force --copy || exit 1
|
|
37 |
+intltoolize --force --copy --automake || exit 1
|
|
38 |
+autoreconf --verbose --force --install || exit 1
|
|
39 |
+
|
|
40 |
+cd "$olddir"
|
|
41 |
+if [ "$NOCONFIGURE" = "" ]; then
|
|
42 |
+ $srcdir/configure "$@" || exit 1
|
|
43 |
+
|
|
44 |
+ if [ "$1" = "--help" ]; then exit 0 else
|
|
45 |
+ echo "Now type 'make' to compile $PKG_NAME" || exit 1
|
|
46 |
+ fi
|
|
47 |
+else
|
|
48 |
+ echo "Skipping configure process."
|
|
49 |
+fi
|
|
50 |
Index: xapp/configure.ac
|
|
51 |
===================================================================
|
|
52 |
--- xapp.orig/configure.ac 2016-11-19 18:32:42.305346265 +0100
|
|
53 |
+++ xapp/configure.ac 2016-11-19 18:34:22.468111327 +0100
|
|
54 |
@@ -9,6 +9,8 @@
|
|
55 |
|
|
56 |
AC_CONFIG_MACRO_DIR([m4])
|
|
57 |
|
|
58 |
+m4_ifdef([AX_IS_RELEASE], [AX_IS_RELEASE([always])])
|
|
59 |
+
|
|
60 |
# Before making a release, the LT_VERSION string should be modified.
|
|
61 |
# The string is of the form C:R:A.
|
|
62 |
# - If interfaces have been changed or added, but binary compatibility has
|
|
63 |
@@ -28,8 +30,7 @@
|
|
64 |
AC_PROG_CC
|
|
65 |
PKG_PROG_PKG_CONFIG
|
|
66 |
|
|
67 |
-GNOME_COMPILE_WARNINGS([maximum])
|
|
68 |
-GNOME_MAINTAINER_MODE_DEFINES
|
|
69 |
+m4_ifdef([AX_COMPILER_FLAGS], [AX_COMPILER_FLAGS([WARN_CFLAGS],[WARN_LDFLAGS])])
|
|
70 |
|
|
71 |
AC_ARG_ENABLE(deprecation_flags,
|
|
72 |
[AC_HELP_STRING([--enable-deprecation-flags],
|
|
73 |
Index: xapp/libxapp/Makefile.am
|
|
74 |
===================================================================
|
|
75 |
--- xapp.orig/libxapp/Makefile.am 2016-11-19 18:32:42.305346265 +0100
|
|
76 |
+++ xapp/libxapp/Makefile.am 2016-11-19 18:32:42.297346044 +0100
|
|
77 |
@@ -4,6 +4,7 @@
|
|
78 |
lib_LTLIBRARIES = libxapp.la
|
|
79 |
|
|
80 |
AM_CPPFLAGS = \
|
|
81 |
+ $(WARN_CFLAGS) \
|
|
82 |
-I$(top_srcdir) \
|
|
83 |
$(XAPP_CFLAGS) \
|
|
84 |
$(XLIB_CFLAGS) \
|
|
85 |
@@ -26,6 +27,7 @@
|
|
86 |
-lrt
|
|
87 |
|
|
88 |
libxapp_la_LDFLAGS = \
|
|
89 |
+ $(WARN_LDFLAGS) \
|
|
90 |
-version-info $(LT_VERSION) \
|
|
91 |
-export-symbols-regex "^xapp_.*" \
|
|
92 |
-no-undefined
|
|
93 |
@@ -49,10 +51,10 @@
|
|
94 |
XApp_1_0_gir_INCLUDES = GObject-2.0 Gtk-3.0
|
|
95 |
XApp_1_0_gir_PACKAGES = gdk-pixbuf-2.0 glib-2.0 gobject-2.0 gio-2.0 gtk+-3.0
|
|
96 |
XApp_1_0_gir_EXPORT_PACKAGES = xapp
|
|
97 |
-XApp_1_0_gir_CFLAGS = -I$(top_srcdir) -DWITH_INTROSPECTION
|
|
98 |
+XApp_1_0_gir_CFLAGS = $(WARN_CFLAGS) -I$(top_srcdir) -DWITH_INTROSPECTION
|
|
99 |
XApp_1_0_gir_LIBS = libxapp.la
|
|
100 |
XApp_1_0_gir_FILES = $(introspection_sources) $(libxapp_HEADERS)
|
|
101 |
-XApp_1_0_gir_SCANNERFLAGS = --identifier-prefix=XApp --symbol-prefix=xapp_
|
|
102 |
+XApp_1_0_gir_SCANNERFLAGS = $(WARN_SCANNERFLAGS) --identifier-prefix=XApp --symbol-prefix=xapp_
|
|
103 |
INTROSPECTION_GIRS += XApp-1.0.gir
|
|
104 |
|
|
105 |
girdir = $(datadir)/gir-1.0
|