strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS vq07 (1.60.6); FILE MERGED

Browse source 
2004/12/03 22:48:04 vq 1.60.6.1: #i38411# Remove check for wdevenv in configure.
This commit is contained in:
Jens-Heiner Rechtien 2004-12-13 11:16:19 +00:00
parent 17dba8f2fb
commit c420387029
1 changed files with 2 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
config_office/configure vendored
View file

@ -1,5 +1,5 @@
#! /bin/sh
# From configure.in Revision .
# From configure.in Revision: 1.77 .
# 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 OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH USE_SHELL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH WDEVENV_PATH FRAME_HOME CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL SOLAR_JAVA JAVAC JAVA XSLTPROC JAVA_HOME JDK XMKMF PERL TCSH DMAKE BUILD_DMAKE EPM SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE 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 SYSTEM_DB3 SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_ODBC_HEADERS MOZILLA_CFLAGS MOZILLA_LIBS MOZILLABASE_CFLAGS MOZILLABASE_LIBS SYSTEM_MOZILLA SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_ICU X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_NAS NAS_INCLUDES NEON_CONFIG SYSTEM_NEON NEON_LIBS NEON_CFLAGS PSDK_HOME DIRECTXSDK_HOME EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN WITH_MOZILLA WITH_OPENLDAP WITH_FONTS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB UPD SOURCEVERSION LOCAL_SOLENV LOCAL_SOLVER WITH_LANG WITH_DICT ENABLE_STATIC_GTK GCC_HOME WITH_MINGWIN 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 OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP ENABLE_VCTK VC_STANDARD ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS ENABLE_CUPS ENABLE_FONTCONFIG ENABLE_DIRECTX NETTOOLKIT ENABLE_RPATH USE_SHELL CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GNUMAKE _cc MSPDB_PATH COMEX MIDL_PATH CSC_PATH NMAKE_PATH FRAME_HOME CPP EGREP CXX CXXFLAGS ac_ct_CXX GXX_INCLUDE_PATH EXCEPTIONS CXXCPP STLPORT4 USE_SYSTEM_STL SOLAR_JAVA JAVAC JAVA XSLTPROC JAVA_HOME JDK XMKMF PERL TCSH DMAKE BUILD_DMAKE EPM SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG FREETYPE_CFLAGS FREETYPE_LIBS SYSTEM_FREETYPE 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 SYSTEM_DB3 SABLOTCONFIG SYSTEM_SABLOT SABLOT_LIBS CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_ODBC_HEADERS MOZILLA_CFLAGS MOZILLA_LIBS MOZILLABASE_CFLAGS MOZILLABASE_LIBS SYSTEM_MOZILLA SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_ICU X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB SYSTEM_NAS NAS_INCLUDES NEON_CONFIG SYSTEM_NEON NEON_LIBS NEON_CFLAGS PSDK_HOME DIRECTXSDK_HOME EXTRA_DOTNET_FILES BISON FLEX PATCH GNUPATCH GNUCP CYGWIN_PATH ML_EXE ASM_HOME ZIP ZIP_HOME LIBART_CFLAGS LIBART_LIBS WITH_LIBART WITH_GPC ENABLE_GTK ENABLE_KDE GTK_CFLAGS GTK_LIBS GDKPIXBUF_CFLAGS GDKPIXBUF_LIBS KDE_CFLAGS KDE_LIBS LIBSN_CFLAGS LIBSN_LIBS WITH_LIBSN WITH_MOZILLA WITH_OPENLDAP WITH_FONTS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB UPD SOURCEVERSION LOCAL_SOLENV LOCAL_SOLVER WITH_LANG WITH_DICT ENABLE_STATIC_GTK GCC_HOME WITH_MINGWIN LIBOBJS LTLIBOBJS'
ac_subst_files=''
# Initialize some variables set by options.
@ -1061,11 +1061,6 @@ Optional Packages:
Usage: --with-frame-home=<absolute path to Framework SDK [home]>
--with-wdevenv-path For Microsoft C/C++ .NET compiler users, please supply the path
pointing to the wdevenv.exe.
Usage: --with-wdevenv-path=<absolute path to wdevenv.exe>
--with-psdk-home For Windows users, please supply the path to the
Microsoft Platform SDK.
@ -1876,12 +1871,6 @@ if test "${with_frame_home+set}" = set; then
fi;
# Check whether --with-wdevenv-path or --without-wdevenv-path was given.
if test "${with_wdevenv_path+set}" = set; then
withval="$with_wdevenv_path"
fi;
# Check whether --with-psdk-home or --without-psdk-home was given.
if test "${with_psdk_home+set}" = set; then
withval="$with_psdk_home"
@ -4150,64 +4139,7 @@ echo "$as_me: error: msvcrt.lib (.NET Framework) not found. Make sure you use --
# Convert to posix path with 8.3 filename restrictions ( No spaces )
FRAME_HOME=`cygpath -d "$FRAME_HOME"`
FRAME_HOME=`cygpath -u "$FRAME_HOME"`
if test -z "$ENABLE_VCTK"; then
# Extract the first word of "wdevenv.exe", so it can be a program name with args.
set dummy wdevenv.exe; 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_WDEVENV_PATH+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $WDEVENV_PATH in
[\\/]* | ?:[\\/]*)
ac_cv_path_WDEVENV_PATH="$WDEVENV_PATH" # 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_WDEVENV_PATH="$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
;;
esac
fi
WDEVENV_PATH=$ac_cv_path_WDEVENV_PATH
if test -n "$WDEVENV_PATH"; then
echo "$as_me:$LINENO: result: $WDEVENV_PATH" >&5
echo "${ECHO_T}$WDEVENV_PATH" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
if test -n "$WDEVENV_PATH"; then
WDEVENV_PATH=`dirname "$WDEVENV_PATH"`
fi
if test -x "$with_wdevenv_path/wdevenv.exe"; then
WDEVENV_PATH="$with_wdevenv_path"
fi
if test ! -x "$WDEVENV_PATH/wdevenv.exe"; then
{ { echo "$as_me:$LINENO: error: wdevenv.exe not found. Make sure it's in the path or use --with-wdevenv-path" >&5
echo "$as_me: error: wdevenv.exe not found. Make sure it's in the path or use --with-wdevenv-path" >&2;}
{ (exit 1); exit 1; }; }
fi
# Convert to posix path with 8.3 filename restrictions ( No spaces )
WDEVENV_PATH=`cygpath -d "$WDEVENV_PATH"`
WDEVENV_PATH=`cygpath -u "$WDEVENV_PATH"`
fi
fi
@ -14001,7 +13933,6 @@ s,@COMEX@,$COMEX,;t t
s,@MIDL_PATH@,$MIDL_PATH,;t t
s,@CSC_PATH@,$CSC_PATH,;t t
s,@NMAKE_PATH@,$NMAKE_PATH,;t t
s,@WDEVENV_PATH@,$WDEVENV_PATH,;t t
s,@FRAME_HOME@,$FRAME_HOME,;t t
s,@CPP@,$CPP,;t t
s,@EGREP@,$EGREP,;t t