Skip to content

Commit 30f90a4

Browse files
committed
Remove unwanted tests from configure.ac
1 parent cb107a7 commit 30f90a4

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

build/compile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#! /bin/sh
22
# Wrapper for compilers which do not understand '-c -o'.
33

4-
scriptversion=2018-03-07.03; # UTC
4+
scriptversion=2024-06-19.01; # UTC
55

6-
# Copyright (C) 1999-2021 Free Software Foundation, Inc.
6+
# Copyright (C) 1999-2024 Free Software Foundation, Inc.
77
# Written by Tom Tromey <[email protected]>.
88
#
99
# This program is free software; you can redistribute it and/or modify
@@ -143,7 +143,7 @@ func_cl_wrapper ()
143143
# configure might choose to run compile as 'compile cc -o foo foo.c'.
144144
eat=1
145145
case $2 in
146-
*.o | *.[oO][bB][jJ])
146+
*.o | *.lo | *.[oO][bB][jJ])
147147
func_file_conv "$2"
148148
set x "$@" -Fo"$file"
149149
shift
@@ -248,14 +248,17 @@ If you are trying to build a whole package this is not the
248248
right script to run: please start by reading the file 'INSTALL'.
249249
250250
Report bugs to <[email protected]>.
251+
GNU Automake home page: <https://www.gnu.org/software/automake/>.
252+
General help using GNU software: <https://www.gnu.org/gethelp/>.
251253
EOF
252254
exit $?
253255
;;
254256
-v | --v*)
255-
echo "compile $scriptversion"
257+
echo "compile (GNU Automake) $scriptversion"
256258
exit $?
257259
;;
258260
cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
261+
clang-cl | *[/\\]clang-cl | clang-cl.exe | *[/\\]clang-cl.exe | \
259262
icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
260263
func_cl_wrapper "$@" # Doesn't return...
261264
;;

configure.ac

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -946,9 +946,6 @@ AC_CONFIG_FILES([build/apxs-wrapper], [chmod +x build/apxs-wrapper])
946946
if test -e "$PERL"; then
947947
if test "$build_mlogc" -ne 0; then
948948
AC_CONFIG_FILES([mlogc/mlogc-batch-load.pl], [chmod +x mlogc/mlogc-batch-load.pl])
949-
AC_CONFIG_FILES([tests/regression/misc/40-secRemoteRules.t])
950-
AC_CONFIG_FILES([tests/regression/misc/50-ipmatchfromfile-external.t])
951-
AC_CONFIG_FILES([tests/regression/misc/60-pmfromfile-external.t])
952949
fi
953950
AC_CONFIG_FILES([tests/run-unit-tests.pl], [chmod +x tests/run-unit-tests.pl])
954951
AC_CONFIG_FILES([tests/run-regression-tests.pl], [chmod +x tests/run-regression-tests.pl])

0 commit comments

Comments
 (0)