diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-11-25 20:25:27 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-13 11:33:18 +0000 |
| commit | 482d7ce61b423600b41b459eb26a2cc221cd0acf (patch) | |
| tree | 8da6edb8200889d93f0b344e61ed779c037a590f /configure.ac | |
| parent | 178e38dd82a2cffb2db747c7be82ba7a48338968 (diff) | |
change from glew to epoxy
because that works under wayland out of the box and gtk3 uses it already
Change-Id: Iefaac31e325534a81a5389f752804af917c1baef
Reviewed-on: https://gerrit.libreoffice.org/31213
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 4a0dac756da6..18815ad59973 100644 --- a/configure.ac +++ b/configure.ac @@ -1627,6 +1627,11 @@ AC_ARG_WITH(system-cairo, [Use cairo libraries already on system. Happens automatically for (implicit) --enable-gtk and for --enable-gtk3.])) +AC_ARG_WITH(system-epoxy, + AS_HELP_STRING([--with-system-epoxy], + [Use epoxy libraries already on system. Happens automatically for + --enable-gtk3.])) + AC_ARG_WITH(myspell-dicts, AS_HELP_STRING([--with-myspell-dicts], [Adds myspell dictionaries to the LibreOffice installation set]), @@ -8921,14 +8926,6 @@ AC_SUBST([GLM_CFLAGS]) AC_SUBST([SYSTEM_GLM]) dnl =================================================================== -dnl Check for system glew -dnl =================================================================== -libo_CHECK_SYSTEM_MODULE([glew], [GLEW], [glew >= 1.10.0]) -AS_IF([test "$with_system_glew" = "yes"], - [PKG_CHECK_EXISTS([glew >= 1.12.0], [AC_DEFINE([HAVE_GLEW_1_12])])], - [AC_DEFINE([HAVE_GLEW_1_12])]) - -dnl =================================================================== dnl Check for system odbc dnl =================================================================== AC_MSG_CHECKING([which odbc headers to use]) @@ -10465,7 +10462,7 @@ if test "x$enable_gltf" != "xno" -a $_os != iOS -a $_os != Android -a "$ENABLE_H AC_DEFINE(HAVE_FEATURE_GLTF,1) if test "$with_system_libgltf" = "yes"; then SYSTEM_LIBGLTF=TRUE - PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.0 >= 0.0.1] ) + PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.1 >= 0.1.0] ) FilterLibs "${LIBGLTF_LIBS}" LIBGLTF_LIBS="${filteredlibs}" else @@ -11696,6 +11693,11 @@ AC_SUBST(CAIRO_CFLAGS) AC_SUBST(CAIRO_LIBS) dnl =================================================================== +dnl Check for system epoxy +dnl =================================================================== +libo_CHECK_SYSTEM_MODULE([epoxy], [EPOXY], [epoxy >= 1.3.1], ["-I${WORKDIR}/UnpackedTarball/epoxy/include"]) + +dnl =================================================================== dnl Test whether to use avahi dnl =================================================================== if test "$_os" = "WINNT"; then @@ -12854,7 +12856,6 @@ AC_CONFIG_HEADERS([config_host/config_locales.h]) AC_CONFIG_HEADERS([config_host/config_mpl.h]) AC_CONFIG_HEADERS([config_host/config_kde4.h]) AC_CONFIG_HEADERS([config_host/config_oox.h]) -AC_CONFIG_HEADERS([config_host/config_opengl.h]) AC_CONFIG_HEADERS([config_host/config_options.h]) AC_CONFIG_HEADERS([config_host/config_options_calc.h]) AC_CONFIG_HEADERS([config_host/config_test.h]) |