Skip to content

Commit

Permalink
latest autoconf/automake configuration updates
Browse files Browse the repository at this point in the history
  • Loading branch information
Cristy committed Nov 25, 2022
1 parent 39ac60a commit cfe298a
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 27 deletions.
4 changes: 2 additions & 2 deletions config/depcomp
Expand Up @@ -198,7 +198,7 @@ gcc3)
;;

gcc)
## Note that this doesn't just cater to obsolete pre-3.x GCC compilers.
## Note that this doesn't just cater to obsosete pre-3.x GCC compilers.
## but also to in-use compilers like IMB xlc/xlC and the HP C compiler.
## (see the conditional assignment to $gccflag above).
## There are various ways to get dependency output from gcc. Here's
Expand Down Expand Up @@ -478,7 +478,7 @@ hp2)
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. 'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
# At least on Alpha/RedHat 6.1, Compaq CCC V6.2-504 seems to put
# At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
# dependencies in 'foo.d' instead, so we check for that too.
# Subdirectories are respected.
set_dir_from "$object"
Expand Down
18 changes: 9 additions & 9 deletions config/ltmain.sh
Expand Up @@ -377,24 +377,24 @@ sed_double_backslash="\
# require_check_ifs_backslash
# ---------------------------
# Check if we can use backslash as IFS='\' separator, and set
# $check_ifs_backslash_broken to ':' or 'false'.
# $check_ifs_backshlash_broken to ':' or 'false'.
require_check_ifs_backslash=func_require_check_ifs_backslash
func_require_check_ifs_backslash ()
{
_G_save_IFS=$IFS
IFS='\'
_G_check_ifs_backslash='a\\b'
for _G_i in $_G_check_ifs_backslash
_G_check_ifs_backshlash='a\\b'
for _G_i in $_G_check_ifs_backshlash
do
case $_G_i in
a)
check_ifs_backslash_broken=false
check_ifs_backshlash_broken=false
;;
'')
break
;;
*)
check_ifs_backslash_broken=:
check_ifs_backshlash_broken=:
break
;;
esac
Expand Down Expand Up @@ -515,7 +515,7 @@ opt_warning_types=all
#
# It's entirely deliberate that calling these functions can set
# variables that don't obey the namespace limitations obeyed by the rest
# of this file, in order that they be as useful as possible to
# of this file, in order that that they be as useful as possible to
# callers.


Expand Down Expand Up @@ -1161,7 +1161,7 @@ func_quote_portable ()
*[\\\`\"\$]*)
# Fallback to sed for $func_check_bs_ifs_broken=:, or when the string
# contains the shell wildcard characters.
case $check_ifs_backslash_broken$func_quote_portable_result in
case $check_ifs_backshlash_broken$func_quote_portable_result in
:*|*[\[\*\?]*)
func_quote_portable_result=`$ECHO "$func_quote_portable_result" \
| $SED "$sed_quote_subst"`
Expand Down Expand Up @@ -3089,7 +3089,7 @@ func_cygpath ()
fi
else
func_cygpath_result=
func_error "LT_CYGPATH is empty or specifies nonexistent file: '$LT_CYGPATH'"
func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
fi
}
#end: func_cygpath
Expand Down Expand Up @@ -6022,7 +6022,7 @@ EOF
{
/* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
namespace, but it is not one of the ones we know about and
have already dealt with, above (including dump-script), then
have already dealt with, above (inluding dump-script), then
report an error. Otherwise, targets might begin to believe
they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
namespace. The first time any user complains about this, we'll
Expand Down
2 changes: 1 addition & 1 deletion config/tap-driver.sh
Expand Up @@ -592,7 +592,7 @@ while (1)
bailout_message = bailout_message " " $0
testsuite_error(bailout_message)
}
# Maybe we have too look for diagnostic comments too.
# Maybe we have too look for dianogtic comments too.
else if (comments != 0)
{
comment = extract_tap_comment($0);
Expand Down
16 changes: 8 additions & 8 deletions configure
Expand Up @@ -2047,7 +2047,7 @@ Optional Packages:
--with-utilities enable building command-line utilities (default yes)
--with-quantum-depth=DEPTH
number of bits in a pixel quantum (default 16)
--with-cache=THRESHOLD set pixel cache threshhold in MB (default available
--with-cache=THRESHOLD set pixel cache threshold in MB (default available
memory)
--with-frozenpaths freeze delegate paths
--without-magick-plus-plus
Expand Down Expand Up @@ -5151,7 +5151,7 @@ MAGICK_PATCHLEVEL_VERSION=53

MAGICK_VERSION=7.1.0-53

MAGICK_GIT_REVISION=97d1574ba:20221120
MAGICK_GIT_REVISION=39ac60a89:20221125


# Substitute library versioning
Expand Down Expand Up @@ -5185,7 +5185,7 @@ PACKAGE_LIB_VERSION=0x710

PACKAGE_LIB_VERSION_NUMBER=7,1,0,53

PACKAGE_RELEASE_DATE=2022-11-20
PACKAGE_RELEASE_DATE=2022-11-25


# Ensure that make can run correctly
Expand Down Expand Up @@ -10102,7 +10102,7 @@ then :
fi


# The presence of a feature test macro requesting re-entrant function
# The presence of a feature test macro requesting reentrant function
# definitions is, on some systems, a strong hint that pthreads support is
# correctly enabled

Expand Down Expand Up @@ -25498,7 +25498,7 @@ fi



# Float_t and double_t are intended to be the the most efficient type.
# Float_t and double_t are intended to be the most efficient type.
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
Expand Down Expand Up @@ -25568,7 +25568,7 @@ printf "%s\n" "#define SIZEOF_DOUBLE_T $ac_cv_sizeof_double_t" >>confdefs.h



# Get size of float, double and long double for comparaison.
# Get size of float, double and long double for comparison.
# The cast to long int works around a bug in the HP C Compiler
# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
Expand Down Expand Up @@ -36920,7 +36920,7 @@ else
fi


# Installed ImageMagick utiltity paths
# Installed ImageMagick utility paths
ConvertDelegate="${BIN_DIR}/${ConvertDelegateDefault}"
DisplayDelegate="${BIN_DIR}/${DisplayDelegateDefault}"
MogrifyDelegate="${BIN_DIR}/${MogrifyDelegateDefault}"
Expand Down Expand Up @@ -38001,7 +38001,7 @@ if test "$have_zstd" = 'yes' ; then
MAGICK_DELEGATES="$MAGICK_DELEGATES zstd"
fi

# Remove extraneous spaces from output variables (asthetic)
# Remove extraneous spaces from output variables (aesthetic)
MAGICK_DELEGATES=`echo $MAGICK_DELEGATES | sed -e 's/ */ /g'`
MAGICK_FEATURES=`echo $MAGICK_FEATURES | sed -e 's/ */ /g'`

Expand Down
14 changes: 7 additions & 7 deletions m4/libtool.m4
Expand Up @@ -653,7 +653,7 @@ configured by $[0], generated by m4_PACKAGE_STRING.
Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it."
gives unlimited permision to copy, distribute and modify it."
while test 0 != $[#]
do
Expand Down Expand Up @@ -1706,7 +1706,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
cygwin* | mingw* | cegcc*)
# On Win9x/ME, this test blows up -- it succeeds, but takes
# about 5 minutes as the teststring grows exponentially.
# Worse, since 9x/ME are not preemptively multitasking,
# Worse, since 9x/ME are not pre-emptively multitasking,
# you end up with a "frozen" computer, even though with patience
# the test eventually succeeds (with a max line length of 256k).
# Instead, let's just punt: use the minimum linelength reported by
Expand Down Expand Up @@ -2177,7 +2177,7 @@ if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
test -n "$_LT_TAGVAR(runpath_var, $1)" ||
test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
# We can hardcode nonexistent directories.
# We can hardcode non-existent directories.
if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
Expand Down Expand Up @@ -3826,16 +3826,16 @@ _LT_DECL([], [sharedlib_from_linklib_cmd], [1],
m4_defun([_LT_PATH_MANIFEST_TOOL],
[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_manifest_tool],
[lt_cv_path_manifest_tool=no
AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
[lt_cv_path_mainfest_tool=no
echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
$MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
cat conftest.err >&AS_MESSAGE_LOG_FD
if $GREP 'Manifest Tool' conftest.out > /dev/null; then
lt_cv_path_manifest_tool=yes
lt_cv_path_mainfest_tool=yes
fi
rm -f conftest*])
if test yes != "$lt_cv_path_manifest_tool"; then
if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
Expand Down

0 comments on commit cfe298a

Please sign in to comment.