@@ -13,8 +13,6 @@ AC_CONFIG_AUX_DIR([script])
13
13
# Though they look like gcc flags!
14
14
AM_INIT_AUTOMAKE ( [ foreign parallel-tests -Wall] )
15
15
m4_ifdef ( [ AM_SILENT_RULES ] , [ AM_SILENT_RULES ([ no] )] )
16
- # would fail with mingw otherwise
17
- # m4_pattern_allow([AM_PROG_AR])
18
16
19
17
# Checks for programs.
20
18
AC_PROG_CC
@@ -25,11 +23,10 @@ AC_GNU_SOURCE
25
23
# Check fails on Travis, but it works fine
26
24
# AX_CXX_COMPILE_STDCXX_11([ext],[optional])
27
25
AC_CHECK_TOOL ( [ AR] , [ ar] , [ false] )
28
- if test "x$is_mingw32" != "xyes"; then
29
- AC_CHECK_TOOL ( [ DLLTOOL] , [ dlltool] , [ false] )
30
- AC_CHECK_TOOL ( [ DLLWRAP] , [ dllwrap] , [ false] )
31
- AC_CHECK_TOOL ( [ WINDRES] , [ windres] , [ false] )
32
- fi
26
+ AC_CHECK_TOOL ( [ DLLTOOL] , [ dlltool] , [ false] )
27
+ AC_CHECK_TOOL ( [ DLLWRAP] , [ dllwrap] , [ false] )
28
+ AC_CHECK_TOOL ( [ WINDRES] , [ windres] , [ false] )
29
+ m4_ifdef ( [ AM_PROG_AR] , [ AM_PROG_AR] )
33
30
LT_INIT([ dlopen] )
34
31
35
32
# Checks for header files.
@@ -46,7 +43,7 @@ AC_CHECK_FUNCS([floor getcwd strtol])
46
43
AC_ARG_ENABLE ( tests , AS_HELP_STRING ( [ --enable-tests] , [ enable testing the build] ) ,
47
44
[ enable_tests="$enableval"] , [ enable_tests=no] )
48
45
49
- AS_CASE ( [ $target ] , [ *-*-mingw32 ] , [ is_mingw32=yes] , [ is_mingw32=no] )
46
+ AS_CASE ( [ $host ] , [ *-*-mingw* ] , [ is_mingw32=yes] , [ is_mingw32=no] )
50
47
AM_CONDITIONAL(COMPILER_IS_MINGW32, test "x$is_mingw32" = "xyes")
51
48
52
49
dnl The dlopen() function is in the C library for *BSD and in
0 commit comments