Skip to content

Commit

Permalink
Updated files required by automake
Browse files Browse the repository at this point in the history
  • Loading branch information
fsundermeyer committed May 11, 2021
1 parent 53e96e0 commit 1696070
Show file tree
Hide file tree
Showing 4 changed files with 115 additions and 161 deletions.
7 changes: 4 additions & 3 deletions Makefile.in
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.16.2 from Makefile.am.
# Makefile.in generated by automake 1.16.3 from Makefile.am.
# @configure_input@

# Copyright (C) 1994-2020 Free Software Foundation, Inc.
Expand Down Expand Up @@ -282,6 +282,8 @@ am__relativize = \
GZIP_ENV = --best
DIST_ARCHIVES = $(distdir).tar.bz2
DIST_TARGETS = dist-bzip2
# Exists only to be overridden by the user if desired.
AM_DISTCHECK_DVI_TARGET = dvi
distuninstallcheck_listfiles = find . -type f -print
am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
| sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
Expand Down Expand Up @@ -359,7 +361,6 @@ TAR = @TAR@
TRANG = @TRANG@
VERSION = @VERSION@
W3M = @W3M@
XFIG = @XFIG@
XMLCATALOG = @XMLCATALOG@
XMLLINT = @XMLLINT@
XSLTPROC = @XSLTPROC@
Expand Down Expand Up @@ -1517,7 +1518,7 @@ distcheck: dist
$(DISTCHECK_CONFIGURE_FLAGS) \
--srcdir=../.. --prefix="$$dc_install_base" \
&& $(MAKE) $(AM_MAKEFLAGS) \
&& $(MAKE) $(AM_MAKEFLAGS) dvi \
&& $(MAKE) $(AM_MAKEFLAGS) $(AM_DISTCHECK_DVI_TARGET) \
&& $(MAKE) $(AM_MAKEFLAGS) check \
&& $(MAKE) $(AM_MAKEFLAGS) install \
&& $(MAKE) $(AM_MAKEFLAGS) installcheck \
Expand Down
25 changes: 11 additions & 14 deletions aclocal.m4
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# generated automatically by aclocal 1.16.2 -*- Autoconf -*-
# generated automatically by aclocal 1.16.3 -*- Autoconf -*-

# Copyright (C) 1996-2020 Free Software Foundation, Inc.

Expand Down Expand Up @@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.16'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.16.2], [],
m4_if([$1], [1.16.3], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
])

Expand All @@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.16.2])dnl
[AM_AUTOMAKE_VERSION([1.16.3])dnl
m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
Expand Down Expand Up @@ -207,7 +207,7 @@ m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
[_AM_SET_OPTIONS([$1])dnl
dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT.
m4_if(
m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]),
m4_ifset([AC_PACKAGE_NAME], [ok]):m4_ifset([AC_PACKAGE_VERSION], [ok]),
[ok:ok],,
[m4_fatal([AC_INIT should be called with package and version arguments])])dnl
AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
Expand Down Expand Up @@ -439,12 +439,7 @@ AC_DEFUN([AM_MISSING_HAS_RUN],
[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
AC_REQUIRE_AUX_FILE([missing])dnl
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
*)
MISSING="\${SHELL} $am_aux_dir/missing" ;;
esac
MISSING="\${SHELL} '$am_aux_dir/missing'"
fi
# Use eval to expand $SHELL
if eval "$MISSING --is-lightweight"; then
Expand Down Expand Up @@ -569,12 +564,14 @@ AC_DEFUN([AM_PATH_PYTHON],
m4_default([$3], [AC_MSG_ERROR([no suitable Python interpreter found])])
else
dnl Query Python for its version number. Getting [:3] seems to be
dnl the best way to do this; it's what "site.py" does in the standard
dnl library.
dnl Query Python for its version number. Although site.py simply uses
dnl sys.version[:3], printing that failed with Python 3.10, since the
dnl trailing zero was eliminated. So now we output just the major
dnl and minor version numbers, as numbers. Apparently the tertiary
dnl version is not of interest.
AC_CACHE_CHECK([for $am_display_PYTHON version], [am_cv_python_version],
[am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[[:3]])"`])
[am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[[:2]])"`])
AC_SUBST([PYTHON_VERSION], [$am_cv_python_version])
dnl Use the values of $prefix and $exec_prefix for the corresponding
Expand Down
96 changes: 20 additions & 76 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.69 for DAPS 3.0.0.
# Generated by GNU Autoconf 2.69 for DAPS 3.1.0.
#
# Report bugs to <https://github.com/openSUSE/daps>.
#
Expand Down Expand Up @@ -580,10 +580,10 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='DAPS'
PACKAGE_TARNAME='daps'
PACKAGE_VERSION='3.0.0'
PACKAGE_STRING='DAPS 3.0.0'
PACKAGE_VERSION='3.1.0'
PACKAGE_STRING='DAPS 3.1.0'
PACKAGE_BUGREPORT='https://github.com/openSUSE/daps'
PACKAGE_URL='http://opensuse.github.io/daps'
PACKAGE_URL='https://opensuse.github.io/daps'

ac_unique_file="Makefile.am"
ac_default_prefix=/usr
Expand Down Expand Up @@ -612,7 +612,6 @@ PYTHON_EXEC_PREFIX
PYTHON_PREFIX
PYTHON_VERSION
PYTHON
XFIG
PDFFONTS
OODRAW
OPTIPNG
Expand Down Expand Up @@ -1272,7 +1271,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures DAPS 3.0.0 to adapt to many kinds of systems.
\`configure' configures DAPS 3.1.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1338,7 +1337,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of DAPS 3.0.0:";;
short | recursive ) echo "Configuration of DAPS 3.1.0:";;
esac
cat <<\_ACEOF
Expand All @@ -1364,7 +1363,7 @@ Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
Report bugs to <https://github.com/openSUSE/daps>.
DAPS home page: <http://opensuse.github.io/daps>.
DAPS home page: <https://opensuse.github.io/daps>.
_ACEOF
ac_status=$?
fi
Expand Down Expand Up @@ -1427,7 +1426,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
DAPS configure 3.0.0
DAPS configure 3.1.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
Expand All @@ -1444,7 +1443,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by DAPS $as_me 3.0.0, which was
It was created by DAPS $as_me 3.1.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -1795,9 +1794,9 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
DAPS_VERSION_MAJOR=3
DAPS_VERSION_MINOR=0
DAPS_VERSION_MINOR=1
DAPS_VERSION_MICRO=0
DAPS_VERSION=3.0.0
DAPS_VERSION=3.1.0
DAPS_API_VERSION=3
Expand Down Expand Up @@ -2047,12 +2046,7 @@ program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
am_aux_dir=`cd "$ac_aux_dir" && pwd`
if test x"${MISSING+set}" != xset; then
case $am_aux_dir in
*\ * | *\ *)
MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
*)
MISSING="\${SHELL} $am_aux_dir/missing" ;;
esac
MISSING="\${SHELL} '$am_aux_dir/missing'"
fi
# Use eval to expand $SHELL
if eval "$MISSING --is-lightweight"; then
Expand Down Expand Up @@ -2357,7 +2351,7 @@ fi
# Define the identity of the package.
PACKAGE='daps'
VERSION='3.0.0'
VERSION='3.1.0'
cat >>confdefs.h <<_ACEOF
Expand Down Expand Up @@ -3671,48 +3665,6 @@ fi
# Extract the first word of "xfig", so it can be a program name with args.
set dummy xfig; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
if ${ac_cv_path_XFIG+:} false; then :
$as_echo_n "(cached) " >&6
else
case $XFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_XFIG="$XFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_XFIG="$as_dir/$ac_word$ac_exec_ext"
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_XFIG" && ac_cv_path_XFIG="0"
;;
esac
fi
XFIG=$ac_cv_path_XFIG
if test -n "$XFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $XFIG" >&5
$as_echo "$XFIG" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
fi
for SVG_DTD in "-//W3C//DTD SVG 1.0//EN" \
"-//W3C//DTD SVG 1.1 Basic//EN" ; do
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SVG_DTD" >&5
Expand Down Expand Up @@ -3859,7 +3811,7 @@ $as_echo_n "checking for $am_display_PYTHON version... " >&6; }
if ${am_cv_python_version+:} false; then :
$as_echo_n "(cached) " >&6
else
am_cv_python_version=`$PYTHON -c "import sys; sys.stdout.write(sys.version[:3])"`
am_cv_python_version=`$PYTHON -c "import sys; print('%u.%u' % sys.version_info[:2])"`
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5
$as_echo "$am_cv_python_version" >&6; }
Expand Down Expand Up @@ -4899,7 +4851,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by DAPS $as_me 3.0.0, which was
This file was extended by DAPS $as_me 3.1.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -4947,13 +4899,13 @@ Configuration files:
$config_files
Report bugs to <https://github.com/openSUSE/daps>.
DAPS home page: <http://opensuse.github.io/daps>."
DAPS home page: <https://opensuse.github.io/daps>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
DAPS config.status 3.0.0
DAPS config.status 3.1.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down Expand Up @@ -6112,7 +6064,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by DAPS $as_me 3.0.0, which was
This file was extended by DAPS $as_me 3.1.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -6160,13 +6112,13 @@ Configuration files:
$config_files
Report bugs to <https://github.com/openSUSE/daps>.
DAPS home page: <http://opensuse.github.io/daps>."
DAPS home page: <https://opensuse.github.io/daps>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
DAPS config.status 3.0.0
DAPS config.status 3.1.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Expand Down Expand Up @@ -6861,14 +6813,6 @@ else
$as_echo "Support for .svg images | yes |" >&6; }
fi
if test 0 = "$XFIG"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Support for .fig images | no | install xfig (transfig)" >&5
$as_echo "Support for .fig images | no | install xfig (transfig)" >&6; }
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Support for .fig images | yes |" >&5
$as_echo "Support for .fig images | yes |" >&6; }
fi
if test 0 = "$OPTIPNG" -o 0 = "$EXIFTOOL"; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: Size optimization for .png | no | install optipng and/or exiftool
" >&5
Expand Down
Loading

0 comments on commit 1696070

Please sign in to comment.