On Aug 7 13:56, Corinna Vinschen wrote:
> Hi,
>
> the below patch is more or less a proof of concept. It changes the
> mingw-w64-crt configury so that the internal headers from a parallel
> mingw-w64-headers directory are preferred and used if available.
>
> If you don't want that, specify --without-headers, which is the option
> used from top-level to disable building the header files at all.
>
> Please have a look.
>
>
> Thanks,
> Corinna
>
>
> * configure.ac: Add --without-headers option to disable building
> against parallel in-tree mingw-w64-headers headers.
> (_mingw_mac.h): Don't test existence if building with in-tree
> headers.
> * Makefile.am (local_headers): COnditionally add internal header
> paths.
> (sysincludes): Add local_headers.
Revised patch below.
Corinna
Index: configure.ac
===================================================================
--- configure.ac (revision 5352)
+++ configure.ac (working copy)
@@ -45,6 +45,19 @@
dnl ---
AM_PROG_CC_C_O
+AC_MSG_CHECKING([whether to use the local in-tree headers])
+AC_ARG_WITH([headers],
+ [AS_HELP_STRING([--without-headers],
+ [Do not use the in-tree mingw-w64 headers])],
+ [],
+ [with_headers=`test -d "${srcdir}/../mingw-w64-headers" && echo yes || echo
no`])
+AC_MSG_RESULT([$with_headers])
+AS_CASE([$with_headers],
+ [no],[],
+ [yes],[AS_VAR_SET([WITH_LOCAL_HEADERS])],
+ [AC_MSG_ERROR([invalid argument. Must be either yes or no.])])
+AM_CONDITIONAL([WITH_LOCAL_HEADERS], [AS_VAR_TEST_SET([WITH_LOCAL_HEADERS])])
+
AC_MSG_CHECKING([whether to build a w32api package for Cygwin])
AC_ARG_ENABLE([w32api],
[AS_HELP_STRING([--enable-w32api],
@@ -228,7 +241,11 @@
#AC_FUNC_VPRINTF
#AC_CHECK_FUNCS([alarm atexit btowc fesetround floor ftruncate gettimeofday
isascii localeconv mbrlen memmove memset pow rint setlocale sqrt strcasecmp
strchr strncasecmp strtoull strtoumax])
-AC_CHECK_HEADER([_mingw_mac.h], [], [AC_MSG_ERROR([Please check if the
mingw-w64 header set and the build/host option are set properly.])])
+AS_CASE([$with_headers],
+ [yes],[],
+ [AC_CHECK_HEADER([_mingw_mac.h],
+ [],
+ [AC_MSG_ERROR([Please check if the mingw-w64 header set and
the build/host option are set properly.])])])
#Warnings and errors, default level is 3
AC_MSG_CHECKING([for warning levels])
Index: Makefile.am
===================================================================
--- Makefile.am (revision 5352)
+++ Makefile.am (working copy)
@@ -12,11 +12,17 @@
#AUTOMAKE_OPTIONS = color-tests
+if WITH_LOCAL_HEADERS
+local_headers=-I$(abs_top_srcdir)/../mingw-w64-headers/crt
-I$(abs_top_srcdir)/../mingw-w64-headers/include
-I$(abs_builddir)/../mingw-w64-headers
-I$(abs_builddir)/../mingw-w64-headers/crt
+else
+local_headers=
+endif
+sysincludes=$(local_headers)
+
if WITHSYSROOT
- sysincludes=-I@TARGET_SYSTEM_ROOT@/include
+ sysincludes+=-I@TARGET_SYSTEM_ROOT@/include
withsys=--with-sysroot=@TARGET_SYSTEM_ROOT@
else
- sysincludes=
withsys=
endif
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Mingw-w64-public mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mingw-w64-public
