[GNUnet-SVN] r32443 - in libmicrohttpd: . src/microhttpd

[gnunet]

Author: Karlson2k
Date: 2014-02-20 14:16:57 +0100 (Thu, 20 Feb 2014)
New Revision: 32443

Modified:
   libmicrohttpd/configure.ac
   libmicrohttpd/src/microhttpd/Makefile.am
Log:
create W32 static lib with MS lib.exe if available

Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2014-02-20 13:16:48 UTC (rev 32442)
+++ libmicrohttpd/configure.ac  2014-02-20 13:16:57 UTC (rev 32443)
@@ -206,6 +206,7 @@
 fi
 AM_CONDITIONAL(W32_SHARED_LIB_EXP, [test "x$w32_shared_lib_exp" = "xyes"])
 AM_CONDITIONAL(USE_MS_LIB_TOOL, [test "x$ac_cv_use_ms_lib_tool" = "xyes"])
+AM_CONDITIONAL(W32_STATIC_LIB, [test "x$os_is_native_w32" = "xyes"  && test 
"x$enable_static" = "xyes"])
 
 
 if test "$enable_epoll" = "yes"

Modified: libmicrohttpd/src/microhttpd/Makefile.am
===================================================================
--- libmicrohttpd/src/microhttpd/Makefile.am    2014-02-20 13:16:48 UTC (rev 
32442)
+++ libmicrohttpd/src/microhttpd/Makefile.am    2014-02-20 13:16:57 UTC (rev 
32443)
@@ -43,7 +43,19 @@
   W32_MHD_LIB_LDFLAGS =
 endif
 
+if W32_STATIC_LIB
+noinst_DATA += $(lt_cv_objdir)/libmicrohttpd-static.lib
+MOSTLYCLEANFILES += $(lt_cv_objdir)/libmicrohttpd-static.lib
 
+$(lt_cv_objdir)/libmicrohttpd-static.lib: libmicrohttpd.la 
$(libmicrohttpd_la_OBJECTS)
+if USE_MS_LIB_TOOL
+       $(MS_LIB_TOOL) -out:$@ $(libmicrohttpd_la_OBJECTS:.lo=.o)
+else
+       cp $(lt_cv_objdir)/libmicrohttpd.a $@
+endif
+endif
+
+
 libmicrohttpd_la_SOURCES = \
   connection.c connection.h \
   reason_phrase.c reason_phrase.h \