Mercurial > mxe-octave

changeset 3827:02990526ae69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
allow building of X11 libs to be disabled
author John W. Eaton <jwe@octave.org>
date Wed, 04 Mar 2015 09:27:23 -0500
parents 58d4bbcb30bc
children 8020defced38
files Makefile.in configure.ac src/default-octave.mk src/fltk.mk src/ghostscript.mk src/octave.mk src/stable-octave.mk
diffstat 7 files changed, 27 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.in	Tue Mar 03 14:03:53 2015 -0500
+++ b/Makefile.in	Wed Mar 04 09:27:23 2015 -0500
@@ -35,6 +35,10 @@
 # on your system (default is yes if doing native build). 
 USE_SYSTEM_FONTCONFIG := @USE_SYSTEM_FONTCONFIG@
 
+# Set to "yes" to use the X11 libraries already installed
+# on your system (default is yes if doing native build). 
+USE_SYSTEM_X11_LIBS := @USE_SYSTEM_X11_LIBS@
+
 # Build compiler for 64-bit Windows.  Using this option will build
 # binaries that require a 64-bit Windows system.
 ENABLE_WINDOWS_64 := @ENABLE_WINDOWS_64@
--- a/configure.ac	Tue Mar 03 14:03:53 2015 -0500
+++ b/configure.ac	Wed Mar 04 09:27:23 2015 -0500
@@ -117,6 +117,13 @@
   [if test "$enableval" = yes; then USE_SYSTEM_FONTCONFIG=yes; else USE_SYSTEM_FONTCONFIG=no; fi], [])
 AC_SUBST(USE_SYSTEM_FONTCONFIG)
 
+USE_SYSTEM_X11_LIBS=$MXE_NATIVE_BUILD
+AC_ARG_ENABLE([system-x11-libs],
+  [AS_HELP_STRING([--enable-system-x11-libs],
+    [Use X11 libraries already installed on system])],
+  [if test "$enableval" = yes; then USE_SYSTEM_X11_LIBS=yes; else USE_SYSTEM_X11_LIBS=no; fi], [])
+AC_SUBST(USE_SYSTEM_X11_LIBS)
+
 USE_SYSTEM_GCC=$MXE_NATIVE_BUILD
 AC_ARG_ENABLE([system-gcc],
   [AS_HELP_STRING([--enable-system-gcc],
--- a/src/default-octave.mk	Tue Mar 03 14:03:53 2015 -0500
+++ b/src/default-octave.mk	Wed Mar 04 09:27:23 2015 -0500
@@ -16,7 +16,9 @@
 endif
 $(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack libsndfile osmesa pcre portaudio pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
 ifeq ($(MXE_WINDOWS_BUILD),no)
-  $(PKG)_DEPS += x11 xext
+  ifeq ($(USE_SYSTEM_X11_LIBS),no)
+    $(PKG)_DEPS += x11 xext
+  endif
 endif
 ifeq ($(ENABLE_64),no)
   $(PKG)_DEPS += qhull
--- a/src/fltk.mk	Tue Mar 03 14:03:53 2015 -0500
+++ b/src/fltk.mk	Wed Mar 04 09:27:23 2015 -0500
@@ -14,7 +14,10 @@
 else ifeq ($(MXE_SYSTEM),msvc)
   $(PKG)_DEPS   += freetype
 else
-  $(PKG)_DEPS   += pthreads freetype x11 xext xrender xdmcp
+  $(PKG)_DEPS   += pthreads freetype
+  ifeq ($(USE_SYSTEM_X11_LIBS),no)
+    $(PKG)_DEPS += x11 xext xrender xdmcp
+  endif
 endif
 
 define $(PKG)_UPDATE
--- a/src/ghostscript.mk	Tue Mar 03 14:03:53 2015 -0500
+++ b/src/ghostscript.mk	Wed Mar 04 09:27:23 2015 -0500
@@ -10,7 +10,9 @@
 $(PKG)_URL      := http://downloads.ghostscript.com/public/$($(PKG)_FILE)
 $(PKG)_DEPS     := jpeg lcms libpng tiff zlib
 ifeq ($(MXE_WINDOWS_BUILD),no)
-  $(PKG)_DEPS += x11 xext
+  ifeq ($(USE_SYSTEM_X11_LIBS),no)
+    $(PKG)_DEPS += x11 xext
+  endif
 endif
 
 ifeq ($(MXE_NATIVE_MINGW_BUILD),yes)
--- a/src/octave.mk	Tue Mar 03 14:03:53 2015 -0500
+++ b/src/octave.mk	Wed Mar 04 09:27:23 2015 -0500
@@ -13,7 +13,9 @@
 endif
 $(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack osmesa pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
 ifeq ($(MXE_WINDOWS_BUILD),no)
-  $(PKG)_DEPS += x11 xext
+  ifeq ($(USE_SYSTEM_X11_LIBS),no)
+    $(PKG)_DEPS += x11 xext
+  endif
 endif
 ifeq ($(ENABLE_64),no)
   $(PKG)_DEPS += qhull
--- a/src/stable-octave.mk	Tue Mar 03 14:03:53 2015 -0500
+++ b/src/stable-octave.mk	Wed Mar 04 09:27:23 2015 -0500
@@ -13,7 +13,9 @@
 endif
 $(PKG)_DEPS     := blas arpack curl epstool fftw fltk $($(PKG)_FONTCONFIG) ghostscript gl2ps glpk gnuplot graphicsmagick hdf5 lapack osmesa pcre pstoedit qrupdate qscintilla qt readline suitesparse texinfo zlib
 ifeq ($(MXE_WINDOWS_BUILD),no)
-  $(PKG)_DEPS += x11 xext
+  ifeq ($(USE_SYSTEM_X11_LIBS),no)
+    $(PKG)_DEPS += x11 xext
+  endif
 endif
 ifeq ($(ENABLE_64),no)
   $(PKG)_DEPS += qhull