configure.ac (8bebafa9) configure.ac (9835bf0f)
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

--- 421 unchanged lines hidden (view full) ---

430[ --with-system-openssl Use OpenSSL already on system
431],,)
432AC_ARG_WITH(system-jpeg,
433[ --with-system-jpeg Use jpeg already on system
434],,)
435AC_ARG_WITH(system-expat,
436[ --with-system-expat Use expat already on system
437],,)
1dnl * *************************************************************
2dnl *
3dnl * Licensed to the Apache Software Foundation (ASF) under one
4dnl * or more contributor license agreements. See the NOTICE file
5dnl * distributed with this work for additional information
6dnl * regarding copyright ownership. The ASF licenses this file
7dnl * to you under the Apache License, Version 2.0 (the
8dnl * "License"); you may not use this file except in compliance

--- 421 unchanged lines hidden (view full) ---

430[ --with-system-openssl Use OpenSSL already on system
431],,)
432AC_ARG_WITH(system-jpeg,
433[ --with-system-jpeg Use jpeg already on system
434],,)
435AC_ARG_WITH(system-expat,
436[ --with-system-expat Use expat already on system
437],,)
438AC_ARG_WITH(system-libwpd,
439[ --with-system-libwpd Use libwpd already on system
440],,)
441AC_ARG_WITH(system-libxml,
442[ --with-system-libxml Use libxml already on system
443],,)
444AC_ARG_WITH(system-python,
445[ --with-system-python Use python already on system
446],,)
447AC_ARG_WITH(system-icu,
448[ --with-system-icu Use icu already on system

--- 961 unchanged lines hidden (view full) ---

1410 enable_saxon="yes"
1411 enable_javascript="yes"
1412 enable_graphite="yes"
1413 enable_coinmp="yes"
1414 enable_category_b_fonts="yes"
1415
1416 AC_MSG_RESULT([yes: allow modules nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp to be built])
1417else
438AC_ARG_WITH(system-libxml,
439[ --with-system-libxml Use libxml already on system
440],,)
441AC_ARG_WITH(system-python,
442[ --with-system-python Use python already on system
443],,)
444AC_ARG_WITH(system-icu,
445[ --with-system-icu Use icu already on system

--- 961 unchanged lines hidden (view full) ---

1407 enable_saxon="yes"
1408 enable_javascript="yes"
1409 enable_graphite="yes"
1410 enable_coinmp="yes"
1411 enable_category_b_fonts="yes"
1412
1413 AC_MSG_RESULT([yes: allow modules nss, hunspell, hyphen, saxon, rhino, beanshell, graphite, coinmp to be built])
1414else
1418 # Disable libaries.
1415 # Disable libraries.
1419 enable_nss_module="no"
1420 enable_hunspell="no"
1421 enable_hyphen="no"
1422 enable_saxon="no"
1423 enable_javascript="no"
1424 enable_graphite="no"
1425 enable_coinmp="no"
1426 enable_category_b_fonts="no"

--- 2335 unchanged lines hidden (view full) ---

3762else
3763 AC_MSG_RESULT([internal])
3764 SYSTEM_EXPAT=NO
3765 BUILD_TYPE="$BUILD_TYPE EXPAT"
3766fi
3767AC_SUBST(SYSTEM_EXPAT)
3768
3769dnl ===================================================================
1416 enable_nss_module="no"
1417 enable_hunspell="no"
1418 enable_hyphen="no"
1419 enable_saxon="no"
1420 enable_javascript="no"
1421 enable_graphite="no"
1422 enable_coinmp="no"
1423 enable_category_b_fonts="no"

--- 2335 unchanged lines hidden (view full) ---

3759else
3760 AC_MSG_RESULT([internal])
3761 SYSTEM_EXPAT=NO
3762 BUILD_TYPE="$BUILD_TYPE EXPAT"
3763fi
3764AC_SUBST(SYSTEM_EXPAT)
3765
3766dnl ===================================================================
3770dnl Check for system libwpd
3771dnl ===================================================================
3772AC_MSG_CHECKING([which libwpd to use])
3773if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
3774 test "$with_system_libwpd" != "no"; then
3775 AC_MSG_RESULT([external])
3776 SYSTEM_LIBWPD=YES
3777 PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 )
3778else
3779 AC_MSG_RESULT([no])
3780 SYSTEM_LIBWPD=
3781fi
3782AC_SUBST(SYSTEM_LIBWPD)
3783AC_SUBST(LIBWPD_CFLAGS)
3784AC_SUBST(LIBWPD_LIBS)
3785
3786dnl ===================================================================
3787dnl Check for system cppunit
3788dnl ===================================================================
3789WITH_CPPUNIT=
3790AC_MSG_CHECKING([which cppunit to use])
3791if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
3792 test "$with_system_cppunit" != "no"; then
3793 SYSTEM_CPPUNIT=YES
3794 # might work for earlier, too but go sure:

--- 3554 unchanged lines hidden ---
3767dnl Check for system cppunit
3768dnl ===================================================================
3769WITH_CPPUNIT=
3770AC_MSG_CHECKING([which cppunit to use])
3771if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
3772 test "$with_system_cppunit" != "no"; then
3773 SYSTEM_CPPUNIT=YES
3774 # might work for earlier, too but go sure:

--- 3554 unchanged lines hidden ---