Commit d525e586 authored by Romain Bouvier's avatar Romain Bouvier

Bug #16717: Move from exo-csource to xdt-csource

- exo-csource is deprecated and moved to xdt-csource
- Bump minimal xdt version
parent 1c0a957e
......@@ -7,11 +7,11 @@ mkdir -p m4/ || exit $?
autogen.sh: You don't seem to have the Xfce development tools installed on
your system, which are required to build this software.
Please install the xfce4-dev-tools package first, it is available
from https://www.xfce.org/.
from your distribution or https://www.xfce.org/.
EOF
exit 1
}
XDT_AUTOGEN_REQUIRED_VERSION="4.7.2" exec xdt-autogen $@
XDT_AUTOGEN_REQUIRED_VERSION="4.14.0" exec xdt-autogen $@
# vi:set ts=2 sw=2 et ai:
......@@ -17,7 +17,7 @@ m4_define([mousepad_debug_default], [ifelse(mousepad_version_tag(), [git], [yes]
dnl ***************************
dnl *** Initialize autoconf ***
dnl ***************************
AC_COPYRIGHT([Copyright (c) 2007-2010
AC_COPYRIGHT([Copyright (c) 2007-2020
The Xfce development team. All rights reserved.])
AC_INIT([Mousepad], [mousepad_version], [https://bugzilla.xfce.org/], [mousepad])
AC_PREREQ([2.50])
......@@ -144,20 +144,6 @@ AS_IF([test "x$enable_dbus" = "xyes"],
AC_DEFINE([HAVE_DBUS], [1], [Define if DBUS support is enabled])
])
dnl ***************************************************
dnl *** Check for tools required in maintainer mode ***
dnl ***************************************************
AS_IF([test "x$USE_MAINTAINER_MODE" = "xyes"],
[
AC_PATH_PROG([EXO_CSOURCE], [exo-csource])
AS_IF([test -z "$EXO_CSOURCE"],
[
echo '*** The program "exo-csource" is required to build when --enable-maintainer-mode'
echo '*** is specified.'
exit 1
])
])
dnl ***********************************
dnl *** Check for debugging support ***
dnl ***********************************
......
INCLUDES = \
AM_CPPFLAGS = \
-I$(top_builddir) \
-I$(top_srcdir) \
-DBINDIR=\"$(bindir)\" \
......@@ -127,10 +127,10 @@ mousepad-dbus-infos.c mousepad-dbus-infos.h: mousepad-dbus-infos.xml Makefile
endif
mousepad-window-ui.h: mousepad-window-ui.xml Makefile
$(AM_V_GEN) exo-csource --strip-comments --strip-content --static --name=mousepad_window_ui $< > $@
$(AM_V_GEN) xdt-csource --strip-comments --strip-content --static --name=mousepad_window_ui $< > $@
mousepad-prefs-dialog-ui.h: mousepad-prefs-dialog.glade Makefile
$(AM_V_GEN) exo-csource --strip-comments --strip-content --static --name=mousepad_prefs_dialog_ui $< > $@
$(AM_V_GEN) xdt-csource --strip-comments --strip-content --static --name=mousepad_prefs_dialog_ui $< > $@
mousepad-marshal.h: mousepad-marshal.list Makefile
$(AM_V_GEN) glib-genmarshal --header --prefix=_mousepad_marshal $< > $@
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment