Skip to content

Commit c8a18b9

Browse files
committed
remove obsolete autoconf macros
``` $ autoreconf -vfi autoreconf: export WARNINGS= autoreconf: Entering directory '.' autoreconf: configure.ac: not using Gettext autoreconf: running: aclocal --force autoreconf: configure.ac: tracing autoreconf: configure.ac: not using Libtool autoreconf: configure.ac: not using Intltool autoreconf: configure.ac: not using Gtkdoc autoreconf: running: /opt/homebrew/Cellar/autoconf/2.71/bin/autoconf --force autoreconf: running: /opt/homebrew/Cellar/autoconf/2.71/bin/autoheader --force autoreconf: configure.ac: not using Automake autoreconf: Leaving directory '.' ```
1 parent f55e2e9 commit c8a18b9

File tree

3 files changed

+1
-188
lines changed

3 files changed

+1
-188
lines changed

config.h.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,6 @@
7474
backward compatibility; new code need not use it. */
7575
#undef STDC_HEADERS
7676

77-
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. This
78-
macro is obsolete. */
79-
#undef TIME_WITH_SYS_TIME
80-
8177
/* Real integer type corresponding to size_t. */
8278
#undef TYPE_SIZE_T
8379

configure

Lines changed: 1 addition & 161 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,7 @@ test -x / || exit 1"
180180
as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
181181
as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
182182
eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
183-
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
184-
test \$(( 1 + 1 )) = 2 || exit 1"
183+
test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1"
185184
if (eval "$as_required") 2>/dev/null
186185
then :
187186
as_have_required=yes
@@ -659,8 +658,6 @@ DEFAULT_COMPILER
659658
HAS_MSVC
660659
EMUL
661660
LIBOBJS
662-
EGREP
663-
GREP
664661
CYGPATH
665662
PERL
666663
OCAMLFIND
@@ -2353,7 +2350,6 @@ as_fn_append ac_header_c_list " strings.h strings_h HAVE_STRINGS_H"
23532350
as_fn_append ac_header_c_list " sys/stat.h sys_stat_h HAVE_SYS_STAT_H"
23542351
as_fn_append ac_header_c_list " sys/types.h sys_types_h HAVE_SYS_TYPES_H"
23552352
as_fn_append ac_header_c_list " unistd.h unistd_h HAVE_UNISTD_H"
2356-
as_fn_append ac_header_c_list " sys/time.h sys_time_h HAVE_SYS_TIME_H"
23572353

23582354
# Auxiliary files required by this configure script.
23592355
ac_aux_files="install-sh config.guess config.sub"
@@ -5293,152 +5289,6 @@ printf "%s\n" "$UNDERSCORE_NAME" >&6; }
52935289
# (autoscan is part of the autoconf distribution)
52945290

52955291
# checks for header files
5296-
# Autoupdate added the next two lines to ensure that your configure
5297-
# script's behavior did not change. They are probably safe to remove.
5298-
5299-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
5300-
printf %s "checking for grep that handles long lines and -e... " >&6; }
5301-
if test ${ac_cv_path_GREP+y}
5302-
then :
5303-
printf %s "(cached) " >&6
5304-
else $as_nop
5305-
if test -z "$GREP"; then
5306-
ac_path_GREP_found=false
5307-
# Loop through the user's path and test for each of PROGNAME-LIST
5308-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5309-
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
5310-
do
5311-
IFS=$as_save_IFS
5312-
case $as_dir in #(((
5313-
'') as_dir=./ ;;
5314-
*/) ;;
5315-
*) as_dir=$as_dir/ ;;
5316-
esac
5317-
for ac_prog in grep ggrep
5318-
do
5319-
for ac_exec_ext in '' $ac_executable_extensions; do
5320-
ac_path_GREP="$as_dir$ac_prog$ac_exec_ext"
5321-
as_fn_executable_p "$ac_path_GREP" || continue
5322-
# Check for GNU ac_path_GREP and select it if it is found.
5323-
# Check for GNU $ac_path_GREP
5324-
case `"$ac_path_GREP" --version 2>&1` in
5325-
*GNU*)
5326-
ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;;
5327-
*)
5328-
ac_count=0
5329-
printf %s 0123456789 >"conftest.in"
5330-
while :
5331-
do
5332-
cat "conftest.in" "conftest.in" >"conftest.tmp"
5333-
mv "conftest.tmp" "conftest.in"
5334-
cp "conftest.in" "conftest.nl"
5335-
printf "%s\n" 'GREP' >> "conftest.nl"
5336-
"$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break
5337-
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
5338-
as_fn_arith $ac_count + 1 && ac_count=$as_val
5339-
if test $ac_count -gt ${ac_path_GREP_max-0}; then
5340-
# Best one so far, save it but keep looking for a better one
5341-
ac_cv_path_GREP="$ac_path_GREP"
5342-
ac_path_GREP_max=$ac_count
5343-
fi
5344-
# 10*(2^10) chars as input seems more than enough
5345-
test $ac_count -gt 10 && break
5346-
done
5347-
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
5348-
esac
5349-
5350-
$ac_path_GREP_found && break 3
5351-
done
5352-
done
5353-
done
5354-
IFS=$as_save_IFS
5355-
if test -z "$ac_cv_path_GREP"; then
5356-
as_fn_error $? "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
5357-
fi
5358-
else
5359-
ac_cv_path_GREP=$GREP
5360-
fi
5361-
5362-
fi
5363-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5
5364-
printf "%s\n" "$ac_cv_path_GREP" >&6; }
5365-
GREP="$ac_cv_path_GREP"
5366-
5367-
5368-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
5369-
printf %s "checking for egrep... " >&6; }
5370-
if test ${ac_cv_path_EGREP+y}
5371-
then :
5372-
printf %s "(cached) " >&6
5373-
else $as_nop
5374-
if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
5375-
then ac_cv_path_EGREP="$GREP -E"
5376-
else
5377-
if test -z "$EGREP"; then
5378-
ac_path_EGREP_found=false
5379-
# Loop through the user's path and test for each of PROGNAME-LIST
5380-
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
5381-
for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin
5382-
do
5383-
IFS=$as_save_IFS
5384-
case $as_dir in #(((
5385-
'') as_dir=./ ;;
5386-
*/) ;;
5387-
*) as_dir=$as_dir/ ;;
5388-
esac
5389-
for ac_prog in egrep
5390-
do
5391-
for ac_exec_ext in '' $ac_executable_extensions; do
5392-
ac_path_EGREP="$as_dir$ac_prog$ac_exec_ext"
5393-
as_fn_executable_p "$ac_path_EGREP" || continue
5394-
# Check for GNU ac_path_EGREP and select it if it is found.
5395-
# Check for GNU $ac_path_EGREP
5396-
case `"$ac_path_EGREP" --version 2>&1` in
5397-
*GNU*)
5398-
ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;;
5399-
*)
5400-
ac_count=0
5401-
printf %s 0123456789 >"conftest.in"
5402-
while :
5403-
do
5404-
cat "conftest.in" "conftest.in" >"conftest.tmp"
5405-
mv "conftest.tmp" "conftest.in"
5406-
cp "conftest.in" "conftest.nl"
5407-
printf "%s\n" 'EGREP' >> "conftest.nl"
5408-
"$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break
5409-
diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break
5410-
as_fn_arith $ac_count + 1 && ac_count=$as_val
5411-
if test $ac_count -gt ${ac_path_EGREP_max-0}; then
5412-
# Best one so far, save it but keep looking for a better one
5413-
ac_cv_path_EGREP="$ac_path_EGREP"
5414-
ac_path_EGREP_max=$ac_count
5415-
fi
5416-
# 10*(2^10) chars as input seems more than enough
5417-
test $ac_count -gt 10 && break
5418-
done
5419-
rm -f conftest.in conftest.tmp conftest.nl conftest.out;;
5420-
esac
5421-
5422-
$ac_path_EGREP_found && break 3
5423-
done
5424-
done
5425-
done
5426-
IFS=$as_save_IFS
5427-
if test -z "$ac_cv_path_EGREP"; then
5428-
as_fn_error $? "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5
5429-
fi
5430-
else
5431-
ac_cv_path_EGREP=$EGREP
5432-
fi
5433-
5434-
fi
5435-
fi
5436-
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5
5437-
printf "%s\n" "$ac_cv_path_EGREP" >&6; }
5438-
EGREP="$ac_cv_path_EGREP"
5439-
5440-
5441-
54425292
ac_fn_c_check_header_compile "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default"
54435293
if test "x$ac_cv_header_stdlib_h" = xyes
54445294
then :
@@ -5606,16 +5456,6 @@ _ACEOF
56065456
esac
56075457

56085458

5609-
5610-
# Obsolete code to be removed.
5611-
if test $ac_cv_header_sys_time_h = yes; then
5612-
5613-
printf "%s\n" "#define TIME_WITH_SYS_TIME 1" >>confdefs.h
5614-
5615-
fi
5616-
# End of obsolete code.
5617-
5618-
56195459
ac_fn_c_check_type "$LINENO" "intptr_t" "ac_cv_type_intptr_t" "$ac_includes_default"
56205460
if test "x$ac_cv_type_intptr_t" = xyes
56215461
then :

configure.ac

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -167,34 +167,11 @@ AC_MSG_RESULT($UNDERSCORE_NAME)
167167
# (autoscan is part of the autoconf distribution)
168168

169169
# checks for header files
170-
m4_warn([obsolete],
171-
[The preprocessor macro `STDC_HEADERS' is obsolete.
172-
Except in unusual embedded environments, you can safely include all
173-
ISO C90 headers unconditionally.])dnl
174-
# Autoupdate added the next two lines to ensure that your configure
175-
# script's behavior did not change. They are probably safe to remove.
176-
AC_CHECK_INCLUDES_DEFAULT
177-
AC_PROG_EGREP
178-
179170
AC_CHECK_HEADERS(stdlib.h strings.h sys/time.h unistd.h wchar.h stdbool.h)
180171

181172
# checks for typedefs, structures, and compiler characteristics
182173
AC_C_CONST
183174
AC_C_INLINE
184-
m4_warn([obsolete],
185-
[Update your code to rely only on HAVE_SYS_TIME_H,
186-
then remove this warning and the obsolete code below it.
187-
All current systems provide time.h; it need not be checked for.
188-
Not all systems provide sys/time.h, but those that do, all allow
189-
you to include it and time.h simultaneously.])dnl
190-
AC_CHECK_HEADERS_ONCE([sys/time.h])
191-
# Obsolete code to be removed.
192-
if test $ac_cv_header_sys_time_h = yes; then
193-
AC_DEFINE([TIME_WITH_SYS_TIME],[1],[Define to 1 if you can safely include both <sys/time.h>
194-
and <time.h>. This macro is obsolete.])
195-
fi
196-
# End of obsolete code.
197-
198175
AC_TYPE_INTPTR_T
199176

200177
# checks for library functions; more autoscan stuff

0 commit comments

Comments
 (0)