configure.ac (4975252c) configure.ac (974bb40a)
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

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

425[ --with-system-openssl Use OpenSSL already on system
426],,)
427AC_ARG_WITH(system-jpeg,
428[ --with-system-jpeg Use jpeg already on system
429],,)
430AC_ARG_WITH(system-expat,
431[ --with-system-expat Use expat already on system
432],,)
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

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

425[ --with-system-openssl Use OpenSSL already on system
426],,)
427AC_ARG_WITH(system-jpeg,
428[ --with-system-jpeg Use jpeg already on system
429],,)
430AC_ARG_WITH(system-expat,
431[ --with-system-expat Use expat already on system
432],,)
433AC_ARG_WITH(system-libwpd,
434[ --with-system-libwpd Use libwpd already on system
435],,)
436AC_ARG_WITH(system-libxml,
437[ --with-system-libxml Use libxml already on system
438],,)
439AC_ARG_WITH(system-python,
440[ --with-system-python Use python already on system
441],,)
442AC_ARG_WITH(system-icu,
443[ --with-system-icu Use icu already on system

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

3765else
3766 AC_MSG_RESULT([internal])
3767 SYSTEM_EXPAT=NO
3768 BUILD_TYPE="$BUILD_TYPE EXPAT"
3769fi
3770AC_SUBST(SYSTEM_EXPAT)
3771
3772dnl ===================================================================
433AC_ARG_WITH(system-libxml,
434[ --with-system-libxml Use libxml already on system
435],,)
436AC_ARG_WITH(system-python,
437[ --with-system-python Use python already on system
438],,)
439AC_ARG_WITH(system-icu,
440[ --with-system-icu Use icu already on system

--- 3321 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 ===================================================================
3773dnl Check for system libwpd
3774dnl ===================================================================
3775AC_MSG_CHECKING([which libwpd to use])
3776if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \
3777 test "$with_system_libwpd" != "no"; then
3778 AC_MSG_RESULT([external])
3779 SYSTEM_LIBWPD=YES
3780 PKG_CHECK_MODULES( LIBWPD, libwpd-0.8 )
3781else
3782 AC_MSG_RESULT([no])
3783 SYSTEM_LIBWPD=
3784fi
3785AC_SUBST(SYSTEM_LIBWPD)
3786AC_SUBST(LIBWPD_CFLAGS)
3787AC_SUBST(LIBWPD_LIBS)
3788
3789dnl ===================================================================
3790dnl Check for system cppunit
3791dnl ===================================================================
3792WITH_CPPUNIT=
3793AC_MSG_CHECKING([which cppunit to use])
3794if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \
3795 test "$with_system_cppunit" != "no"; then
3796 SYSTEM_CPPUNIT=YES
3797 # might work for earlier, too but go sure:

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

--- 3606 unchanged lines hidden ---