]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Remove _XOPEN_SOURCE from wide char detection.
authorDarren Tucker <dtucker@zip.com.au>
Fri, 3 Feb 2017 03:10:34 +0000 (14:10 +1100)
committerDarren Tucker <dtucker@zip.com.au>
Fri, 3 Feb 2017 03:10:34 +0000 (14:10 +1100)
Having _XOPEN_SOURCE unconditionally causes problems on some platforms
and configurations, notably Solaris 64-bit binaries.  It was there for
the benefit of Linux put the required bits in the *-*linux* section.

Patch from yvoinov at gmail.com.

configure.ac

index eb9f45dcc78cc8c0ef4c9e3bdeffa4175539326a..0911e7c81062b318483d01139b0d3ac35c94ef05 100644 (file)
@@ -740,6 +740,9 @@ main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
        use_pie=auto
        check_for_libcrypt_later=1
        check_for_openpty_ctty_bug=1
+       dnl Target SUSv3/POSIX.1-2001 plus BSD specifics.
+       dnl _DEFAULT_SOURCE is the new name for _BSD_SOURCE
+       CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -D_DEFAULT_SOURCE"
        AC_DEFINE([PAM_TTY_KLUDGE], [1],
                [Work around problematic Linux PAM modules handling of PAM_TTY])
        AC_DEFINE([LOCKED_PASSWD_PREFIX], ["!"],
@@ -1771,11 +1774,8 @@ AC_CHECK_FUNCS([ \
        warn \
 ])
 
-dnl Wide character support.  Linux man page says it needs _XOPEN_SOURCE.
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -D_XOPEN_SOURCE"
+dnl Wide character support.
 AC_CHECK_FUNCS([mblen mbtowc nl_langinfo wcwidth])
-CFLAGS="$saved_CFLAGS"
 
 TEST_SSH_UTF8=${TEST_SSH_UTF8:=yes}
 AC_MSG_CHECKING([for utf8 locale support])