diff options
author | ng0 <ng0@n0.is> | 2019-10-26 13:35:11 +0000 |
---|---|---|
committer | ng0 <ng0@n0.is> | 2019-10-26 13:35:11 +0000 |
commit | 6ea27c7f49a1368caae113d148b821fd22f380b7 (patch) | |
tree | 94c9cd0b8b1c21d9d1d773c1013ff82fa8369d44 | |
parent | 53a41cfd89b80ee6bfc6fa391fdbe7e683af314f (diff) | |
download | gnunet-6ea27c7f49a1368caae113d148b821fd22f380b7.tar.gz gnunet-6ea27c7f49a1368caae113d148b821fd22f380b7.zip |
configure: idn/idn2: indent, add msg
-rw-r--r-- | configure.ac | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index ecdf33b5a..82a94cd46 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1033,6 +1033,9 @@ LIBS=$SAVE_LIBS | |||
1033 | # if none exist, fail and message that libidn or libidn2 | 1033 | # if none exist, fail and message that libidn or libidn2 |
1034 | # is required with a preference for libidn2. | 1034 | # is required with a preference for libidn2. |
1035 | # TODO: What we have right here can probably be improved. | 1035 | # TODO: What we have right here can probably be improved. |
1036 | AC_MSG_CHECKING(for idn or idn2) | ||
1037 | |||
1038 | AC_MSG_CHECKING(for idn) | ||
1036 | my_with_libidn=1 | 1039 | my_with_libidn=1 |
1037 | AC_ARG_WITH(libidn, | 1040 | AC_ARG_WITH(libidn, |
1038 | AS_HELP_STRING([--with-libidn=pathname], | 1041 | AS_HELP_STRING([--with-libidn=pathname], |
@@ -1041,19 +1044,20 @@ AC_ARG_WITH(libidn, | |||
1041 | [withval="yes"]) | 1044 | [withval="yes"]) |
1042 | AS_IF([test x_$withval = x_yes], | 1045 | AS_IF([test x_$withval = x_yes], |
1043 | [AC_CHECK_HEADERS([idna.h], | 1046 | [AC_CHECK_HEADERS([idna.h], |
1044 | AC_MSG_NOTICE([Found idna.h]), | 1047 | AC_MSG_NOTICE([Found idna.h]), |
1045 | AC_CHECK_HEADERS([idn/idna.h], | 1048 | AC_CHECK_HEADERS([idn/idna.h], |
1046 | AC_MSG_NOTICE([Found idn/idna.h]), | 1049 | AC_MSG_NOTICE([Found idn/idna.h]), |
1047 | my_with_libidn=0))], | 1050 | my_with_libidn=0))], |
1048 | [AS_IF([test x_$withval != x_no], | 1051 | [AS_IF([test x_$withval != x_no], |
1049 | [CFLAGS="$CFLAGS -I$withval/include" | 1052 | [CFLAGS="$CFLAGS -I$withval/include" |
1050 | LDFLAGS="$LDFLAGS -L$withval/lib" | 1053 | LDFLAGS="$LDFLAGS -L$withval/lib" |
1051 | AC_CHECK_HEADERS([idna.h], | 1054 | AC_CHECK_HEADERS([idna.h], |
1052 | AC_MSG_NOTICE([Found idna.h]), | 1055 | AC_MSG_NOTICE([Found idna.h]), |
1053 | [AC_MSG_NOTICE([Failed to find idna.h]) | 1056 | [AC_MSG_NOTICE([Failed to find idna.h]) |
1054 | my_with_libidn=0])], | 1057 | my_with_libidn=0])], |
1055 | [my_with_libidn=0])]) | 1058 | [my_with_libidn=0])]) |
1056 | 1059 | ||
1060 | AC_MSG_CHECKING(for idn2) | ||
1057 | my_with_libidn2=1 | 1061 | my_with_libidn2=1 |
1058 | AC_ARG_WITH(libidn2, | 1062 | AC_ARG_WITH(libidn2, |
1059 | AS_HELP_STRING([--with-libidn2=pathname], | 1063 | AS_HELP_STRING([--with-libidn2=pathname], |
@@ -1062,15 +1066,15 @@ AC_ARG_WITH(libidn2, | |||
1062 | [withval="yes"]) | 1066 | [withval="yes"]) |
1063 | AS_IF([test x_$withval = x_yes], | 1067 | AS_IF([test x_$withval = x_yes], |
1064 | [AC_CHECK_HEADERS([idn2.h], | 1068 | [AC_CHECK_HEADERS([idn2.h], |
1065 | AC_MSG_NOTICE([Found idn2.h]), | 1069 | AC_MSG_NOTICE([Found idn2.h]), |
1066 | AC_CHECK_HEADERS([idn2/idn2.h], | 1070 | AC_CHECK_HEADERS([idn2/idn2.h], |
1067 | AC_MSG_NOTICE([Found idn2/idn2.h]), | 1071 | AC_MSG_NOTICE([Found idn2/idn2.h]), |
1068 | [AC_MSG_NOTICE([Failed to find idn2.h]) | 1072 | [AC_MSG_NOTICE([Failed to find idn2.h]) |
1069 | my_with_libidn2=0]))], | 1073 | my_with_libidn2=0]))], |
1070 | [AS_IF([test x_$withval != x_no], | 1074 | [AS_IF([test x_$withval != x_no], |
1071 | [CFLAGS="$CFLAGS -I$withval/include" | 1075 | [CFLAGS="$CFLAGS -I$withval/include" |
1072 | LDFLAGS="$LDFLAGS -L$withval/lib"], | 1076 | LDFLAGS="$LDFLAGS -L$withval/lib"], |
1073 | [my_with_libidn2=0])]) | 1077 | [my_with_libidn2=0])]) |
1074 | 1078 | ||
1075 | AC_MSG_CHECKING([if libidn can be used]) | 1079 | AC_MSG_CHECKING([if libidn can be used]) |
1076 | # Check for LIBIDNs | 1080 | # Check for LIBIDNs |