[GNUnet-SVN] r32488 - libmicrohttpd/src/microhttpd

[gnunet]

Author: Karlson2k
Date: 2014-02-26 18:55:49 +0100 (Wed, 26 Feb 2014)
New Revision: 32488

Modified:
   libmicrohttpd/src/microhttpd/Makefile.am
Log:
Fix W32 resource compile if '-isystem' flag is used in CPPFLAGS

Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am    2014-02-26 17:55:42 UTC (rev 
32487)
+++ libmicrohttpd/src/microhttpd/Makefile.am    2014-02-26 17:55:49 UTC (rev 
32488)
@@ -92,8 +92,11 @@
 # by empty object generated from empty c-file. Later libtool will
 # use .libs/file.o for shared lib and empty file.o for static lib.
 # This implementation is based on trick found in liblzma.
+# Note: windres does not understand '-isystem' flag, so all
+# possible '-isystem' flags are replaced by simple '-I' flags.
 $(MHD_DLL_RES_LO): $(MHD_DLL_RES_SRC)
-       $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(RC) $(RCFLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) $< -o $@ && \
+       RC_CPP_FLAGS=" $(DEFAULT_INCLUDES) $(INCLUDES) 
$(libmicrohttpd_la_CPPFLAGS) $(CPPFLAGS) " && \
+       $(LIBTOOL) $(AM_V_lt) --tag=RC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) 
--mode=compile $(RC) $(RCFLAGS) $(DEFS) $${RC_CPP_FLAGS// -isystem / -I } $< -o 
$@ && \
        echo > address@hidden && $(CC) $(AM_CFLAGS) $(CFLAGS) -c address@hidden 
-o $(@:.lo=.o) && rm -f address@hidden
 endif