118 lines
3.7 KiB
Diff
118 lines
3.7 KiB
Diff
|
https://gitlab.com/libidn/libidn2/commit/204dd34f2ce95b71a7f56ffe97b9019fb91db49c
|
||
|
|
||
|
--- libidn2-2.0.3/configure.ac 2017-07-24 10:53:59.000000000 +0200
|
||
|
+++ libidn2-2.0.3/configure.ac.docs 2017-08-01 00:27:44.000000000 +0200
|
||
|
@@ -95,17 +95,6 @@
|
||
|
enable_doc=$enableval, enable_doc=yes)
|
||
|
AM_CONDITIONAL(ENABLE_DOC, test "$enable_doc" != "no")
|
||
|
|
||
|
-if test "$enable_doc" = "yes"; then
|
||
|
- AC_CHECK_PROG([RONN], [ronn], [ronn], [:])
|
||
|
- if test "$ac_cv_prog_RONN" = ":"; then
|
||
|
- AC_MSG_ERROR([You need the 'ronn' tool to generate the idn2.1 man page])
|
||
|
- fi
|
||
|
- AC_CHECK_PROG([MAKEINFO], [makeinfo], [makeinfo], [:])
|
||
|
- if test "$ac_cv_prog_MAKEINFO" = ":"; then
|
||
|
- AC_MSG_ERROR([You need the 'makeinfo' tool to generate the info pages])
|
||
|
- fi
|
||
|
-fi
|
||
|
-
|
||
|
if test "$ac_cv_libunistring" = "yes";then
|
||
|
AC_SEARCH_LIBS(uc_joining_type, unistring, [], [ac_cv_libunistring=no])
|
||
|
fi
|
||
|
--- libidn2-2.0.3/configure 2017-07-24 11:05:20.000000000 +0200
|
||
|
+++ libidn2-2.0.3/configure.docs 2017-08-01 00:28:21.000000000 +0200
|
||
|
@@ -28283,92 +28283,6 @@
|
||
|
ENABLE_DOC_FALSE=
|
||
|
fi
|
||
|
|
||
|
-
|
||
|
-if test "$enable_doc" = "yes"; then
|
||
|
- # Extract the first word of "ronn", so it can be a program name with args.
|
||
|
-set dummy ronn; ac_word=$2
|
||
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
|
-$as_echo_n "checking for $ac_word... " >&6; }
|
||
|
-if ${ac_cv_prog_RONN+:} false; then :
|
||
|
- $as_echo_n "(cached) " >&6
|
||
|
-else
|
||
|
- if test -n "$RONN"; then
|
||
|
- ac_cv_prog_RONN="$RONN" # Let the user override the test.
|
||
|
-else
|
||
|
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
|
-for as_dir in $PATH
|
||
|
-do
|
||
|
- IFS=$as_save_IFS
|
||
|
- test -z "$as_dir" && as_dir=.
|
||
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||
|
- ac_cv_prog_RONN="ronn"
|
||
|
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
|
- break 2
|
||
|
- fi
|
||
|
-done
|
||
|
- done
|
||
|
-IFS=$as_save_IFS
|
||
|
-
|
||
|
- test -z "$ac_cv_prog_RONN" && ac_cv_prog_RONN=":"
|
||
|
-fi
|
||
|
-fi
|
||
|
-RONN=$ac_cv_prog_RONN
|
||
|
-if test -n "$RONN"; then
|
||
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RONN" >&5
|
||
|
-$as_echo "$RONN" >&6; }
|
||
|
-else
|
||
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
|
-$as_echo "no" >&6; }
|
||
|
-fi
|
||
|
-
|
||
|
-
|
||
|
- if test "$ac_cv_prog_RONN" = ":"; then
|
||
|
- as_fn_error $? "You need the 'ronn' tool to generate the idn2.1 man page" "$LINENO" 5
|
||
|
- fi
|
||
|
- # Extract the first word of "makeinfo", so it can be a program name with args.
|
||
|
-set dummy makeinfo; ac_word=$2
|
||
|
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||
|
-$as_echo_n "checking for $ac_word... " >&6; }
|
||
|
-if ${ac_cv_prog_MAKEINFO+:} false; then :
|
||
|
- $as_echo_n "(cached) " >&6
|
||
|
-else
|
||
|
- if test -n "$MAKEINFO"; then
|
||
|
- ac_cv_prog_MAKEINFO="$MAKEINFO" # Let the user override the test.
|
||
|
-else
|
||
|
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||
|
-for as_dir in $PATH
|
||
|
-do
|
||
|
- IFS=$as_save_IFS
|
||
|
- test -z "$as_dir" && as_dir=.
|
||
|
- for ac_exec_ext in '' $ac_executable_extensions; do
|
||
|
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||
|
- ac_cv_prog_MAKEINFO="makeinfo"
|
||
|
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||
|
- break 2
|
||
|
- fi
|
||
|
-done
|
||
|
- done
|
||
|
-IFS=$as_save_IFS
|
||
|
-
|
||
|
- test -z "$ac_cv_prog_MAKEINFO" && ac_cv_prog_MAKEINFO=":"
|
||
|
-fi
|
||
|
-fi
|
||
|
-MAKEINFO=$ac_cv_prog_MAKEINFO
|
||
|
-if test -n "$MAKEINFO"; then
|
||
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MAKEINFO" >&5
|
||
|
-$as_echo "$MAKEINFO" >&6; }
|
||
|
-else
|
||
|
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||
|
-$as_echo "no" >&6; }
|
||
|
-fi
|
||
|
-
|
||
|
-
|
||
|
- if test "$ac_cv_prog_MAKEINFO" = ":"; then
|
||
|
- as_fn_error $? "You need the 'makeinfo' tool to generate the info pages" "$LINENO" 5
|
||
|
- fi
|
||
|
-fi
|
||
|
-
|
||
|
if test "$ac_cv_libunistring" = "yes";then
|
||
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing uc_joining_type" >&5
|
||
|
$as_echo_n "checking for library containing uc_joining_type... " >&6; }
|