build: check OS-native IDN first, then libidn2
If AppleIDN or WinIDN is selected, don't look for libidn2. Do this by moving libidn2 detection after AppleIDN/WinIDN and skipping it if any of them was selected. Also: - disable AppleIDN by default with autotools to sync behaviour with CMake. - limit WinIDN checks to native Windows with autotools, as with CMake. Before this patch libidn2 was detected by default even if AppleIDN or WinIDN was explicitly selected. libidn2 wasn't used in the build, but it was left enabled as a dependency and appeared in `libcurl.pc` and `curl-config`. Closes #14674
This commit is contained in:
Viktor Szakats
parent
3307b98139
commit
7673c12929
@ -1002,31 +1002,13 @@ if(CURL_DISABLE_LDAP)
|
|||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# Check for libidn2
|
|
||||||
option(USE_LIBIDN2 "Use libidn2 for IDN support" ON)
|
|
||||||
if(USE_LIBIDN2)
|
|
||||||
find_package(Libidn2)
|
|
||||||
if(LIBIDN2_FOUND)
|
|
||||||
set(CURL_LIBS "${LIBIDN2_LIBRARIES};${CURL_LIBS}")
|
|
||||||
list(APPEND CURL_LIBDIRS ${LIBIDN2_LIBRARY_DIRS})
|
|
||||||
set(LIBCURL_PC_REQUIRES_PRIVATE "libidn2;${LIBCURL_PC_REQUIRES_PRIVATE}")
|
|
||||||
include_directories(${LIBIDN2_INCLUDE_DIRS})
|
|
||||||
link_directories(${LIBIDN2_LIBRARY_DIRS})
|
|
||||||
if(LIBIDN2_CFLAGS)
|
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBIDN2_CFLAGS}")
|
|
||||||
endif()
|
|
||||||
set(HAVE_IDN2_H 1)
|
|
||||||
set(HAVE_LIBIDN2 1)
|
|
||||||
endif()
|
|
||||||
else()
|
|
||||||
set(HAVE_LIBIDN2 OFF)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
if(WIN32)
|
if(WIN32)
|
||||||
option(USE_WIN32_IDN "Use WinIDN for IDN support" OFF)
|
option(USE_WIN32_IDN "Use WinIDN for IDN support" OFF)
|
||||||
if(USE_WIN32_IDN)
|
if(USE_WIN32_IDN)
|
||||||
list(APPEND CURL_LIBS "normaliz")
|
list(APPEND CURL_LIBS "normaliz")
|
||||||
endif()
|
endif()
|
||||||
|
else()
|
||||||
|
set(USE_WIN32_IDN OFF)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
@ -1042,6 +1024,28 @@ if(APPLE)
|
|||||||
set(USE_APPLE_IDN OFF)
|
set(USE_APPLE_IDN OFF)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
else()
|
||||||
|
set(USE_APPLE_IDN OFF)
|
||||||
|
endif()
|
||||||
|
|
||||||
|
# Check for libidn2
|
||||||
|
option(USE_LIBIDN2 "Use libidn2 for IDN support" ON)
|
||||||
|
set(HAVE_IDN2_H OFF)
|
||||||
|
set(HAVE_LIBIDN2 OFF)
|
||||||
|
if(USE_LIBIDN2 AND NOT USE_APPLE_IDN AND NOT USE_WIN32_IDN)
|
||||||
|
find_package(Libidn2)
|
||||||
|
if(LIBIDN2_FOUND)
|
||||||
|
set(CURL_LIBS "${LIBIDN2_LIBRARIES};${CURL_LIBS}")
|
||||||
|
list(APPEND CURL_LIBDIRS ${LIBIDN2_LIBRARY_DIRS})
|
||||||
|
set(LIBCURL_PC_REQUIRES_PRIVATE "libidn2;${LIBCURL_PC_REQUIRES_PRIVATE}")
|
||||||
|
include_directories(${LIBIDN2_INCLUDE_DIRS})
|
||||||
|
link_directories(${LIBIDN2_LIBRARY_DIRS})
|
||||||
|
if(LIBIDN2_CFLAGS)
|
||||||
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${LIBIDN2_CFLAGS}")
|
||||||
|
endif()
|
||||||
|
set(HAVE_IDN2_H 1)
|
||||||
|
set(HAVE_LIBIDN2 1)
|
||||||
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# libpsl
|
# libpsl
|
||||||
|
|||||||
260
configure.ac
260
configure.ac
@ -2584,102 +2584,141 @@ fi
|
|||||||
AM_CONDITIONAL([USE_UNICODE], [test "$want_winuni" = "yes"])
|
AM_CONDITIONAL([USE_UNICODE], [test "$want_winuni" = "yes"])
|
||||||
|
|
||||||
dnl -------------------------------------------------
|
dnl -------------------------------------------------
|
||||||
dnl check winidn option before other IDN libraries
|
dnl check WinIDN option before other IDN libraries
|
||||||
dnl -------------------------------------------------
|
dnl -------------------------------------------------
|
||||||
|
|
||||||
AC_MSG_CHECKING([whether to enable Windows native IDN (Windows native builds only)])
|
tst_links_winidn='no'
|
||||||
OPT_WINIDN="default"
|
if test "$curl_cv_native_windows" = 'yes'; then
|
||||||
AC_ARG_WITH(winidn,
|
AC_MSG_CHECKING([whether to enable Windows native IDN (Windows native builds only)])
|
||||||
AS_HELP_STRING([--with-winidn=PATH],[enable Windows native IDN])
|
OPT_WINIDN="default"
|
||||||
AS_HELP_STRING([--without-winidn], [disable Windows native IDN]),
|
AC_ARG_WITH(winidn,
|
||||||
OPT_WINIDN=$withval)
|
AS_HELP_STRING([--with-winidn=PATH],[enable Windows native IDN])
|
||||||
case "$OPT_WINIDN" in
|
AS_HELP_STRING([--without-winidn], [disable Windows native IDN]),
|
||||||
no|default)
|
OPT_WINIDN=$withval)
|
||||||
dnl --without-winidn option used or configure option not specified
|
case "$OPT_WINIDN" in
|
||||||
want_winidn="no"
|
no|default)
|
||||||
AC_MSG_RESULT([no])
|
dnl --without-winidn option used or configure option not specified
|
||||||
;;
|
want_winidn="no"
|
||||||
yes)
|
AC_MSG_RESULT([no])
|
||||||
dnl --with-winidn option used without path
|
;;
|
||||||
want_winidn="yes"
|
yes)
|
||||||
want_winidn_path="default"
|
dnl --with-winidn option used without path
|
||||||
AC_MSG_RESULT([yes])
|
want_winidn="yes"
|
||||||
;;
|
want_winidn_path="default"
|
||||||
*)
|
AC_MSG_RESULT([yes])
|
||||||
dnl --with-winidn option used with path
|
;;
|
||||||
want_winidn="yes"
|
*)
|
||||||
want_winidn_path="$withval"
|
dnl --with-winidn option used with path
|
||||||
AC_MSG_RESULT([yes ($withval)])
|
want_winidn="yes"
|
||||||
;;
|
want_winidn_path="$withval"
|
||||||
esac
|
AC_MSG_RESULT([yes ($withval)])
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
if test "$want_winidn" = "yes"; then
|
if test "$want_winidn" = "yes"; then
|
||||||
dnl WinIDN library support has been requested
|
dnl WinIDN library support has been requested
|
||||||
clean_CFLAGS="$CFLAGS"
|
clean_CFLAGS="$CFLAGS"
|
||||||
clean_CPPFLAGS="$CPPFLAGS"
|
clean_CPPFLAGS="$CPPFLAGS"
|
||||||
clean_LDFLAGS="$LDFLAGS"
|
clean_LDFLAGS="$LDFLAGS"
|
||||||
clean_LIBS="$LIBS"
|
clean_LIBS="$LIBS"
|
||||||
WINIDN_LIBS="-lnormaliz"
|
WINIDN_LIBS="-lnormaliz"
|
||||||
WINIDN_CPPFLAGS=""
|
WINIDN_CPPFLAGS=""
|
||||||
#
|
#
|
||||||
if test "$want_winidn_path" != "default"; then
|
if test "$want_winidn_path" != "default"; then
|
||||||
dnl path has been specified
|
dnl path has been specified
|
||||||
dnl pkg-config not available or provides no info
|
dnl pkg-config not available or provides no info
|
||||||
WINIDN_LDFLAGS="-L$want_winidn_path/lib$libsuff"
|
WINIDN_LDFLAGS="-L$want_winidn_path/lib$libsuff"
|
||||||
WINIDN_CPPFLAGS="-I$want_winidn_path/include"
|
WINIDN_CPPFLAGS="-I$want_winidn_path/include"
|
||||||
WINIDN_DIR="$want_winidn_path/lib$libsuff"
|
WINIDN_DIR="$want_winidn_path/lib$libsuff"
|
||||||
fi
|
fi
|
||||||
#
|
#
|
||||||
dnl WinIDN requires a minimum supported OS version of at least Vista (0x0600)
|
dnl WinIDN requires a minimum supported OS version of at least Vista (0x0600)
|
||||||
AC_COMPILE_IFELSE([
|
AC_COMPILE_IFELSE([
|
||||||
AC_LANG_PROGRAM([[
|
AC_LANG_PROGRAM([[
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
]],[[
|
]],[[
|
||||||
#if (WINVER < 0x600) && (_WIN32_WINNT < 0x600)
|
#if (WINVER < 0x600) && (_WIN32_WINNT < 0x600)
|
||||||
#error
|
#error
|
||||||
#endif
|
#endif
|
||||||
]])
|
]])
|
||||||
],[
|
],[
|
||||||
],[
|
],[
|
||||||
CFLAGS=`echo $CFLAGS | $SED -e 's/-DWINVER=[[^ ]]*//g'`
|
CFLAGS=`echo $CFLAGS | $SED -e 's/-DWINVER=[[^ ]]*//g'`
|
||||||
CFLAGS=`echo $CFLAGS | $SED -e 's/-D_WIN32_WINNT=[[^ ]]*//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/-DWINVER=[[^ ]]*//g'`
|
||||||
CPPFLAGS=`echo $CPPFLAGS | $SED -e 's/-D_WIN32_WINNT=[[^ ]]*//g'`
|
CPPFLAGS=`echo $CPPFLAGS | $SED -e 's/-D_WIN32_WINNT=[[^ ]]*//g'`
|
||||||
WINIDN_CPPFLAGS="$WINIDN_CPPFLAGS -DWINVER=0x0600"
|
WINIDN_CPPFLAGS="$WINIDN_CPPFLAGS -DWINVER=0x0600"
|
||||||
])
|
])
|
||||||
#
|
#
|
||||||
CPPFLAGS="$CPPFLAGS $WINIDN_CPPFLAGS"
|
CPPFLAGS="$CPPFLAGS $WINIDN_CPPFLAGS"
|
||||||
LDFLAGS="$LDFLAGS $WINIDN_LDFLAGS"
|
LDFLAGS="$LDFLAGS $WINIDN_LDFLAGS"
|
||||||
LIBS="$WINIDN_LIBS $LIBS"
|
LIBS="$WINIDN_LIBS $LIBS"
|
||||||
#
|
#
|
||||||
AC_MSG_CHECKING([if IdnToUnicode can be linked])
|
AC_MSG_CHECKING([if IdnToUnicode can be linked])
|
||||||
AC_LINK_IFELSE([
|
AC_LINK_IFELSE([
|
||||||
AC_LANG_PROGRAM([[
|
AC_LANG_PROGRAM([[
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
]],[[
|
]],[[
|
||||||
IdnToUnicode(0, NULL, 0, NULL, 0);
|
IdnToUnicode(0, NULL, 0, NULL, 0);
|
||||||
]])
|
]])
|
||||||
],[
|
],[
|
||||||
AC_MSG_RESULT([yes])
|
AC_MSG_RESULT([yes])
|
||||||
tst_links_winidn="yes"
|
tst_links_winidn="yes"
|
||||||
],[
|
],[
|
||||||
AC_MSG_RESULT([no])
|
AC_MSG_RESULT([no])
|
||||||
tst_links_winidn="no"
|
tst_links_winidn="no"
|
||||||
])
|
])
|
||||||
#
|
#
|
||||||
if test "$tst_links_winidn" = "yes"; then
|
if test "$tst_links_winidn" = "yes"; then
|
||||||
AC_DEFINE(USE_WIN32_IDN, 1, [Define to 1 if you have the `normaliz' (WinIDN) library (-lnormaliz).])
|
AC_DEFINE(USE_WIN32_IDN, 1, [Define to 1 if you have the `normaliz' (WinIDN) library (-lnormaliz).])
|
||||||
AC_SUBST([IDN_ENABLED], [1])
|
AC_SUBST([IDN_ENABLED], [1])
|
||||||
curl_idn_msg="enabled (Windows-native)"
|
curl_idn_msg="enabled (Windows-native)"
|
||||||
else
|
else
|
||||||
AC_MSG_WARN([Cannot find libraries for IDN support: IDN disabled])
|
AC_MSG_WARN([Cannot find libraries for IDN support: IDN disabled])
|
||||||
CFLAGS="$clean_CFLAGS"
|
CFLAGS="$clean_CFLAGS"
|
||||||
CPPFLAGS="$clean_CPPFLAGS"
|
CPPFLAGS="$clean_CPPFLAGS"
|
||||||
LDFLAGS="$clean_LDFLAGS"
|
LDFLAGS="$clean_LDFLAGS"
|
||||||
LIBS="$clean_LIBS"
|
LIBS="$clean_LIBS"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl **********************************************************************
|
||||||
|
dnl Check for the presence of AppleIDN
|
||||||
|
dnl **********************************************************************
|
||||||
|
|
||||||
|
tst_links_appleidn='no'
|
||||||
|
case $host_os in
|
||||||
|
darwin*)
|
||||||
|
AC_MSG_CHECKING([whether to build with Apple IDN])
|
||||||
|
OPT_IDN="default"
|
||||||
|
AC_ARG_WITH(apple-idn,
|
||||||
|
AS_HELP_STRING([--with-apple-idn],[Enable AppleIDN])
|
||||||
|
AS_HELP_STRING([--without-apple-idn],[Disable AppleIDN]),
|
||||||
|
[OPT_IDN=$withval])
|
||||||
|
case "$OPT_IDN" in
|
||||||
|
yes)
|
||||||
|
dnl --with-apple-idn option used
|
||||||
|
AC_MSG_RESULT([yes, check])
|
||||||
|
AC_CHECK_LIB(icucore, uidna_openUTS46,
|
||||||
|
[
|
||||||
|
AC_CHECK_HEADERS(unicode/uidna.h,
|
||||||
|
curl_idn_msg="enabled (AppleIDN)"
|
||||||
|
AC_DEFINE(USE_APPLE_IDN, 1, [if AppleIDN])
|
||||||
|
AC_SUBST(USE_APPLE_IDN, [1])
|
||||||
|
AC_SUBST([IDN_ENABLED], [1])
|
||||||
|
LIBS="-licucore -liconv $LIBS"
|
||||||
|
tst_links_appleidn='yes'
|
||||||
|
)
|
||||||
|
])
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
dnl **********************************************************************
|
dnl **********************************************************************
|
||||||
dnl Check for the presence of libidn2
|
dnl Check for the presence of libidn2
|
||||||
dnl **********************************************************************
|
dnl **********************************************************************
|
||||||
@ -2693,6 +2732,9 @@ AS_HELP_STRING([--without-libidn2],[Disable libidn2 usage]),
|
|||||||
if test "x$tst_links_winidn" = "xyes"; then
|
if test "x$tst_links_winidn" = "xyes"; then
|
||||||
want_idn="no"
|
want_idn="no"
|
||||||
AC_MSG_RESULT([no (using WinIDN instead)])
|
AC_MSG_RESULT([no (using WinIDN instead)])
|
||||||
|
elif test "x$tst_links_appleidn" = "xyes"; then
|
||||||
|
want_idn="no"
|
||||||
|
AC_MSG_RESULT([no (using AppleIDN instead)])
|
||||||
else
|
else
|
||||||
case "$OPT_IDN" in
|
case "$OPT_IDN" in
|
||||||
no)
|
no)
|
||||||
@ -2811,44 +2853,6 @@ if test "$want_idn" = "yes"; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
dnl **********************************************************************
|
|
||||||
dnl Check for the presence of AppleIDN
|
|
||||||
dnl **********************************************************************
|
|
||||||
|
|
||||||
case $host_os in
|
|
||||||
darwin*)
|
|
||||||
AC_MSG_CHECKING([whether to build with Apple IDN])
|
|
||||||
OPT_IDN="default"
|
|
||||||
AC_ARG_WITH(apple-idn,
|
|
||||||
AS_HELP_STRING([--with-apple-idn],[Enable AppleIDN])
|
|
||||||
AS_HELP_STRING([--without-apple-idn],[Disable AppleIDN]),
|
|
||||||
[OPT_IDN=$withval])
|
|
||||||
if test "x$want_idn" != "xno" -a "x$OPT_IDN" != "xyes"; then
|
|
||||||
want_appleidn="no"
|
|
||||||
else
|
|
||||||
case "$OPT_IDN" in
|
|
||||||
no)
|
|
||||||
dnl --without-apple-idn option used
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
AC_MSG_RESULT([yes, check])
|
|
||||||
AC_CHECK_LIB(icucore, uidna_openUTS46,
|
|
||||||
[
|
|
||||||
AC_CHECK_HEADERS(unicode/uidna.h,
|
|
||||||
curl_idn_msg="enabled (AppleIDN)"
|
|
||||||
AC_DEFINE(USE_APPLE_IDN, 1, [if AppleIDN])
|
|
||||||
AC_SUBST(USE_APPLE_IDN, [1])
|
|
||||||
AC_SUBST([IDN_ENABLED], [1])
|
|
||||||
LIBS="-licucore -liconv $LIBS"
|
|
||||||
)
|
|
||||||
])
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
dnl **********************************************************************
|
dnl **********************************************************************
|
||||||
dnl Check for nghttp2
|
dnl Check for nghttp2
|
||||||
dnl **********************************************************************
|
dnl **********************************************************************
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user