[libvirt] [PATCH] build: don't include winsock2.h on cygwin
Under cygwin, winsock2.h is intentionally incompatible with, <sys/socket.h>, and checking for existence is wrong. Under mingw, HAVE_WINSOCK2_H is defined on our behalf by gnulib, in a way that does not interfere with cygwin. * configure.ac: Drop unnecessary header check. Reported by Matthias Bolte. --- configure.ac | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/configure.ac b/configure.ac index 99bc906..deaa697 100644 --- a/configure.ac +++ b/configure.ac @@ -112,7 +112,8 @@ dnl Availability of various not common threadsafe functions AC_CHECK_FUNCS([strerror_r strtok_r getmntent_r getgrnam_r getpwuid_r]) dnl Availability of various common headers (non-fatal if missing). -AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h sys/wait.h winsock2.h sched.h termios.h sys/poll.h syslog.h mntent.h net/ethernet.h]) +AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h + sys/wait.h sched.h termios.h sys/poll.h syslog.h mntent.h net/ethernet.h]) dnl Where are the XDR functions? dnl If portablexdr is installed, prefer that. -- 1.6.6.1
2010/4/23 Eric Blake <eblake@redhat.com>:
Under cygwin, winsock2.h is intentionally incompatible with, <sys/socket.h>, and checking for existence is wrong.
Under mingw, HAVE_WINSOCK2_H is defined on our behalf by gnulib, in a way that does not interfere with cygwin.
* configure.ac: Drop unnecessary header check. Reported by Matthias Bolte. --- configure.ac | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/configure.ac b/configure.ac index 99bc906..deaa697 100644 --- a/configure.ac +++ b/configure.ac @@ -112,7 +112,8 @@ dnl Availability of various not common threadsafe functions AC_CHECK_FUNCS([strerror_r strtok_r getmntent_r getgrnam_r getpwuid_r])
dnl Availability of various common headers (non-fatal if missing). -AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h sys/wait.h winsock2.h sched.h termios.h sys/poll.h syslog.h mntent.h net/ethernet.h]) +AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h + sys/wait.h sched.h termios.h sys/poll.h syslog.h mntent.h net/ethernet.h])
dnl Where are the XDR functions? dnl If portablexdr is installed, prefer that. -- 1.6.6.1
ACK. Matthias
On 04/23/2010 11:02 AM, Matthias Bolte wrote:
* configure.ac: Drop unnecessary header check. Reported by Matthias Bolte. --- -AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h sys/wait.h winsock2.h sched.h termios.h sys/poll.h syslog.h mntent.h net/ethernet.h]) +AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h + sys/wait.h sched.h termios.h sys/poll.h syslog.h mntent.h net/ethernet.h])
dnl Where are the XDR functions? dnl If portablexdr is installed, prefer that. -- 1.6.6.1
ACK.
Thanks; pushed. -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
On 04/23/2010 11:12 AM, Eric Blake wrote:
On 04/23/2010 11:02 AM, Matthias Bolte wrote:
* configure.ac: Drop unnecessary header check. Reported by Matthias Bolte. --- -AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h sys/wait.h winsock2.h sched.h termios.h sys/poll.h syslog.h mntent.h net/ethernet.h]) +AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h + sys/wait.h sched.h termios.h sys/poll.h syslog.h mntent.h net/ethernet.h])
dnl Where are the XDR functions? dnl If portablexdr is installed, prefer that. -- 1.6.6.1
ACK.
Thanks; pushed.
Apologies for pushing the wrong version. I'm pushing this followup diff as obvious, to fix the syntax error I introduced :( diff --git i/configure.ac w/configure.ac index deaa697..1c54534 100644 --- i/configure.ac +++ w/configure.ac @@ -112,7 +112,7 @@ dnl Availability of various not common threadsafe functions AC_CHECK_FUNCS([strerror_r strtok_r getmntent_r getgrnam_r getpwuid_r]) dnl Availability of various common headers (non-fatal if missing). -AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h +AC_CHECK_HEADERS([pwd.h paths.h regex.h sys/syslimits.h sys/utsname.h \ sys/wait.h sched.h termios.h sys/poll.h syslog.h mntent.h net/ethernet.h]) dnl Where are the XDR functions? -- Eric Blake eblake@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
participants (2)
-
Eric Blake -
Matthias Bolte