summaryrefslogtreecommitdiff
path: root/m4macros
diff options
context:
space:
mode:
authorRomain Bouvier <skunnyk@alteroot.org>2019-05-23 16:57:55 +0200
committerRomain Bouvier <skunnyk@alteroot.org>2019-05-23 16:57:55 +0200
commit7814d31d6c909e9fc65ba4340e7efe4c76cd7c73 (patch)
tree8a8d5963f8071774ab60d93af184091f419352a2 /m4macros
parentb627d837b5e1bf98f403ef1fb4cdab18eeb6bfe8 (diff)
downloadxfce4-dev-tools-7814d31d6c909e9fc65ba4340e7efe4c76cd7c73.tar.gz
Cleanup xfce4-dev-tools
- Remove useless macros: m4macros/xdt-python.m4 and m4macros/xdt-xfce.m4 are not used - Update URLs - Remove xdt-commit, used to generate Changelog, now done via make distcheck
Diffstat (limited to 'm4macros')
-rw-r--r--m4macros/Makefile.am4
-rw-r--r--m4macros/xdt-depends.m44
-rw-r--r--m4macros/xdt-python.m480
-rw-r--r--m4macros/xdt-xfce.m461
4 files changed, 3 insertions, 146 deletions
diff --git a/m4macros/Makefile.am b/m4macros/Makefile.am
index fb1a489..caa4316 100644
--- a/m4macros/Makefile.am
+++ b/m4macros/Makefile.am
@@ -8,9 +8,7 @@ macrodir = $(datadir)/xfce4/dev-tools/m4macros
macro_DATA = \
xdt-depends.m4 \
xdt-features.m4 \
- xdt-i18n.m4 \
- xdt-python.m4 \
- xdt-xfce.m4
+ xdt-i18n.m4
EXTRA_DIST = \
$(macro_DATA)
diff --git a/m4macros/xdt-depends.m4 b/m4macros/xdt-depends.m4
index aea8807..3c07c90 100644
--- a/m4macros/xdt-depends.m4
+++ b/m4macros/xdt-depends.m4
@@ -51,7 +51,7 @@ AC_DEFUN([XDT_PROG_PKG_CONFIG],
echo "*** pkg-config $xdt_cv_PKG_CONFIG_MIN_VERSION or newer. You can download pkg-config"
echo "*** from the freedesktop.org software repository at"
echo "***"
- echo "*** http://www.freedesktop.org/software/pkgconfig"
+ echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1;
fi
@@ -64,7 +64,7 @@ AC_DEFUN([XDT_PROG_PKG_CONFIG],
echo "*** You can download pkg-config from the freedesktop.org"
echo "*** software repository at"
echo "***"
- echo "*** http://www.freedesktop.org/software/pkgconfig"
+ echo "*** https://www.freedesktop.org/wiki/Software/pkg-config/"
echo "***"
exit 1
])
diff --git a/m4macros/xdt-python.m4 b/m4macros/xdt-python.m4
deleted file mode 100644
index c0f8d44..0000000
--- a/m4macros/xdt-python.m4
+++ /dev/null
@@ -1,80 +0,0 @@
-dnl Copyright (c) 2002-2015
-dnl The Xfce development team. All rights reserved.
-dnl
-dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License along
-dnl with this program; if not, write to the Free Software Foundation, Inc.,
-dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-dnl
-dnl xdt-python
-dnl ----------
-dnl Miscellanous Python related autoconf checks. Based on prior
-dnl work by the Python community.
-dnl
-
-
-
-dnl XDT_CHECK_PYTHON_HEADERS([ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-dnl
-dnl Checks if the target system has the ability to create Python
-dnl extensions, that is, if all required Python headers are found.
-dnl Executes ACTION-IF-FOUND if all required headers are found, else
-dnl ACTION-IF-NOT-FOUND.
-dnl
-dnl In addition, this macro defines (and substitutes) PYTHON_INCLUDES
-dnl with the required C preprocessor flags to find the python headers.
-dnl
-AC_DEFUN([XDT_CHECK_PYTHON_HEADERS],
-[
- dnl check for Python interpreter first
- AC_REQUIRE([AM_PATH_PYTHON])
-
- AC_MSG_CHECKING([for headers required to compile python extensions])
-
- dnl the PYTHON_INCLUDES first
- xdt_python_PREFIX=`${PYTHON} -c "import sys; print sys.prefix"`
- xdt_python_EPREFIX=`${PYTHON} -c "import sys; print sys.exec_prefix"`
- xdt_python_OSNAME=`${PYTHON} -c "import os; print os.name"`
- case "${xdt_python_OSNAME}" in
- nt)
- xdt_python_INCLUDES="include"
- ;;
- *)
- xdt_python_INCLUDES="include/python${PYTHON_VERSION}"
- ;;
- esac
- PYTHON_INCLUDES="-I${xdt_python_PREFIX}/${xdt_python_INCLUDES}"
- if test x"${xdt_python_EPREFIX}" != x"${xdt_python_PREFIX}"; then
- PYTHON_INCLUDES="${PYTHON_INCLUDES} -I${xdt_python_EPREFIX}/${xdt_python_INCLUDES}"
- fi
- AC_SUBST([PYTHON_INCLUDES])
-
- dnl now check if the headers exists
- save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="$CPPFLAGS ${PYTHON_INCLUDES}"
- AC_TRY_CPP([#include <Python.h>],
- [
- AC_MSG_RESULT([found])
- $1
- ],
- [
- AC_MSG_RESULT([not found])
- $2
- ])
- CPPFLAGS="$save_CPPFLAGS"
-])
-
-
-
-dnl vim:set ts=2 sw=2 et ai:
diff --git a/m4macros/xdt-xfce.m4 b/m4macros/xdt-xfce.m4
deleted file mode 100644
index ea77824..0000000
--- a/m4macros/xdt-xfce.m4
+++ /dev/null
@@ -1,61 +0,0 @@
-dnl Copyright (c) 2002-2015
-dnl The Xfce development team. All rights reserved.
-dnl
-dnl Written for Xfce by Benedikt Meurer <benny@xfce.org>.
-dnl
-dnl This program is free software; you can redistribute it and/or modify
-dnl it under the terms of the GNU General Public License as published by
-dnl the Free Software Foundation; either version 2 of the License, or
-dnl (at your option) any later version.
-dnl
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
-dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-dnl GNU General Public License for more details.
-dnl
-dnl You should have received a copy of the GNU General Public License along
-dnl with this program; if not, write to the Free Software Foundation, Inc.,
-dnl 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-dnl
-dnl xdt-xfce
-dnl --------
-dnl Xfce specific M4 macros.
-dnl
-
-
-
-dnl XDT_XFCE_PANEL_PLUGIN(varname, [version = 4.9.0])
-dnl
-dnl This macro is intended to be used by panel plugin writers. It
-dnl detects the xfce4-panel package on the target system and sets
-dnl "varname"_CFLAGS, "varname"_LIBS, "varname"_REQUIRED_VERSION
-dnl and "varname"_VERSION properly. The parameter "version"
-dnl specifies the minimum required version of xfce4-panel (defaults
-dnl to 4.9.0 if not given).
-dnl
-dnl In addition, this macro defines "varname"_PLUGINSDIR (and
-dnl marks it for substitution), which points to the directory
-dnl where the panel plugin should be installed to. You should
-dnl use this variable in your Makefile.am.
-dnl
-AC_DEFUN([XDT_XFCE_PANEL_PLUGIN],
-[
- dnl Check for the xfce4-panel package
- XDT_CHECK_PACKAGE([$1], [xfce4-panel-1.0], [m4_default([$2], [4.11.0])])
-
- dnl Check where to put the plugins to
- AC_MSG_CHECKING([where to install panel plugins])
- $1_PLUGINSDIR=$libdir/xfce4/panel-plugins
- AC_SUBST([$1_PLUGINSDIR])
- AC_MSG_RESULT([$$1_PLUGINSDIR])
-])
-
-dnl XFCE_PANEL_PLUGIN(varname, version)
-dnl
-dnl Simple wrapper for XDT_XFCE_PANEL_PLUGIN(varname, version). Kept
-dnl for backward compatibility. Will be removed in the future.
-dnl
-AC_DEFUN([XFCE_PANEL_PLUGIN],
-[
- XDT_XFCE_PANEL_PLUGIN([$1], [$2])
-])