summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure625
1 files changed, 567 insertions, 58 deletions
diff --git a/configure b/configure
index 8ba4664381db..4afd6e3777fe 100755
--- a/configure
+++ b/configure
@@ -665,6 +665,9 @@ ENABLE_EVOAB2
GOBJECT_LIBS
GOBJECT_CFLAGS
ENABLE_LOCKDOWN
+KDE4_LIBS
+KDE4_CFLAGS
+MOC4
KDE_LIBS
KDE_CFLAGS
MOC
@@ -716,9 +719,9 @@ GNOMEVFS_CFLAGS
ENABLE_GCONF
GCONF_LIBS
GCONF_CFLAGS
+ENABLE_KDE4
ENABLE_KDE
ENABLE_GTK
-WITH_GPC
ZIP_HOME
UNZIP
ZIP
@@ -773,6 +776,10 @@ X_LIBS
X_PRE_LIBS
X_CFLAGS
XMKMF
+SYSTEM_GRAPHITE
+ENABLE_GRAPHITE
+GRAPHITE_LIBS
+GRAPHITE_CFLAGS
SYSTEM_ICU
SYSTEM_GENCMN
SYSTEM_GENCCODE
@@ -784,6 +791,8 @@ MOZ_LIB
MOZ_INC
MOZ_FLAVOUR
SYSTEM_MOZILLA
+MOZILLABUILD
+ENABLE_NSS_MODULE
BUILD_MOZAB
MOZLIBREQ_LIBS
MOZLIBREQ_CFLAGS
@@ -884,6 +893,14 @@ HAVE_GCC_VISIBILITY_FEATURE
USE_SYSTEM_STL
STLPORT_VER
STLPORT4
+EXCEPTIONS
+MINGW_GXXDLL
+MINGW_GCCDLL
+MINGW_SHARED_GXXLIB
+MINGW_GCCLIB_EH
+MINGW_SHARED_GCCLIB
+MINGW_CLIB_DIR
+MINGW_BACKWARD_INCLUDE_PATH
MINGW_LIB_INCLUDE_PATH
GXX_INCLUDE_PATH
CRYPT_LINK
@@ -1014,7 +1031,8 @@ enable_option_checking
with_gnu_patch
with_agg
with_gnu_cp
-with_gpc
+enable_graphite
+with_system_graphite
enable_ldap
with_openldap
enable_lockdown
@@ -1062,8 +1080,10 @@ enable_layout
enable_build_mozilla
with_mozilla_version
with_mozilla_toolkit
+enable_nss_module
enable_kde
enable_kdeab
+enable_kde4
enable_binfilter
enable_rpath
enable_pam
@@ -1152,6 +1172,7 @@ with_nsis_path
with_frame_home
with_psdk_home
with_directx_home
+with_mozilla_build
with_local_solenv
with_local_solver
enable_check_only
@@ -1817,6 +1838,8 @@ Optional Features:
--disable-option-checking ignore unrecognized --enable/--with options
--disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
+ --enable-graphite Enables the compilation of Graphite smart font rendering
+
--disable-ldap Disables the use of LDAP backend via Netscape/Mozilla
or OpenLDAP LDAP SDK
@@ -1935,11 +1958,17 @@ Optional Features:
mozilla components from the mozilla source code but
take precompiled zips
+ --disable-nss-module Whether to use provided NSS module
+
--enable-kde Determines whether to use Qt/KDE vclplug on platforms
where Qt and KDE are available.
--disable-kdeab Disable the KDE address book support
+ --enable-kde4 Determines whether to use Qt4/KDE4 vclplug on platforms
+ where Qt4 and KDE4 are available. May be used with --enable-kde
+ if you want to support both KDE3 and KDE4.
+
--disable-binfilter Disable legacy binary file formats filters
--disable-rpath Disable the use of relative paths in shared libraries
@@ -2005,8 +2034,7 @@ Optional Packages:
--with-gnu-cp Specify location of GNU cp on Solaris or FreeBSD
- --without-gpc Use the internal polygon clipping code instead of
- the external GPC polygon clipping library.
+ --with-system-graphite use graphite library already installed on system
--with-openldap Enables the use of the OpenLDAP LDAP SDK instead
of the Netscape/Mozilla one
@@ -2272,6 +2300,11 @@ Optional Packages:
Usage: --with-directx-home=<absolute path to Microsoft DirectX SDK>
+ --with-mozilla-build For Windows users, please supply the path to the
+ mozilla build tools.
+
+ Usage: --with-mozilla-build=<absolute path to mozilla build tools>
+
--with-local-solenv If you have solenv in a location other than ./solenv,
please supply the path here.
@@ -2846,12 +2879,15 @@ if test "${with_gnu_cp+set}" = set; then
withval=$with_gnu_cp;
fi
+# Check whether --enable-graphite was given.
+if test "${enable_graphite+set}" = set; then
+ enableval=$enable_graphite;
+fi
-# Check whether --with-gpc was given.
-if test "${with_gpc+set}" = set; then
- withval=$with_gpc;
-else
- if test ! -e ./external/gpc/gpc.c && test ! -e ./external/gpc/gpc.h; then without_gpc=yes; fi
+
+# Check whether --with-system-graphite was given.
+if test "${with_system_graphite+set}" = set; then
+ withval=$with_system_graphite;
fi
# Check whether --enable-ldap was given.
@@ -3141,6 +3177,13 @@ if test "${with_mozilla_toolkit+set}" = set; then
withval=$with_mozilla_toolkit;
fi
+# Check whether --enable-nss_module was given.
+if test "${enable_nss_module+set}" = set; then
+ enableval=$enable_nss_module;
+else
+ enable_nss_module=yes
+fi
+
# Check whether --enable-kde was given.
if test "${enable_kde+set}" = set; then
enableval=$enable_kde;
@@ -3153,6 +3196,11 @@ else
if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi
fi
+# Check whether --enable-kde4 was given.
+if test "${enable_kde4+set}" = set; then
+ enableval=$enable_kde4;
+fi
+
# Check whether --enable-binfilter was given.
if test "${enable_binfilter+set}" = set; then
enableval=$enable_binfilter;
@@ -3708,6 +3756,12 @@ if test "${with_directx_home+set}" = set; then
fi
+# Check whether --with-mozilla-build was given.
+if test "${with_mozilla_build+set}" = set; then
+ withval=$with_mozilla_build; MOZILLABUILD=$withval
+fi
+
+
# Check whether --with-local-solenv was given.
if test "${with_local_solenv+set}" = set; then
withval=$with_local_solenv;
@@ -4422,6 +4476,7 @@ $as_echo "$as_me: error: only sparc and i386 processors are supported" >&2;}
test_gtk=yes
test_cairo=yes
test_kde=yes
+ test_kde4=yes
test_cups=yes
test_randr=yes
test_freetype=yes
@@ -4466,6 +4521,7 @@ $as_echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Us
test_gtk=yes
test_cairo=yes
test_kde=yes
+ test_kde4=yes
test_cups=yes
test_randr=yes
test_freetype=yes
@@ -4503,6 +4559,7 @@ $as_echo "$PTHREAD_LIBS" >&6; }
test_gtk=yes
test_cairo=yes
test_kde=yes
+ test_kde4=yes
test_cups=no
test_randr=yes
test_freetype=yes
@@ -10717,6 +10774,10 @@ $as_echo_n "checking for g++ include path... " >&6; }
with_gxx_include_path=`cygpath -d "$with_gxx_include_path"`
with_gxx_include_path=`cygpath -u "$with_gxx_include_path"`
fi
+ if echo $with_gxx_include_path | grep -q linux; then
+ # workaround for Mandriva - issue 100049
+ with_gxx_include_path=`cd $with_gxx_include_path && pwd`
+ fi
fi
fi
if test -z "$with_gxx_include_path"; then
@@ -10756,7 +10817,76 @@ $as_echo "no mingwin runtime includes" >&6; }
{ $as_echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5
$as_echo "$_mingw_lib_include_path" >&6; }
fi
-MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path"
+ MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path"
+
+ { $as_echo "$as_me:$LINENO: checking for mingwin c++ backward include path" >&5
+$as_echo_n "checking for mingwin c++ backward include path... " >&6; }
+ cat >conftest.$ac_ext <<_ACEOF
+#include <hash_set>
+_ACEOF
+ _mingw_backward_include_path=`$CXX -E -xc++ -Wno-deprecated conftest.$ac_ext 2>&5| $SED -n -e '/.*1*"\(.*\)\/hash_set".*/s//\1/p' | sort -u | xargs echo`
+ rm conftest.$ac_ext
+ if test -n "$_mingw_backward_include_path"; then
+ _mingw_backward_include_path=`cygpath -d $_mingw_backward_include_path`
+ _mingw_backward_include_path=`cygpath -u $_mingw_backward_include_path`
+ { $as_echo "$as_me:$LINENO: result: $_mingw_backward_include_path" >&5
+$as_echo "$_mingw_backward_include_path" >&6; }
+ else
+ _mingw_backward_include_path="NO_BACKWARD_INCLUDE"
+ { $as_echo "$as_me:$LINENO: result: no mingwin c++ backward includes" >&5
+$as_echo "no mingwin c++ backward includes" >&6; }
+ fi
+ MINGW_BACKWARD_INCLUDE_PATH="$_mingw_backward_include_path"
+
+ mingw_crtbegin=`$CC -print-file-name=crtbegin.o`
+ MINGW_CLIB_DIR=`dirname $mingw_crtbegin`
+ { $as_echo "$as_me:$LINENO: checking whether to use dynamic libgcc" >&5
+$as_echo_n "checking whether to use dynamic libgcc... " >&6; }
+ if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then
+ { $as_echo "$as_me:$LINENO: checking dynamic libgcc name" >&5
+$as_echo_n "checking dynamic libgcc name... " >&6; }
+ MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'`
+ MINGW_GCCDLL=`cd $COMPATH && ls $MINGW_GCCDLL_pattern 2>/dev/null`
+ if test -n "$MINGW_GCCDLL"; then
+ MINGW_SHARED_GCCLIB=YES
+ { $as_echo "$as_me:$LINENO: result: use $MINGW_GCCDLL" >&5
+$as_echo "use $MINGW_GCCDLL" >&6; }
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ if test -e "$MINGW_CLIB_DIR/libgcc_eh.a"; then
+ MINGW_GCCLIB_EH=YES
+ fi
+ { $as_echo "$as_me:$LINENO: checking whether to use dynamic libstdc++" >&5
+$as_echo_n "checking whether to use dynamic libstdc++... " >&6; }
+ if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then
+ { $as_echo "$as_me:$LINENO: checking dynamic libstdc++ name" >&5
+$as_echo_n "checking dynamic libstdc++ name... " >&6; }
+ MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'`
+ MINGW_GXXDLL=`cd $COMPATH && ls $MINGW_GXXDLL_pattern 2>/dev/null`
+ if test -n "$MINGW_GXXDLL"; then
+ MINGW_SHARED_GXXLIB=YES
+ { $as_echo "$as_me:$LINENO: result: use $MINGW_GXXDLL" >&5
+$as_echo "use $MINGW_GXXDLL" >&6; }
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+ fi
+ MINGW_CLIB_DIR=`cygpath $MINGW_CLIB_DIR`
+
+
+
+
+
fi
@@ -10817,6 +10947,81 @@ $as_echo "checked" >&6; }
fi
fi
+{ $as_echo "$as_me:$LINENO: checking exception type" >&5
+$as_echo_n "checking exception type... " >&6; }
+ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+
+if test "$WITH_MINGWIN" = "yes"; then
+
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+#include <iostream>
+
+extern "C" void _Unwind_SjLj_RaiseException(void) __attribute__ ((__noreturn__));
+
+
+int
+main ()
+{
+_Unwind_SjLj_RaiseException()
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
+$as_echo "$ac_try_echo") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext && {
+ test "$cross_compiling" = yes ||
+ $as_test_x conftest$ac_exeext
+ }; then
+ exceptions_type="sjlj"
+else
+ $as_echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ exceptions_type="dwarf2"
+
+fi
+
+rm -rf conftest.dSYM
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+
+{ $as_echo "$as_me:$LINENO: result: $exceptions_type" >&5
+$as_echo "$exceptions_type" >&6; }
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+EXCEPTIONS="$exceptions_type"
+
+
if test "$_os" = "SunOS"; then
_temp=`showrev -p | $AWK -F" " '{ print $2 }'`
if test "$_os_release" = "7"; then
@@ -11188,8 +11393,7 @@ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex
ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-cat >conftest.$ac_ext <<_ACEOF
+ cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
@@ -17046,6 +17250,7 @@ if test "$enable_mozilla" = "no"; then
{ $as_echo "$as_me:$LINENO: result: no" >&5
$as_echo "no" >&6; }
WITH_MOZILLA=NO
+ ENABLE_NSS_MODULE=NO
else
{ $as_echo "$as_me:$LINENO: result: yes" >&5
$as_echo "yes" >&6; }
@@ -17428,6 +17633,8 @@ if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then
{ $as_echo "$as_me:$LINENO: result: external" >&5
$as_echo "external" >&6; }
SYSTEM_MOZILLA=YES
+ ENABLE_NSS_MODULE=NO
+ enable_nss_module=no
{ $as_echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5
$as_echo_n "checking which Mozilla flavour to use... " >&6; }
if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then
@@ -18186,6 +18393,8 @@ elif test "$enable_mozilla" = "no"; then
{ $as_echo "$as_me:$LINENO: result: none" >&5
$as_echo "none" >&6; }
WITH_MOZILLA=NO
+ ENABLE_NSS_MODULE=NO
+ enable_nss_module=no
else
{ $as_echo "$as_me:$LINENO: result: internal" >&5
$as_echo "internal" >&6; }
@@ -18251,6 +18460,49 @@ else
$as_echo "no" >&6; }
fi
+{ $as_echo "$as_me:$LINENO: checking whether to build provided NSS module" >&5
+$as_echo_n "checking whether to build provided NSS module... " >&6; }
+if test "$enable_nss_module" != "no"; then
+ ENABLE_NSS_MODULE="YES"
+ BUILD_TYPE="$BUILD_TYPE NSS"
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ if test "$_os" = "WINNT"; then
+ { $as_echo "$as_me:$LINENO: checking for Mozilla build tooling" >&5
+$as_echo_n "checking for Mozilla build tooling... " >&6; }
+ if test -z "$MOZILLABUILD" ; then
+{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling not found. Use --with-mozilla-build=<absolut path to mozilla build tooling (mozilla-build)>" >&5
+$as_echo "$as_me: error: Mozilla build tooling not found. Use --with-mozilla-build=<absolut path to mozilla build tooling (mozilla-build)>" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ if test \( "$WITH_MINGWIN" = "yes" \) ; then
+ if test ! -d "$MOZILLABUILD" ; then
+{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5
+$as_echo "$as_me: error: Mozilla build tooling incomplete!" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
+ fi
+ else
+ if test ! -d "$MOZILLABUILD/moztools" \
+ -o ! -d "$MOZILLABUILD/msys" ; then
+{ { $as_echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5
+$as_echo "$as_me: error: Mozilla build tooling incomplete!" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ { $as_echo "$as_me:$LINENO: result: ok" >&5
+$as_echo "ok" >&6; }
+ fi
+ fi
+ fi
+ fi
+else
+ ENABLE_NSS_MODULE="NO"
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
if test "$BUILD_MOZAB" = "TRUE"; then
if test "$_os" = "WINNT"; then
if test "$WITH_MINGWIN" != "yes"; then
@@ -18944,6 +19196,8 @@ fi
+
+
{ $as_echo "$as_me:$LINENO: checking which sane header to use" >&5
$as_echo_n "checking which sane header to use... " >&6; }
if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \
@@ -19370,6 +19624,144 @@ fi
+{ $as_echo "$as_me:$LINENO: checking whether to enable graphite support" >&5
+$as_echo_n "checking whether to enable graphite support... " >&6; }
+if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" == "z" -o "$enable_graphite" != "no" ; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ ENABLE_GRAPHITE="TRUE"
+ { $as_echo "$as_me:$LINENO: checking which graphite to use" >&5
+$as_echo_n "checking which graphite to use... " >&6; }
+ if test -n "$with_system_graphite" -o -n "$with_system_libs" && \
+ test "$with_system_graphite" != "no"; then
+ { $as_echo "$as_me:$LINENO: result: external" >&5
+$as_echo "external" >&6; }
+ SYSTEM_GRAPHITE=YES
+
+ succeeded=no
+
+ if test -z "$PKG_CONFIG"; then
+ # Extract the first word of "pkg-config", so it can be a program name with args.
+set dummy pkg-config; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ case $PKG_CONFIG in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
+ ;;
+esac
+fi
+PKG_CONFIG=$ac_cv_path_PKG_CONFIG
+if test -n "$PKG_CONFIG"; then
+ { $as_echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
+$as_echo "$PKG_CONFIG" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ fi
+
+ if test "$PKG_CONFIG" = "no" ; then
+ echo "*** The pkg-config script could not be found. Make sure it is"
+ echo "*** in your path, or set the PKG_CONFIG environment variable"
+ echo "*** to the full path to pkg-config."
+ echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+ else
+ PKG_CONFIG_MIN_VERSION=0.9.0
+ if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
+ { $as_echo "$as_me:$LINENO: checking for silgraphite " >&5
+$as_echo_n "checking for silgraphite ... " >&6; }
+
+ if $PKG_CONFIG --exists "silgraphite " ; then
+ { $as_echo "$as_me:$LINENO: result: yes" >&5
+$as_echo "yes" >&6; }
+ succeeded=yes
+
+ { $as_echo "$as_me:$LINENO: checking GRAPHITE_CFLAGS" >&5
+$as_echo_n "checking GRAPHITE_CFLAGS... " >&6; }
+ GRAPHITE_CFLAGS=`$PKG_CONFIG --cflags "silgraphite "`
+ { $as_echo "$as_me:$LINENO: result: $GRAPHITE_CFLAGS" >&5
+$as_echo "$GRAPHITE_CFLAGS" >&6; }
+
+ { $as_echo "$as_me:$LINENO: checking GRAPHITE_LIBS" >&5
+$as_echo_n "checking GRAPHITE_LIBS... " >&6; }
+ GRAPHITE_LIBS=`$PKG_CONFIG --libs "silgraphite "`
+ { $as_echo "$as_me:$LINENO: result: $GRAPHITE_LIBS" >&5
+$as_echo "$GRAPHITE_LIBS" >&6; }
+ else
+ GRAPHITE_CFLAGS=""
+ GRAPHITE_LIBS=""
+ ## If we have a custom action on failure, don't print errors, but
+ ## do set a variable so people can do so.
+ GRAPHITE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "silgraphite "`
+ echo $GRAPHITE_PKG_ERRORS
+ fi
+
+
+
+ else
+ echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
+ echo "*** See http://www.freedesktop.org/software/pkgconfig"
+ fi
+ fi
+
+ if test $succeeded = yes; then
+ :
+ else
+ { { $as_echo "$as_me:$LINENO: error: Library requirements (silgraphite ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+$as_echo "$as_me: error: Library requirements (silgraphite ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ { $as_echo "$as_me:$LINENO: checking STL compatibility" >&5
+$as_echo_n "checking STL compatibility... " >&6; }
+ if test "$WITH_STLPORT" != "no"; then
+ { { $as_echo "$as_me:$LINENO: error: to use system graphite you need to use --without-stlport" >&5
+$as_echo "$as_me: error: to use system graphite you need to use --without-stlport" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+ { $as_echo "$as_me:$LINENO: result: OK" >&5
+$as_echo "OK" >&6; }
+ fi
+ else
+ { $as_echo "$as_me:$LINENO: result: internal" >&5
+$as_echo "internal" >&6; }
+ SYSTEM_GRAPHITE=NO
+ BUILD_TYPE="$BUILD_TYPE GRAPHITE"
+ fi
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+
+
+
+
if test "$_os" = "Darwin"; then
if test "x$with_x" = "xyes"; then
{ { $as_echo "$as_me:$LINENO: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&5
@@ -24896,46 +25288,6 @@ $as_echo "found and copied" >&6; }
fi
fi
-{ $as_echo "$as_me:$LINENO: checking which polygon clipping code to use" >&5
-$as_echo_n "checking which polygon clipping code to use... " >&6; }
-WITH_GPC=NO
-
-if test "$with_gpc" != "no" && test "$without_gpc" != "yes"; then
- WITH_GPC=YES
- { $as_echo "$as_me:$LINENO: result: GPC" >&5
-$as_echo "GPC" >&6; }
-
- { $as_echo "$as_me:$LINENO: checking for GPC files" >&5
-$as_echo_n "checking for GPC files... " >&6; }
- if test -f ./external/gpc/gpc.h; then
- HAVE_GPC_H="yes"
- else
- HAVE_GPC_H="no"
- fi
- if test -f ./external/gpc/gpc.c; then
- HAVE_GPC_C="yes"
- else
- HAVE_GPC_C="no"
- fi
-
- if test "$HAVE_GPC_H" = "yes" -a "$HAVE_GPC_C" = "yes"; then
- { $as_echo "$as_me:$LINENO: result: GPC files found" >&5
-$as_echo "GPC files found" >&6; }
- else
- { { $as_echo "$as_me:$LINENO: error: GPC files not found
-ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc,
-or use basegfx' implementation using --without-gpc" >&5
-$as_echo "$as_me: error: GPC files not found
-ftp://ftp.cs.man.ac.uk/pub/toby/gpc/gpc231.tar.Z and untar in external/gpc,
-or use basegfx' implementation using --without-gpc" >&2;}
- { (exit 1); exit 1; }; }
- fi
-else
- { $as_echo "$as_me:$LINENO: result: internal" >&5
-$as_echo "internal" >&6; }
-fi
-
-
{ $as_echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5
$as_echo_n "checking which VCLplugs shall be built... " >&6; }
ENABLE_GTK=""
@@ -24952,6 +25304,13 @@ if test "x$enable_kde" = "xyes"; then
fi
+ENABLE_KDE4=""
+if test "x$enable_kde4" = "xyes"; then
+ ENABLE_KDE4="TRUE"
+ R="$R kde4"
+fi
+
+
if test -z "$R"; then
{ $as_echo "$as_me:$LINENO: result: none" >&5
$as_echo "none" >&6; }
@@ -27525,11 +27884,11 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then
fi
fi
if test "$build_cpu" != "x86_64" ; then
- kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes"
- kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
+ kde_incdirs="/usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
+ kde_libdirs="/usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib $x_libraries"
else
- kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /usr/include /opt/kde3/include /opt/kde/include $x_includes"
- kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/lib64 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib $x_libraries"
+ kde_incdirs="/usr/lib64/kde/include /usr/lib/kde/include /usr/local/kde/include /usr/local/include /usr/kde/include /usr/include/kde /opt/kde3/include /opt/kde/include $x_includes"
+ kde_libdirs="/usr/lib64/kde/lib64 /usr/local/kde/lib64 /usr/kde/lib64 /usr/lib64/kde /usr/lib64/kde3 /usr/X11R6/lib64 /usr/local/lib64 /opt/kde3/lib64 /opt/kde/lib64 /usr/X11R6/kde/lib64 /usr/lib/kde/lib /usr/local/kde/lib /usr/kde/lib /usr/lib/kde /usr/lib/kde3 /usr/lib /usr/X11R6/lib /usr/local/lib /opt/kde3/lib /opt/kde/lib /usr/X11R6/kde/lib /usr/lib64 $x_libraries"
fi
if test -n "$KDEDIR" ; then
kde_incdirs="$KDEDIR/include $kde_incdirs"
@@ -27583,7 +27942,7 @@ your Qt installation by exporting QTDIR before running \"configure\"." >&2;}
{ (exit 1); exit 1; }; }
fi
- # Extract the first word of "moc", so it can be a program name with args.
+ # Extract the first word of "moc", so it can be a program name with args.
set dummy moc; ac_word=$2
{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
$as_echo_n "checking for $ac_word... " >&6; }
@@ -27631,7 +27990,7 @@ the root of your Qt installation by exporting QTDIR before running \"configure\"
$as_echo "$as_me: error: Qt Meta Object Compiler not found. Please specify
the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;}
{ (exit 1); exit 1; }; }
- fi
+ fi
{ $as_echo "$as_me:$LINENO: checking for KDE headers" >&5
$as_echo_n "checking for KDE headers... " >&6; }
@@ -27678,6 +28037,156 @@ fi
+
+KDE4_CFLAGS=""
+KDE4_LIBS=""
+MOC4="moc"
+if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then
+ qt_incdirs="$QTINC $QTDIR /usr/include/qt4 /usr/include $x_includes"
+ qt_libdirs="$QTLIB /usr/lib $x_libraries"
+
+ kde_incdirs="/usr/include $x_includes"
+ kde_libdirs="/usr/lib $x_libraries"
+
+ if test "$build_cpu" == "x86_64" ; then
+ qt_libdirs="$qt_libdirs /usr/lib64/qt4 /usr/lib64/qt /usr/lib64"
+ kde_libdirs="$kde_libdirs /usr/lib64 /usr/lib64/kde4"
+ fi
+
+ qt_test_include="Qt/qobject.h"
+ qt_test_library="libQtCore.so"
+ kde_test_include="ksharedptr.h"
+ kde_test_library="libkdeui.so"
+
+ { $as_echo "$as_me:$LINENO: checking for Qt4 headers" >&5
+$as_echo_n "checking for Qt4 headers... " >&6; }
+ qt_header_dir="no"
+ for inc_dir in $qt_incdirs ; do
+ if test -r "$inc_dir/$qt_test_include" ; then
+ qt_header_dir="$inc_dir"
+ break
+ fi
+ done
+
+ { $as_echo "$as_me:$LINENO: result: $qt_header_dir" >&5
+$as_echo "$qt_header_dir" >&6; }
+ if test "x$qt_header_dir" = "xno" ; then
+ { { $as_echo "$as_me:$LINENO: error: Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&5
+$as_echo "$as_me: error: Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ { $as_echo "$as_me:$LINENO: checking for Qt4 libraries" >&5
+$as_echo_n "checking for Qt4 libraries... " >&6; }
+ qt_lib_dir="no"
+ for lib_dir in $qt_libdirs ; do
+ if test -r "$lib_dir/$qt_test_library" ; then
+ qt_lib_dir="$lib_dir"
+ break
+ fi
+ done
+
+ { $as_echo "$as_me:$LINENO: result: $qt_lib_dir" >&5
+$as_echo "$qt_lib_dir" >&6; }
+
+ if test "x$qt_lib_dir" = "xno" ; then
+ { { $as_echo "$as_me:$LINENO: error: Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&5
+$as_echo "$as_me: error: Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QTDIR before running \"configure\"." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ # Extract the first word of "moc", so it can be a program name with args.
+set dummy moc; ac_word=$2
+{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if test "${ac_cv_path_MOC4+set}" = set; then
+ $as_echo_n "(cached) " >&6
+else
+ case $MOC4 in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_MOC4="$MOC4" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+as_dummy="$PATH:$QTDIR/bin "
+for as_dir in $as_dummy
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_MOC4="$as_dir/$ac_word$ac_exec_ext"
+ $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_MOC4" && ac_cv_path_MOC4="no"
+ ;;
+esac
+fi
+MOC4=$ac_cv_path_MOC4
+if test -n "$MOC4"; then
+ { $as_echo "$as_me:$LINENO: result: $MOC4" >&5
+$as_echo "$MOC4" >&6; }
+else
+ { $as_echo "$as_me:$LINENO: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+ if test "$MOC4" = "no" ; then
+ { { $as_echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found. Please specify
+the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5
+$as_echo "$as_me: error: Qt Meta Object Compiler not found. Please specify
+the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ { $as_echo "$as_me:$LINENO: checking for KDE4 headers" >&5
+$as_echo_n "checking for KDE4 headers... " >&6; }
+ kde_incdir="no"
+ for kde_check in $kde_incdirs ; do
+ if test -r "$kde_check/$kde_test_include" ; then
+ kde_incdir="$kde_check"
+ break
+ fi
+ done
+ { $as_echo "$as_me:$LINENO: result: $kde_incdir" >&5
+$as_echo "$kde_incdir" >&6; }
+ if test "x$kde_incdir" = "xno" ; then
+ { { $as_echo "$as_me:$LINENO: error: KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&5
+$as_echo "$as_me: error: KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ { $as_echo "$as_me:$LINENO: checking for KDE4 libraries" >&5
+$as_echo_n "checking for KDE4 libraries... " >&6; }
+ kde_libdir="no"
+ for kde_check in $kde_libdirs ; do
+ if test -r "$kde_check/$kde_test_library" ; then
+ kde_libdir="$kde_check"
+ break
+ fi
+ done
+
+ { $as_echo "$as_me:$LINENO: result: $kde_libdir" >&5
+$as_echo "$kde_libdir" >&6; }
+ if test "x$kde_libdir" = "xno" ; then
+ { { $as_echo "$as_me:$LINENO: error: KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&5
+$as_echo "$as_me: error: KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDEDIR before running \"configure\"." >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+
+ KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT"
+ KDE4_LIBS="-L$kde_libdir -L$qt_lib_dir -lkdeui -lkdecore -lQtCore -lQtGui"
+fi
+
+
+
+
{ $as_echo "$as_me:$LINENO: checking whether to enable the lockdown pieces" >&5
$as_echo_n "checking whether to enable the lockdown pieces... " >&6; }
ENABLE_LOCKDOWN=""