Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

configure.ac: error if --with-winidn and target OS too old #12684

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

configure.ac: error if --with-winidn and target OS too old #12684

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 4 additions & 7 deletions configure.ac
View file
Open in desktop
Expand Up @@ -2473,17 +2473,14 @@ if test "$want_winidn" = "yes"; then
AC_LANG_PROGRAM([[
#include <windows.h>
]],[[
#if (WINVER < 0x600) && (_WIN32_WINNT < 0x600)
#if (_WIN32_WINNT < 0x600)
#error
#endif
]])
],[
],[
CFLAGS=`echo $CFLAGS | $SED -e 's/-DWINVER=[[^ ]]*//g'`
CFLAGS=`echo $CFLAGS | $SED -e 's/-D_WIN32_WINNT=[[^ ]]*//g'`
CPPFLAGS=`echo $CPPFLAGS | $SED -e 's/-DWINVER=[[^ ]]*//g'`
CPPFLAGS=`echo $CPPFLAGS | $SED -e 's/-D_WIN32_WINNT=[[^ ]]*//g'`
WINIDN_CPPFLAGS="$WINIDN_CPPFLAGS -DWINVER=0x0600"
AC_MSG_RESULT([no])
AC_MSG_ERROR([--with-winidn specified but minimum OS is too old])
])
#
CPPFLAGS="$CPPFLAGS $WINIDN_CPPFLAGS"
Expand Down Expand Up @@ -4608,7 +4605,7 @@ else
AC_LANG_PROGRAM([[
#include <windows.h>
]],[[
#if (WINVER < 0x600) && (_WIN32_WINNT < 0x600)
#if (_WIN32_WINNT < 0x600)
#error
#endif
]])
Expand Down