Attachment #478232 for bug #622814




        [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]),

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])

    AC_DEFINE(HAVE_FEATURE_GLTF,1)
    if test "$with_system_libgltf" = "yes"; then
        SYSTEM_LIBGLTF=TRUE
        PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.1 >= 0.1.0] )
        FilterLibs "${LIBGLTF_LIBS}"
        LIBGLTF_LIBS="${filteredlibs}"
    else

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

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])

Return to bug 622814

Lines 1627-1632 AC_ARG_WITH(system-cairo, Link Here

(-)a/configure.ac (-10 / +11 lines)
1627	[Use cairo libraries already on system. Happens automatically for	1627	[Use cairo libraries already on system. Happens automatically for
1628	(implicit) --enable-gtk and for --enable-gtk3.]))	1628	(implicit) --enable-gtk and for --enable-gtk3.]))
1629		1629
		1630	AC_ARG_WITH(system-epoxy,
		1631	AS_HELP_STRING([--with-system-epoxy],
		1632	[Use epoxy libraries already on system. Happens automatically for
		1633	--enable-gtk3.]))
		1634
1630	AC_ARG_WITH(myspell-dicts,	1635	AC_ARG_WITH(myspell-dicts,
1631	AS_HELP_STRING([--with-myspell-dicts],	1636	AS_HELP_STRING([--with-myspell-dicts],
1632	[Adds myspell dictionaries to the LibreOffice installation set]),	1637	[Adds myspell dictionaries to the LibreOffice installation set]),
Lines 8921-8934 AC_SUBST([GLM_CFLAGS]) Link Here
8921	AC_SUBST([SYSTEM_GLM])	8926	AC_SUBST([SYSTEM_GLM])
8922		8927
8923	dnl ===================================================================	8928	dnl ===================================================================
8924	dnl Check for system glew
8925	dnl ===================================================================
8926	libo_CHECK_SYSTEM_MODULE([glew], [GLEW], [glew >= 1.10.0])
8927	AS_IF([test "$with_system_glew" = "yes"],
8928	[PKG_CHECK_EXISTS([glew >= 1.12.0], [AC_DEFINE([HAVE_GLEW_1_12])])],
8929	[AC_DEFINE([HAVE_GLEW_1_12])])
8930
8931	dnl ===================================================================
8932	dnl Check for system odbc	8929	dnl Check for system odbc
8933	dnl ===================================================================	8930	dnl ===================================================================
8934	AC_MSG_CHECKING([which odbc headers to use])	8931	AC_MSG_CHECKING([which odbc headers to use])
Lines 10465-10471 if test "x$enable_gltf" != "xno" -a $_os != iOS -a $_os != Android -a "$ENABLE_H Link Here
10465	AC_DEFINE(HAVE_FEATURE_GLTF,1)	10462	AC_DEFINE(HAVE_FEATURE_GLTF,1)
10466	if test "$with_system_libgltf" = "yes"; then	10463	if test "$with_system_libgltf" = "yes"; then
10467	SYSTEM_LIBGLTF=TRUE	10464	SYSTEM_LIBGLTF=TRUE
10468	PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.0 >= 0.0.1] )	10465	PKG_CHECK_MODULES( LIBGLTF, [libgltf-0.1 >= 0.1.0] )
10469	FilterLibs "${LIBGLTF_LIBS}"	10466	FilterLibs "${LIBGLTF_LIBS}"
10470	LIBGLTF_LIBS="${filteredlibs}"	10467	LIBGLTF_LIBS="${filteredlibs}"
10471	else	10468	else
Lines 11696-11701 AC_SUBST(CAIRO_CFLAGS) Link Here
11696	AC_SUBST(CAIRO_LIBS)	11693	AC_SUBST(CAIRO_LIBS)
11697		11694
11698	dnl ===================================================================	11695	dnl ===================================================================
		11696	dnl Check for system epoxy
		11697	dnl ===================================================================
		11698	libo_CHECK_SYSTEM_MODULE([epoxy], [EPOXY], [epoxy >= 1.3.1], ["-I${WORKDIR}/UnpackedTarball/epoxy/include"])
		11699
		11700	dnl ===================================================================
11699	dnl Test whether to use avahi	11701	dnl Test whether to use avahi
11700	dnl ===================================================================	11702	dnl ===================================================================
11701	if test "$_os" = "WINNT"; then	11703	if test "$_os" = "WINNT"; then
Lines 12854-12860 AC_CONFIG_HEADERS([config_host/config_locales.h]) Link Here
12854	AC_CONFIG_HEADERS([config_host/config_mpl.h])	12856	AC_CONFIG_HEADERS([config_host/config_mpl.h])
12855	AC_CONFIG_HEADERS([config_host/config_kde4.h])	12857	AC_CONFIG_HEADERS([config_host/config_kde4.h])
12856	AC_CONFIG_HEADERS([config_host/config_oox.h])	12858	AC_CONFIG_HEADERS([config_host/config_oox.h])
12857	AC_CONFIG_HEADERS([config_host/config_opengl.h])
12858	AC_CONFIG_HEADERS([config_host/config_options.h])	12859	AC_CONFIG_HEADERS([config_host/config_options.h])
12859	AC_CONFIG_HEADERS([config_host/config_options_calc.h])	12860	AC_CONFIG_HEADERS([config_host/config_options_calc.h])
12860	AC_CONFIG_HEADERS([config_host/config_test.h])	12861	AC_CONFIG_HEADERS([config_host/config_test.h])