mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-05 12:21:37 +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>
44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
diff --git a/xorg-macros.m4.in b/xorg-macros.m4.in
|
|
index f0a16da3a..e1c0ff1ed 100644
|
|
--- a/xorg-macros.m4.in
|
|
+++ b/xorg-macros.m4.in
|
|
@@ -63,38 +63,6 @@ AC_PATH_TOOL(RAWCPP, [cpp], [${CPP}],
|
|
# Check for flag to avoid builtin definitions - assumes unix is predefined,
|
|
# which is not the best choice for supporting other OS'es, but covers most
|
|
# of the ones we need for now.
|
|
-AC_MSG_CHECKING([if $RAWCPP requires -undef])
|
|
-AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp redefine unix ?]])])
|
|
-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
|
- AC_MSG_RESULT([no])
|
|
-else
|
|
- if test `${RAWCPP} -undef < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
|
- RAWCPPFLAGS=-undef
|
|
- AC_MSG_RESULT([yes])
|
|
- # under Cygwin unix is still defined even with -undef
|
|
- elif test `${RAWCPP} -undef -ansi < conftest.$ac_ext | grep -c 'unix'` -eq 1 ; then
|
|
- RAWCPPFLAGS="-undef -ansi"
|
|
- AC_MSG_RESULT([yes, with -ansi])
|
|
- else
|
|
- AC_MSG_ERROR([${RAWCPP} defines unix with or without -undef. I don't know what to do.])
|
|
- fi
|
|
-fi
|
|
-rm -f conftest.$ac_ext
|
|
-
|
|
-AC_MSG_CHECKING([if $RAWCPP requires -traditional])
|
|
-AC_LANG_CONFTEST([AC_LANG_SOURCE([[Does cpp preserve "whitespace"?]])])
|
|
-if test `${RAWCPP} < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
|
|
- AC_MSG_RESULT([no])
|
|
-else
|
|
- if test `${RAWCPP} -traditional < conftest.$ac_ext | grep -c 'preserve \"'` -eq 1 ; then
|
|
- TRADITIONALCPPFLAGS="-traditional"
|
|
- RAWCPPFLAGS="${RAWCPPFLAGS} -traditional"
|
|
- AC_MSG_RESULT([yes])
|
|
- else
|
|
- AC_MSG_ERROR([${RAWCPP} does not preserve whitespace with or without -traditional. I don't know what to do.])
|
|
- fi
|
|
-fi
|
|
-rm -f conftest.$ac_ext
|
|
AC_SUBST(RAWCPPFLAGS)
|
|
AC_SUBST(TRADITIONALCPPFLAGS)
|
|
]) # XORG_PROG_RAWCPP
|