Skip to content

C
core
Kaydet (Commit) 7adf0a2d authored tarafından Ivo Hinkelmann's avatar Ivo Hinkelmann
Dosyalara gözat
Seçenekler

INTEGRATION: CWS openssl01 (1.205.4); FILE MERGED 

2007/11/21 14:45:56 rt 1.205.4.1: #i83731# System openssl.
üst 6ac83377
Hide whitespace changes
Inline Side-by-side
Showing with 140 additions and 16 deletions
config_office/configure
Dosyayı görüntüle @ 7adf0a2d
#! /bin/sh
# From configure.in Revision .
# From configure.in Revision: 1.228.4.2 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59.
#
......@@ -309,7 +309,7 @@ ac_includes_default="\
# include <unistd.h>
#endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LFS_CFLAGS SHELLPATH GCC_HOME COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE ENABLE_PCH GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP EGREP ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SERIALIZER_JAR SYSTEM_XALAN XALAN_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB DISABLE_XAW XAU_LIBS SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF PATHEXTRA SYSTEM_NAS NAS_INCLUDES ENABLE_NAS SNDFILE_CFLAGS SNDFILE_LIBS ENABLE_PASF PA_VER SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK SIZEOF_LONG WORDS_BIGENDIAN ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS'
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS AWK SED LOCAL_SOLENV UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX ENABLE_RPATH WITH_MYSPELL_DICTS USE_SHELL WITH_MINGWIN CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT LFS_CFLAGS SHELLPATH GCC_HOME COMPATH GCCVER HAVE_GCC_VISIBILITY_FEATURE ENABLE_PCH GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP EGREP ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM PKGFORMAT RPM MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG SYSTEM_STDLIBS SYSTEM_ZLIB PKG_CONFIG OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL SYSTEM_JPEG SYSTEM_EXPAT FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SYSTEM_XML_APIS XML_APIS_JAR SYSTEM_XERCES XERCES_JAR SERIALIZER_JAR SYSTEM_XALAN XALAN_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB DISABLE_XAW XAU_LIBS SYSTEM_XRENDER_HEADERS XRENDER_LINK XMKMF PATHEXTRA SYSTEM_NAS NAS_INCLUDES ENABLE_NAS SNDFILE_CFLAGS SNDFILE_LIBS ENABLE_PASF PA_VER SYSTEM_PORTAUDIO SYSTEM_SNDFILE BUILD_TYPE DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH SYSTEM_MYTHES PSDK_HOME DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME WITH_GPC ENABLE_GTK ENABLE_KDE GNOMEVFS_CFLAGS GNOMEVFS_LIBS GCONF_CFLAGS GCONF_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS ENABLE_DBUS ENABLE_SYSTRAY_GTK CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO SYSTEM_CAIRO MOC KDE_CFLAGS KDE_LIBS ENABLE_LOCKDOWN LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTOOO SYSTEM_MSPACK WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK SIZEOF_LONG WORDS_BIGENDIAN ANT ANT_HOME ANT_LIB WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK LOCAL_SOLVER LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
......@@ -1091,6 +1091,8 @@ Optional Packages:
--with-system-zlib Use zlib already on system
--with-system-openssl Use OpenSSL already on system
--with-system-jpeg Use jpeg already on system
--with-system-expat Use expat already on system
......@@ -2159,6 +2161,12 @@ if test "${with_system_zlib+set}" = set; then
fi;
# Check whether --with-system-openssl or --without-system-openssl was given.
if test "${with_system_openssl+set}" = set; then
withval="$with_system_openssl"
fi;
# Check whether --with-system-jpeg or --without-system-jpeg was given.
if test "${with_system_jpeg+set}" = set; then
withval="$with_system_jpeg"
......@@ -10783,21 +10791,16 @@ echo "${ECHO_T}yes" >&6
echo "$as_me:$LINENO: checking the dmake version" >&5
echo $ECHO_N "checking the dmake version... $ECHO_C" >&6
DMAKE_VERSION=`$DMAKE -V | $SED -n 's/.*Version \([0-9.]\+\).*/\1/p'`
if test "$DMAKE_VERSION" = "4.10"; then
echo "$as_me:$LINENO: result: too old. >= 4.7 is needed. (Your old 4.1 version identifies itself as 4.10, PL 0.)" >&5
echo "${ECHO_T}too old. >= 4.7 is needed. (Your old 4.1 version identifies itself as 4.10, PL 0.)" >&6
echo "A newer dmake will be built on ./bootstrap"
BUILD_DMAKE=YES
elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
echo "$as_me:$LINENO: result: OK, >= 4.7" >&5
echo "${ECHO_T}OK, >= 4.7" >&6
if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then
echo "$as_me:$LINENO: result: OK, >= 4.11" >&5
echo "${ECHO_T}OK, >= 4.11" >&6
elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \
test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "7"; then
echo "$as_me:$LINENO: result: OK, >= 4.7" >&5
echo "${ECHO_T}OK, >= 4.7" >&6
test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then
echo "$as_me:$LINENO: result: OK, >= 4.11" >&5
echo "${ECHO_T}OK, >= 4.11" >&6
else
echo "$as_me:$LINENO: result: too old. >= 4.7 is needed" >&5
echo "${ECHO_T}too old. >= 4.7 is needed" >&6
echo "$as_me:$LINENO: result: too old. >= 4.11 is needed" >&5
echo "${ECHO_T}too old. >= 4.11 is needed" >&6
echo "A newer dmake will be built on ./bootstrap"
BUILD_DMAKE=YES
fi
......@@ -12012,6 +12015,124 @@ echo "${ECHO_T}internal" >&6
fi
if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
with_system_openssl=yes
fi
echo "$as_me:$LINENO: checking which libssl to use" >&5
echo $ECHO_N "checking which libssl to use... $ECHO_C" >&6
if test -n "$with_system_openssl" -o -n "$with_system_libs" && \
test "$with_system_openssl" != "no"; then
echo "$as_me:$LINENO: result: external" >&5
echo "${ECHO_T}external" >&6
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 $as_executable_p "$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
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 openssl " >&5
echo $ECHO_N "checking for openssl ... $ECHO_C" >&6
if $PKG_CONFIG --exists "openssl " ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5
echo $ECHO_N "checking OPENSSL_CFLAGS... $ECHO_C" >&6
OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl "`
echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5
echo "${ECHO_T}$OPENSSL_CFLAGS" >&6
echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5
echo $ECHO_N "checking OPENSSL_LIBS... $ECHO_C" >&6
OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl "`
echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5
echo "${ECHO_T}$OPENSSL_LIBS" >&6
else
OPENSSL_CFLAGS=""
OPENSSL_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
OPENSSL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "openssl "`
echo $OPENSSL_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 (openssl ) 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 (openssl ) 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
SYSTEM_OPENSSL=YES
else
echo "$as_me:$LINENO: result: internal" >&5
echo "${ECHO_T}internal" >&6
SYSTEM_OPENSSL=NO
BUILD_TYPE="$BUILD_TYPE OPENSSL"
fi
echo "$as_me:$LINENO: checking which jpeg to use" >&5
echo $ECHO_N "checking which jpeg to use... $ECHO_C" >&6
if test -n "$with_system_jpeg" -o -n "$with_system_libs" && \
......@@ -25922,9 +26043,12 @@ s,@ac_ct_MINGWSTRIP@,$ac_ct_MINGWSTRIP,;t t
s,@BUILD_UNOWINREG@,$BUILD_UNOWINREG,;t t
s,@SYSTEM_STDLIBS@,$SYSTEM_STDLIBS,;t t
s,@SYSTEM_ZLIB@,$SYSTEM_ZLIB,;t t
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t
s,@OPENSSL_LIBS@,$OPENSSL_LIBS,;t t
s,@SYSTEM_OPENSSL@,$SYSTEM_OPENSSL,;t t
s,@SYSTEM_JPEG@,$SYSTEM_JPEG,;t t
s,@SYSTEM_EXPAT@,$SYSTEM_EXPAT,;t t
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@FREETYPE_CFLAGS@,$FREETYPE_CFLAGS,;t t
s,@FREETYPE_LIBS@,$FREETYPE_LIBS,;t t
s,@SYSTEM_FREETYPE@,$SYSTEM_FREETYPE,;t t
......
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