Mercurial > mxe-octave

changeset 3415:a70e260220fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gnutls.mk: Limit Windows-specific configure options to Windows builds.
author John W. Eaton <jwe@octave.org>
date Sun, 12 Jan 2014 17:10:25 -0500
parents 3d24cec05900
children 8ed872f9dbc7
files src/gnutls.mk
diffstat 1 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/gnutls.mk	Sun Jan 12 01:05:00 2014 -0500
+++ b/src/gnutls.mk	Sun Jan 12 17:10:25 2014 -0500
@@ -17,6 +17,17 @@
     head -1
 endef
 
+$(PKG)_WINDOWS_CONFIGURE_OPTIONS := \
+   CPPFLAGS='-DWINVER=0x0501 -DAI_ADDRCONFIG=0x0400 -DIPV6_V6ONLY=27' \
+   LIBS='-lws2_32'
+
+ifeq ($(MXE_SYSTEM),mingw)
+  $(PKG)_CONFIGURE_OPTIONS := $($(PKG)_WINDOWS_CONFIGURE_OPTIONS)
+endif
+ifeq ($(MXE_SYSTEM),msvc)
+  $(PKG)_CONFIGURE_OPTIONS := $($(PKG)_WINDOWS_CONFIGURE_OPTIONS)
+endif
+
 define $(PKG)_BUILD
     $(SED) -i 's, sed , $(SED) ,g' '$(1)/gl/tests/Makefile.am'
     cd '$(1)' && aclocal -I m4 -I gl/m4 -I src/libopts/m4 --install
@@ -43,8 +54,7 @@
         --with-included-libcfg \
         --without-p11-kit \
         --disable-silent-rules \
-        CPPFLAGS='-DWINVER=0x0501 -DAI_ADDRCONFIG=0x0400 -DIPV6_V6ONLY=27' \
-        LIBS='-lws2_32' \
+        $($(PKG)_CONFIGURE_OPTIONS) \
         ac_cv_prog_AR='$(MXE_AR)' && $(CONFIGURE_POST_HOOK)
 
     $(MAKE) -C '$(1)' -j '$(JOBS)' install DESTDIR='$(3)'