Kaydet (Commit) c68cd077 authored tarafından Vladimir Glazounov's avatar Vladimir Glazounov

#100000# generated for new configure.in

üst a7c8bb67
#! /bin/sh
# From configure.in Revision: 1.216.6.1 .
# From configure.in Revision: 1.220 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61.
#
......@@ -1536,7 +1536,7 @@ Optional Features:
--enable-lockdown Enables the gconf integration work in OOo
--enable-vba Enables the vba compatibility feature
--disable-vba disables the vba compatibility feature
--enable-pch EXPERIMENTAL: Enables precompiled header support for C++.
......@@ -1698,16 +1698,17 @@ Optional Packages:
of the Netscape/Mozilla one
--with-vba-package-format specify package format for vba compatibility api.
Default "builtin" means the api component and
Specifying "builtin" means the api component and
associated type library are part of the installation set.
Specifying "extsn" creates an uno extension that is
Specifying "extn" creates an uno extension that is
part of the installation set ( located in the program
directory ) that MUST be optionly registered using
either the unopkg executeable or the extension manager
gui.
Usage: --with-package-format="builtin" or
--with-package-format="extsn"
Note: "extn" is the defualt.
Usage: --with-vba-package-format="builtin" or
--with-vba-package-format="extn"
--without-fonts Removes Bitstream Vera fonts from
openoffice.org installation set, for people building
......@@ -7600,16 +7601,16 @@ fi
fi
{ echo "$as_me:$LINENO: checking whether to enable vba feature" >&5
echo $ECHO_N "checking whether to enable vba feature... $ECHO_C" >&6; }
if test -n "$enable_vba" && test "$enable_vba" = "yes"; then
{ echo "$as_me:$LINENO: checking whether to disable vba feature" >&5
echo $ECHO_N "checking whether to disable vba feature... $ECHO_C" >&6; }
if test -n "$enable_vba" && test "$enable_vba" = "no"; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
ENABLE_VBA=YES
else
ENABLE_VBA=NO
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
ENABLE_VBA=YES
fi
......@@ -7633,14 +7634,17 @@ echo "$as_me: error: unknown packaging method" >&2;}
fi
else
VBA_EXTENSION=NO
{ echo "$as_me:$LINENO: result: build into installset" >&5
echo "${ECHO_T}build into installset" >&6; }
VBA_EXTENSION=YES
{ echo "$as_me:$LINENO: result: defaulting to build as uno extension" >&5
echo "${ECHO_T}defaulting to build as uno extension" >&6; }
fi
else
VBA_EXTENSION=NO
fi
if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then
# On IRIX 5.3, sys/types and inttypes.h are conflicting.
......@@ -14028,23 +14032,35 @@ echo "$as_me: error: hsqldb.jar not found." >&2;}
{ (exit 1); exit 1; }; }
fi
{ echo "$as_me:$LINENO: checking whether hsqldb is >= 1.8.0" >&5
echo $ECHO_N "checking whether hsqldb is >= 1.8.0... $ECHO_C" >&6; }
{ echo "$as_me:$LINENO: checking whether hsqldb is >= 1.8.0.8" >&5
echo $ECHO_N "checking whether hsqldb is >= 1.8.0.8... $ECHO_C" >&6; }
export HSQLDB_JAR
if $PERL -e 'use Archive::Zip;
my $file = "$ENV{'HSQLDB_JAR'}";
my $zip = Archive::Zip->new( $file );
my $mf = $zip->contents ( "META-INF/MANIFEST.MF" );
if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
exit 0;
} else {
exit 1;
if ( $mf =~ m/Specification-Version: 1.8.*/ ) {
push @l, split(/\n/, $mf);
foreach my $line (@l) {
if ($line =~ m/Specification-Version:/) {
($t, $version) = split (/:/,$line);
$version =~ s/^\s//;
($a, $b, $c, $d) = split (/\./,$version);
if (($c == "0" && $d > "7") || $c > 0) {
exit 0;
} else {
exit 1;
}
}
}
} else {
exit 1;
}'; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
else
{ { echo "$as_me:$LINENO: error: no, hsqldb >= 1.8.0 is needed" >&5
echo "$as_me: error: no, hsqldb >= 1.8.0 is needed" >&2;}
{ { echo "$as_me:$LINENO: error: no, hsqldb >= 1.8.0.8 is needed" >&5
echo "$as_me: error: no, hsqldb >= 1.8.0.8 is needed" >&2;}
{ (exit 1); exit 1; }; }
fi
else
......@@ -20203,105 +20219,6 @@ echo "${ECHO_T}$NEON_LIBS" >&6; }
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
NEON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "neon >= 0.26.0"`
echo $NEON_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
{ { echo "$as_me:$LINENO: error: Library requirements (neon >= 0.26.0) 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
echo "$as_me: error: Library requirements (neon >= 0.26.0) 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
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
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&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"
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
{ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}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
{ echo "$as_me:$LINENO: checking for neon < 0.27.0" >&5
echo $ECHO_N "checking for neon < 0.27.0... $ECHO_C" >&6; }
if $PKG_CONFIG --exists "neon < 0.27.0" ; then
{ echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6; }
succeeded=yes
{ echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5
echo $ECHO_N "checking NEON_CFLAGS... $ECHO_C" >&6; }
NEON_CFLAGS=`$PKG_CONFIG --cflags "neon < 0.27.0"`
{ echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5
echo "${ECHO_T}$NEON_CFLAGS" >&6; }
{ echo "$as_me:$LINENO: checking NEON_LIBS" >&5
echo $ECHO_N "checking NEON_LIBS... $ECHO_C" >&6; }
NEON_LIBS=`$PKG_CONFIG --libs "neon < 0.27.0"`
{ echo "$as_me:$LINENO: result: $NEON_LIBS" >&5
echo "${ECHO_T}$NEON_LIBS" >&6; }
else
NEON_CFLAGS=""
NEON_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
NEON_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "neon < 0.27.0"`
fi
......@@ -20316,8 +20233,8 @@ echo "${ECHO_T}$NEON_LIBS" >&6; }
if test $succeeded = yes; then
:
else
{ { echo "$as_me:$LINENO: error: you need neon 0.26.x for system-neon" >&5
echo "$as_me: error: you need neon 0.26.x for system-neon" >&2;}
{ { echo "$as_me:$LINENO: error: you need neon >= 0.26.x for system-neon" >&5
echo "$as_me: error: you need neon >= 0.26.x for system-neon" >&2;}
{ (exit 1); exit 1; }; }
fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment