From ebe62bbb7b8fb96decf8c3d3f3b4fa041608df78 Mon Sep 17 00:00:00 2001 From: Utz-Uwe Haus Date: Mon, 30 May 2016 13:04:29 +0200 Subject: [PATCH] modernize autotools usage Signed-off-by: Utz-Uwe Haus --- backends/minisat/COPYING | 1 - backends/minisat/INSTALL | 1 - backends/minisat/autogen.sh | 5 +- backends/minisat/configure.ac | 11 +-- backends/minisat/ltmain.sh | 1 - backends/minisat/m4/ac_pkg_swig.m4 | 155 ------------------------------------- backends/minisat/m4/ax_pkg_swig.m4 | 135 ++++++++++++++++++++++++++++++++ backends/minisat/m4/libtool.m4 | 1 - backends/minisat/m4/ltoptions.m4 | 1 - backends/minisat/m4/ltsugar.m4 | 1 - backends/minisat/m4/ltversion.m4 | 1 - backends/minisat/m4/lt~obsolete.m4 | 1 - 12 files changed, 143 insertions(+), 171 deletions(-) delete mode 120000 backends/minisat/COPYING delete mode 120000 backends/minisat/INSTALL delete mode 120000 backends/minisat/ltmain.sh delete mode 100644 backends/minisat/m4/ac_pkg_swig.m4 create mode 100644 backends/minisat/m4/ax_pkg_swig.m4 delete mode 120000 backends/minisat/m4/libtool.m4 delete mode 120000 backends/minisat/m4/ltoptions.m4 delete mode 120000 backends/minisat/m4/ltsugar.m4 delete mode 120000 backends/minisat/m4/ltversion.m4 delete mode 120000 backends/minisat/m4/lt~obsolete.m4 diff --git a/backends/minisat/COPYING b/backends/minisat/COPYING deleted file mode 120000 index 6168a39..0000000 --- a/backends/minisat/COPYING +++ /dev/null @@ -1 +0,0 @@ -/usr/share/automake-1.11/COPYING \ No newline at end of file diff --git a/backends/minisat/INSTALL b/backends/minisat/INSTALL deleted file mode 120000 index cbd1c80..0000000 --- a/backends/minisat/INSTALL +++ /dev/null @@ -1 +0,0 @@ -/usr/share/automake-1.11/INSTALL \ No newline at end of file diff --git a/backends/minisat/autogen.sh b/backends/minisat/autogen.sh index 7168bc5..ca5ecb0 100755 --- a/backends/minisat/autogen.sh +++ b/backends/minisat/autogen.sh @@ -1,5 +1,4 @@ #!/bin/sh -aclocal -Im4 -autoconf -automake --add-missing +libtoolize ||glibtoolize +autoreconf -Im4 --install diff --git a/backends/minisat/configure.ac b/backends/minisat/configure.ac index de6649b..40c2427 100644 --- a/backends/minisat/configure.ac +++ b/backends/minisat/configure.ac @@ -1,14 +1,15 @@ AC_INIT([minisat],[2.0-070721]) -AM_INIT_AUTOMAKE -m4_include(m4/check_zlib.m4) -m4_include(m4/ac_pkg_swig.m4) -AC_CONFIG_MACRO_DIR([m4]) +AC_CONFIG_SRCDIR([minisat_wrap.cc]) +AM_INIT_AUTOMAKE([foreign subdir-objects]) AC_PROG_CC AC_PROG_CXX +m4_include(m4/check_zlib.m4) +m4_include(m4/ax_pkg_swig.m4) +AC_CONFIG_MACRO_DIR([m4]) dnl if gnu: use strong optimization settings that minisat authors suggested: AM_CONDITIONAL([gnu_cxx],[test x$ac_cv_cxx_compiler_gnu = xyes]) AC_PROG_LIBTOOL CHECK_ZLIB -AC_PROG_SWIG(1.3.31) +AX_PKG_SWIG(1.3.31, [], [ AC_MSG_ERROR([SWIG is required to build..]) ]) AC_CONFIG_FILES([Makefile]) AC_OUTPUT diff --git a/backends/minisat/ltmain.sh b/backends/minisat/ltmain.sh deleted file mode 120000 index 4159958..0000000 --- a/backends/minisat/ltmain.sh +++ /dev/null @@ -1 +0,0 @@ -/usr/share/libtool/config/ltmain.sh \ No newline at end of file diff --git a/backends/minisat/m4/ac_pkg_swig.m4 b/backends/minisat/m4/ac_pkg_swig.m4 deleted file mode 100644 index c627a74..0000000 --- a/backends/minisat/m4/ac_pkg_swig.m4 +++ /dev/null @@ -1,155 +0,0 @@ -dnl @synopsis AC_PROG_SWIG([major.minor.micro]) -dnl -dnl This macro searches for a SWIG installation on your system. If -dnl found you should call SWIG via $(SWIG). You can use the optional -dnl first argument to check if the version of the available SWIG is -dnl greater than or equal to the value of the argument. It should have -dnl the format: N[.N[.N]] (N is a number between 0 and 999. Only the -dnl first N is mandatory.) -dnl -dnl If the version argument is given (e.g. 1.3.17), AC_PROG_SWIG checks -dnl that the swig package is this version number or higher. -dnl -dnl In configure.in, use as: -dnl -dnl AC_PROG_SWIG(1.3.17) -dnl SWIG_ENABLE_CXX -dnl SWIG_MULTI_MODULE_SUPPORT -dnl SWIG_PYTHON -dnl -dnl @category InstalledPackages -dnl @author Sebastian Huber -dnl @author Alan W. Irwin -dnl @author Rafael Laboissiere -dnl @author Andrew Collier -dnl @version 2004-09-20 -dnl @license GPLWithACException - -AC_DEFUN([AC_PROG_SWIG],[ - AC_PATH_PROG([SWIG],[swig]) - if test -z "$SWIG" ; then - AC_MSG_WARN([cannot find 'swig' program. You should look at http://www.swig.org]) - SWIG='echo "Error: SWIG is not installed. You should look at http://www.swig.org" ; false' - elif test -n "$1" ; then - AC_MSG_CHECKING([for SWIG version]) - [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`] - AC_MSG_RESULT([$swig_version]) - if test -n "$swig_version" ; then - # Calculate the required version number components - [required=$1] - [required_major=`echo $required | sed 's/[^0-9].*//'`] - if test -z "$required_major" ; then - [required_major=0] - fi - [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] - [required_minor=`echo $required | sed 's/[^0-9].*//'`] - if test -z "$required_minor" ; then - [required_minor=0] - fi - [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] - [required_patch=`echo $required | sed 's/[^0-9].*//'`] - if test -z "$required_patch" ; then - [required_patch=0] - fi - # Calculate the available version number components - [available=$swig_version] - [available_major=`echo $available | sed 's/[^0-9].*//'`] - if test -z "$available_major" ; then - [available_major=0] - fi - [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] - [available_minor=`echo $available | sed 's/[^0-9].*//'`] - if test -z "$available_minor" ; then - [available_minor=0] - fi - [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] - [available_patch=`echo $available | sed 's/[^0-9].*//'`] - if test -z "$available_patch" ; then - [available_patch=0] - fi - if test $available_major -ne $required_major \ - -o $available_minor -ne $required_minor \ - -o $available_patch -lt $required_patch ; then - AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version. You should look at http://www.swig.org]) - SWIG='echo "Error: SWIG version >= $1 is required. You have '"$swig_version"'. You should look at http://www.swig.org" ; false' - else - AC_MSG_NOTICE([SWIG executable is '$SWIG']) - SWIG_LIB=`$SWIG -swiglib` - AC_MSG_NOTICE([SWIG library directory is '$SWIG_LIB']) - fi - else - AC_MSG_WARN([cannot determine SWIG version]) - SWIG='echo "Error: Cannot determine SWIG version. You should look at http://www.swig.org" ; false' - fi - fi - AC_SUBST([SWIG_LIB]) -]) - -# SWIG_ENABLE_CXX() -# -# Enable SWIG C++ support. This affects all invocations of $(SWIG). -AC_DEFUN([SWIG_ENABLE_CXX],[ - AC_REQUIRE([AC_PROG_SWIG]) - AC_REQUIRE([AC_PROG_CXX]) - SWIG="$SWIG -c++" -]) - -# SWIG_MULTI_MODULE_SUPPORT() -# -# Enable support for multiple modules. This effects all invocations -# of $(SWIG). You have to link all generated modules against the -# appropriate SWIG runtime library. If you want to build Python -# modules for example, use the SWIG_PYTHON() macro and link the -# modules against $(SWIG_PYTHON_LIBS). -# -AC_DEFUN([SWIG_MULTI_MODULE_SUPPORT],[ - AC_REQUIRE([AC_PROG_SWIG]) - SWIG="$SWIG -noruntime" -]) - -# SWIG_PYTHON([use-shadow-classes = {no, yes}]) -# -# Checks for Python and provides the $(SWIG_PYTHON_CPPFLAGS), -# and $(SWIG_PYTHON_OPT) output variables. -# -# $(SWIG_PYTHON_OPT) contains all necessary SWIG options to generate -# code for Python. Shadow classes are enabled unless the value of the -# optional first argument is exactly 'no'. If you need multi module -# support (provided by the SWIG_MULTI_MODULE_SUPPORT() macro) use -# $(SWIG_PYTHON_LIBS) to link against the appropriate library. It -# contains the SWIG Python runtime library that is needed by the type -# check system for example. -AC_DEFUN([SWIG_PYTHON],[ - AC_REQUIRE([AC_PROG_SWIG]) - AC_REQUIRE([AC_PYTHON_DEVEL]) - test "x$1" != "xno" || swig_shadow=" -noproxy" - AC_SUBST([SWIG_PYTHON_OPT],[-python$swig_shadow]) - AC_SUBST([SWIG_PYTHON_CPPFLAGS],[$PYTHON_CPPFLAGS]) -]) - - -dnl @synopsis AC_LIB_WAD -dnl -dnl This macro searches for installed WAD library. -dnl -AC_DEFUN([AC_LIB_WAD], -[ - AC_REQUIRE([AC_PYTHON_DEVEL]) - AC_ARG_ENABLE(wad, - AC_HELP_STRING([--enable-wad], [enable wad module]), - [ - case "${enableval}" in - no) ;; - *) if test "x${enableval}" = xyes; - then - check_wad="yes" - fi ;; - esac - ], []) - - if test -n "$check_wad"; - then - AC_CHECK_LIB(wadpy, _init, [WADPY=-lwadpy], [], $PYTHON_LDFLAGS $PYTHON_EXTRA_LIBS) - AC_SUBST(WADPY) - fi -]) diff --git a/backends/minisat/m4/ax_pkg_swig.m4 b/backends/minisat/m4/ax_pkg_swig.m4 new file mode 100644 index 0000000..d836eec --- /dev/null +++ b/backends/minisat/m4/ax_pkg_swig.m4 @@ -0,0 +1,135 @@ +# =========================================================================== +# http://www.gnu.org/software/autoconf-archive/ax_pkg_swig.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_PKG_SWIG([major.minor.micro], [action-if-found], [action-if-not-found]) +# +# DESCRIPTION +# +# This macro searches for a SWIG installation on your system. If found, +# then SWIG is AC_SUBST'd; if not found, then $SWIG is empty. If SWIG is +# found, then SWIG_LIB is set to the SWIG library path, and AC_SUBST'd. +# +# You can use the optional first argument to check if the version of the +# available SWIG is greater than or equal to the value of the argument. It +# should have the format: N[.N[.N]] (N is a number between 0 and 999. Only +# the first N is mandatory.) If the version argument is given (e.g. +# 1.3.17), AX_PKG_SWIG checks that the swig package is this version number +# or higher. +# +# As usual, action-if-found is executed if SWIG is found, otherwise +# action-if-not-found is executed. +# +# In configure.in, use as: +# +# AX_PKG_SWIG(1.3.17, [], [ AC_MSG_ERROR([SWIG is required to build..]) ]) +# AX_SWIG_ENABLE_CXX +# AX_SWIG_MULTI_MODULE_SUPPORT +# AX_SWIG_PYTHON +# +# LICENSE +# +# Copyright (c) 2008 Sebastian Huber +# Copyright (c) 2008 Alan W. Irwin +# Copyright (c) 2008 Rafael Laboissiere +# Copyright (c) 2008 Andrew Collier +# Copyright (c) 2011 Murray Cumming +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU General Public License as published by the +# Free Software Foundation; either version 2 of the License, or (at your +# option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General +# Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program. If not, see . +# +# As a special exception, the respective Autoconf Macro's copyright owner +# gives unlimited permission to copy, distribute and modify the configure +# scripts that are the output of Autoconf when processing the Macro. You +# need not follow the terms of the GNU General Public License when using +# or distributing such scripts, even though portions of the text of the +# Macro appear in them. The GNU General Public License (GPL) does govern +# all other use of the material that constitutes the Autoconf Macro. +# +# This special exception to the GPL applies to versions of the Autoconf +# Macro released by the Autoconf Archive. When you make and distribute a +# modified version of the Autoconf Macro, you may extend this special +# exception to the GPL to apply to your modified version as well. + +#serial 11 + +AC_DEFUN([AX_PKG_SWIG],[ + # Ubuntu has swig 2.0 as /usr/bin/swig2.0 + AC_PATH_PROGS([SWIG],[swig swig2.0]) + if test -z "$SWIG" ; then + m4_ifval([$3],[$3],[:]) + elif test -n "$1" ; then + AC_MSG_CHECKING([SWIG version]) + [swig_version=`$SWIG -version 2>&1 | grep 'SWIG Version' | sed 's/.*\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*/\1/g'`] + AC_MSG_RESULT([$swig_version]) + if test -n "$swig_version" ; then + # Calculate the required version number components + [required=$1] + [required_major=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_major" ; then + [required_major=0] + fi + [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] + [required_minor=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_minor" ; then + [required_minor=0] + fi + [required=`echo $required | sed 's/[0-9]*[^0-9]//'`] + [required_patch=`echo $required | sed 's/[^0-9].*//'`] + if test -z "$required_patch" ; then + [required_patch=0] + fi + # Calculate the available version number components + [available=$swig_version] + [available_major=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_major" ; then + [available_major=0] + fi + [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] + [available_minor=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_minor" ; then + [available_minor=0] + fi + [available=`echo $available | sed 's/[0-9]*[^0-9]//'`] + [available_patch=`echo $available | sed 's/[^0-9].*//'`] + if test -z "$available_patch" ; then + [available_patch=0] + fi + # Convert the version tuple into a single number for easier comparison. + # Using base 100 should be safe since SWIG internally uses BCD values + # to encode its version number. + required_swig_vernum=`expr $required_major \* 10000 \ + \+ $required_minor \* 100 \+ $required_patch` + available_swig_vernum=`expr $available_major \* 10000 \ + \+ $available_minor \* 100 \+ $available_patch` + + if test $available_swig_vernum -lt $required_swig_vernum; then + AC_MSG_WARN([SWIG version >= $1 is required. You have $swig_version.]) + SWIG='' + m4_ifval([$3],[$3],[]) + else + AC_MSG_CHECKING([for SWIG library]) + SWIG_LIB=`$SWIG -swiglib` + AC_MSG_RESULT([$SWIG_LIB]) + m4_ifval([$2],[$2],[]) + fi + else + AC_MSG_WARN([cannot determine SWIG version]) + SWIG='' + m4_ifval([$3],[$3],[]) + fi + fi + AC_SUBST([SWIG_LIB]) +]) diff --git a/backends/minisat/m4/libtool.m4 b/backends/minisat/m4/libtool.m4 deleted file mode 120000 index f3504e9..0000000 --- a/backends/minisat/m4/libtool.m4 +++ /dev/null @@ -1 +0,0 @@ -/usr/share/aclocal/libtool.m4 \ No newline at end of file diff --git a/backends/minisat/m4/ltoptions.m4 b/backends/minisat/m4/ltoptions.m4 deleted file mode 120000 index b81279e..0000000 --- a/backends/minisat/m4/ltoptions.m4 +++ /dev/null @@ -1 +0,0 @@ -/usr/share/aclocal/ltoptions.m4 \ No newline at end of file diff --git a/backends/minisat/m4/ltsugar.m4 b/backends/minisat/m4/ltsugar.m4 deleted file mode 120000 index 4d76cc7..0000000 --- a/backends/minisat/m4/ltsugar.m4 +++ /dev/null @@ -1 +0,0 @@ -/usr/share/aclocal/ltsugar.m4 \ No newline at end of file diff --git a/backends/minisat/m4/ltversion.m4 b/backends/minisat/m4/ltversion.m4 deleted file mode 120000 index 5eb474f..0000000 --- a/backends/minisat/m4/ltversion.m4 +++ /dev/null @@ -1 +0,0 @@ -/usr/share/aclocal/ltversion.m4 \ No newline at end of file diff --git a/backends/minisat/m4/lt~obsolete.m4 b/backends/minisat/m4/lt~obsolete.m4 deleted file mode 120000 index de0b9f9..0000000 --- a/backends/minisat/m4/lt~obsolete.m4 +++ /dev/null @@ -1 +0,0 @@ -/usr/share/aclocal/lt~obsolete.m4 \ No newline at end of file -- 2.11.4.GIT