mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 01:48:59 +08:00
552f1ee5f8
* first batch of xwindow PR ports - up to dbus * first batch of xwindow PR ports - up to dbus * format manifest * version stuff * remove if block * version stuff * fix xcb hash * fix xproto dependency on meson blocking cross builds * adjust message * use X11_xcb_LIB * version stuff * put xlib arm64-windows on baseline * fix dbus on osx and linux * version stuff * forget to set the value * fix --export-dynamic on osx * version dbus * ci-retrigger * add license (needs tool update) * version adjustments * version update * remove unnecessary comments * v db * Apply suggestions from code review Co-authored-by: Billy O'Neal <bion@microsoft.com> * nitpicks * rename xau to libxau * use vcpkg_install_copyright and silence usage * xtrans silence usage * format-manifest * v db * make license null for ports without exact match * xdmcp rename to libxdmcp * merge x11 wrapper into xlib rename xlib to libx11 to avoid a metaport * v db * missed dbus depending on x11. * v db * Update scripts/ci.baseline.txt Co-authored-by: LilyWangLL <94091114+LilyWangLL@users.noreply.github.com> Co-authored-by: Alexander Neumann <you@example.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com> Co-authored-by: Billy O'Neal <bion@microsoft.com>
48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
diff --git a/configure.ac b/configure.ac
|
|
index 8a05bf1aa..1f57cc688 100644
|
|
--- a/configure.ac
|
|
+++ b/configure.ac
|
|
@@ -22,6 +22,7 @@ AC_USE_SYSTEM_EXTENSIONS
|
|
# Initialize libtool
|
|
LT_PREREQ([2.2])
|
|
LT_INIT([win32-dll])
|
|
+AC_LIBTOOL_WIN32_DLL
|
|
|
|
# Require xorg-macros minimum of 1.18 - Initial version
|
|
m4_ifndef([XORG_MACROS_VERSION],
|
|
@@ -88,11 +88,11 @@ AC_MSG_RESULT($XCBPROTO_XCBPYTHONDIR)
|
|
AC_SUBST(XCBPROTO_XCBPYTHONDIR)
|
|
|
|
AC_HEADER_STDC
|
|
-AC_SEARCH_LIBS(getaddrinfo, socket)
|
|
-AC_SEARCH_LIBS(connect, socket)
|
|
+AC_SEARCH_LIBS(getaddrinfo, [socket Ws2_32])
|
|
+AC_SEARCH_LIBS(connect, [socket Ws2_32])
|
|
|
|
# Find support for sending a message from a socket
|
|
-AC_SEARCH_LIBS(sendmsg, socket, [have_sendmsg="yes"], [have_sendmsg="no"])
|
|
+AC_SEARCH_LIBS(sendmsg, [socket Ws2_32], [have_sendmsg="yes"], [have_sendmsg="no"])
|
|
|
|
# XPG4v2/UNIX95 added msg_control - check to see if we need to define
|
|
# _XOPEN_SOURCE to get it (such as on Solaris)
|
|
@@ -140,6 +141,10 @@ mingw*)
|
|
have_win32="yes"
|
|
lt_enable_auto_import="-Wl,--enable-auto-import"
|
|
;;
|
|
+msys*)
|
|
+ have_win32="yes"
|
|
+ lt_enable_auto_import="-Wl,--enable-auto-import"
|
|
+ ;;
|
|
linux*)
|
|
AC_DEFINE([HAVE_ABSTRACT_SOCKETS], 1, [Define if your platform supports abstract sockets])
|
|
;;
|
|
@@ -208,7 +213,7 @@ esac
|
|
|
|
dnl Link with winsock for socket functions on MinGW
|
|
case $host_os in
|
|
- *mingw*)
|
|
+ *mingw*| *msys* )
|
|
AC_CHECK_LIB([ws2_32],[main])
|
|
;;
|
|
*)
|