Attachment #5852 for issue #13775

View | Details | Raw Unified | Return to issue 13775
Collapse All | Expand All

Lines 256-266 Link Here

(-)config_office/configure.in (-23 / +62 lines)
256	dnl ===================================================================	256	dnl ===================================================================
257	dnl Sanity check! Native windows programs cannot use cygwin symlinks!	257	dnl Sanity check! Native windows programs cannot use cygwin symlinks!
258	dnl ===================================================================	258	dnl ===================================================================
259	if test -L $AWK -o -L `which tar` -o -L `which gunzip` ; then	259	if test -L $AWK -o -L `which tar` -o -L `which gunzip` ; then
260	AC_MSG_ERROR([$AWK, tar or gunzip is a cygwin symlink!	260	AC_MSG_ERROR([$AWK, tar or gunzip is a cygwin symlink!
261	Native windows programs cannot use cygwin symlinks. Remove the symbolic	261	Native windows programs cannot use cygwin symlinks. Remove the symbolic
262	link, and copy the program to the name of the link.])	262	link, and copy the program to the name of the link.])
263	fi	263	fi
		264	dnl ===================================================================
		265	dnl If $CC is set to a MinGW compiler, e.g. "gcc -mno-cygwin" enable
		266	dnl $WITH_MINGWIN
		267	dnl ===================================================================
		268	if test -n "$CC";then
		269	if test `$CC -dumpmachine \| $AWK -F- '{ print $3 }'` = "mingw32"; then
		270	WITH_MINGWIN = "yes"
		271	fi
		272	fi
264	else	273	else
265	CygwinVer="b"	274	CygwinVer="b"
266	fi	275	fi
Lines 272-277 Link Here
272	dnl ===================================================================	281	dnl ===================================================================
273	if test "$WITH_MINGWIN" = "yes"; then	282	if test "$WITH_MINGWIN" = "yes"; then
274	with_use_shell="tcsh"	283	with_use_shell="tcsh"
		284	if test -z "$CC"; then
		285	CC="gcc -mno-cygwin"
		286	CXX="g++ -mno-cygwin"
		287	fi
275	fi	288	fi
276	else	289	else
277	if test "$_os" = "WINNT"; then	290	if test "$_os" = "WINNT"; then
Lines 472-487 Link Here
472	fi	485	fi
473		486
474	dnl ===================================================================	487	dnl ===================================================================
475	dnl Check if there is a Microsoft C/C++ compiler.	488	dnl Check which Microsoft C/C++ or MinGW compiler is used for WINNT
476	dnl ===================================================================	489	dnl ===================================================================
477	if test "$_os" = "WINNT"; then	490	if test "$_os" = "WINNT"; then
478	if test "$WITH_MINGWIN" != "yes"; then	491	if test "$WITH_MINGWIN" != "yes"; then
479	AC_MSG_CHECKING([the Microsoft C/C++ Compiler])	492	AC_MSG_CHECKING([the Microsoft C/C++ Compiler])
480	if test -x "$with_cl_home/bin/cl.exe"; then	493	if test -x "$with_cl_home/bin/cl.exe"; then
481	CC="$with_cl_home/bin/cl.exe"	494	CC="$with_cl_home/bin/cl.exe"
482	else	495	else
483	AC_PATH_PROG(CC, cl.exe)	496	AC_PATH_PROG(CC, cl.exe)
484	fi	497	fi
485	if test -e "$CC"; then	498	if test -e "$CC"; then
486	# Don't use filenames with spaces AND the old cygwin b20	499	# Don't use filenames with spaces AND the old cygwin b20
487	if test "$CygwinVer" = "1"; then	500	if test "$CygwinVer" = "1"; then
Lines 495-507 Link Here
495	if test "$CygwinVer" = "1"; then	508	if test "$CygwinVer" = "1"; then
496	export INCLUDE=`cygpath -d "$COMPATH/Include"`	509	export INCLUDE=`cygpath -d "$COMPATH/Include"`
497	fi	510	fi
498	AC_MSG_RESULT([found.])	511	AC_MSG_RESULT([found.])
499	else	512	dnl Check which Microsoft C/C++ compiler is found
500	AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])	513	AC_MSG_CHECKING([the Version of Microsoft C/C++ Compiler])
501	fi	514	CCNUMVER=`$CC 2>&1 \| $AWK "/Microsoft.*..\\...\\...../ {
502	else	515	x = match( \\\$0, /..\\...\\...../ )
503	AC_MSG_CHECKING([the Mingwin32 C++ Compiler])	516	CCversion = substr( \\\$0, RSTART, RLENGTH)
504	fi	517	tokencount = split (CCversion,vertoken,\".\")
		518	for ( i = 1 ; i <= tokencount ; i++ ) {
		519	printf (\"%04d\",vertoken[[i]] )
		520	}
		521	}"`
		522	AC_MSG_RESULT([found Compiler version $CCNUMVER.])
		523	if test $CCNUMVER -ge "001300000000"; then
		524	COMEX=8
		525	else
		526	if test $CCNUMVER -ge "001200000000"; then
		527	COMEX=7
		528	else
		529	AC_MSG_ERROR([Compiler too old.])
		530	fi
		531	fi
		532	else
		533	AC_MSG_ERROR([Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe.])
		534	fi
		535	else
		536	AC_MSG_CHECKING([the Mingwin32 C++ Compiler])
		537	if test `$CC -dumpmachine \| $AWK -F- '{ print $3 }'` = "mingw32"; then
		538	AC_MSG_RESULT([found.])
		539	else
		540	AC_MSG_ERROR([Mingwin32 C++ Compiler not found.])
		541	fi
		542	fi
505	fi	543	fi
506		544
507	dnl ===================================================================	545	dnl ===================================================================
Lines 531-544 Link Here
531	fi	569	fi
532	fi	570	fi
533		571
534	if test "$_os" = "WINNT"; then	572	if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
535	if test -e "$CC"; then	573	if test -e "$CC"; then
536	CXX="$CC"	574	CXX="$CC"
537	fi	575	fi
538	fi	576	fi
539		577
540	dnl Autoconf 2.53 can do this test for cl.exe, 2.13 can't!	578	dnl Autoconf 2.53 can do this test for cl.exe, 2.13 can't!
541	if test "$_os" != "WINNT"; then	579	if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
542	AC_PROG_CXX	580	AC_PROG_CXX
543	fi	581	fi
544		582
Lines 771-787 Link Here
771	AC_MSG_CHECKING([for STLport4 headers])	809	AC_MSG_CHECKING([for STLport4 headers])
772	if test -d "$with_stlport4_home"; then	810	if test -d "$with_stlport4_home"; then
773	STLPORT4=$with_stlport4_home	811	STLPORT4=$with_stlport4_home
774	if test "$_os" != "WINNT"; then	812	if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
775	AC_TRY_CPP($STLPORT4/stlport/hash_map, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([STLport4 headers not found.]))	813	AC_TRY_CPP($STLPORT4/stlport/hash_map, AC_MSG_RESULT([checked.]), AC_MSG_ERROR([STLport4 headers not found.]))
776	else	814	else
777	dnl AC_TRY_CPP doesn't work on Windows because C++ preprocessor is not found by autoconf.	815	dnl AC_TRY_CPP doesn't work for MSVC because C++ preprocessor is not found by autoconf.
778	if test -f "$STLPORT4/stlport/hash_map"; then	816	if test -f "$STLPORT4/stlport/hash_map"; then
779	AC_MSG_RESULT([checked.])	817	AC_MSG_RESULT([checked.])
780	else	818	else
781	AC_MSG_ERROR([STLport4 headers not found.])	819	AC_MSG_ERROR([STLport4 headers not found.])
782	fi	820	fi
783	fi	821	fi
784	if test "$_os" != "WINNT"; then	822	if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then
785	AC_MSG_CHECKING([for STLport4 libraries])	823	AC_MSG_CHECKING([for STLport4 libraries])
786	if test "$_os" = "SunOS"; then	824	if test "$_os" = "SunOS"; then
787	if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then	825	if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then
Lines 1034-1040 Link Here
1034	dnl ***************************************	1072	dnl ***************************************
1035	dnl testing ml.exe assembler path	1073	dnl testing ml.exe assembler path
1036	dnl ***************************************	1074	dnl ***************************************
1037	if test "$_os" = "WINNT"; then	1075	if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then
1038	if test ! -x "$with_asm_home/ml.exe"; then	1076	if test ! -x "$with_asm_home/ml.exe"; then
1039	AC_PATH_PROG(ML_EXE, ml.exe)	1077	AC_PATH_PROG(ML_EXE, ml.exe)
1040	if test -z "$ML_EXE"; then	1078	if test -z "$ML_EXE"; then
Lines 1233-1238 Link Here
1233	UPD="$upd"	1271	UPD="$upd"
1234	AC_SUBST(UPD)	1272	AC_SUBST(UPD)
1235	AC_SUBST(CYGWIN)	1273	AC_SUBST(CYGWIN)
		1274	AC_SUBST(COMEX)
1236	AC_SUBST(STLPORT4)	1275	AC_SUBST(STLPORT4)
1237	WITH_LANG="$with_lang"	1276	WITH_LANG="$with_lang"
1238	AC_SUBST(WITH_LANG)	1277	AC_SUBST(WITH_LANG)

Lines 43-49 Link Here

(-)config_office/set_soenv.in (-34 / +38 lines)
43	#--------------------------------------------------------	43	#--------------------------------------------------------
44	#	44	#
45	my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,	45	my ( $outfile, $outfile_sh, $outfile_bat, $bootfile, $newline, $comment, $comment4nt, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir,
46	$par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $FreeBSD, $NetBSD, $Tru64, $Irix, $Irix64, $Winnt, $Macosx, $MINGWIN32, $USE_SHELL,	46	$par_dir, $I, $L, $D, $buildenv, $answer, $tmp, $Solaris, $Linux, $FreeBSD, $NetBSD, $Tru64, $Irix, $Irix64, $Winnt, $Macosx, $MINGW, $USE_SHELL,
47	$WScomp, $GNUcomp, $platform, $cygwinver, $machine_type, $empty, $no_ant, $no_stl, $no_gcc_home, $no_gcc_include,	47	$WScomp, $GNUcomp, $platform, $cygwinver, $machine_type, $empty, $no_ant, $no_stl, $no_gcc_home, $no_gcc_include,
48	$no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os);	48	$no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $unsetvarsbat, $exportvars, $win_format_var, $perl_os);
49	#	49	#
Lines 130-136 Link Here
130	$warnfile = "warn"; # logfile configure warnings.	130	$warnfile = "warn"; # logfile configure warnings.
131	$Warning = ""; # container for warning messages	131	$Warning = ""; # container for warning messages
132	$STLPORT4 = '@STLPORT4@'; # Location of STLport4	132	$STLPORT4 = '@STLPORT4@'; # Location of STLport4
133	$MINGWIN32 = '@WITH_MINGWIN@'; # use MINGWIN32	133	$MINGW = '@WITH_MINGWIN@'; # use MinGW for Windows build
134	$USE_SHELL = '@USE_SHELL@'; # preferred shell	134	$USE_SHELL = '@USE_SHELL@'; # preferred shell
135	$USE_GCC3 = '@USE_GCC3@'; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment)	135	$USE_GCC3 = '@USE_GCC3@'; # use gcc3 (only for unxlngi4 and unxfbsd5i at the moment)
136	$CC = '@CC@'; # C compiler	136	$CC = '@CC@'; # C compiler
Lines 518-566 Link Here
518	$emergency = "FALSE";	518	$emergency = "FALSE";
519	$use_shl_versions = "TRUE";	519	$use_shl_versions = "TRUE";
520	$MULTITHREAD_OBJ = "TRUE";	520	$MULTITHREAD_OBJ = "TRUE";
521	if ( $MINGWIN32 eq "yes" )	521	if ( $MINGW eq "yes" )
522	{ print "Setting Windows NT cygwin mingwin32 specific values... ";	522	{ # At the moment this implies the use of tcsh
		523	print "Setting Windows NT cygwin MinGW specific values... ";
		524	$WRAPCMD = "guw.pl";
523	$outfile = "winmingw.set";	525	$outfile = "winmingw.set";
524	$COM = "GCC";	526	$COM = "GCC";
525	# Change path to lower case.
526	$COMPATH = lc $COMPATH;
527	$DLLSUFFIX = "gi";	527	$DLLSUFFIX = "gi";
528	$OUTPATH = "wntgcci";	528	$OUTPATH = "wntgcci";
529	$INPATH = $OUTPATH.$PROEXT;	529	$INPATH = $OUTPATH.$PROEXT;
530	$GVERDIR = $INPATH;	530	$GVERDIR = $INPATH;
531	$PATH_SEPERATOR = ':';	531	$PATH_SEPERATOR = ':';
532	}	532	}
533	elsif ( $USE_SHELL ne "4nt" )	533	else # The MSVC section starts here
534	{ print "Setting Windows NT cygwin without 4NT specific values... ";	534	{ $outfile = "winenv.set";
535	$outfile = "winenv.set";
536	$COM = "MSC";	535	$COM = "MSC";
537	$WRAPCMD = "guw.pl";
538	$CC = $WRAPCMD." ".$CC;
539	$CXX = $WRAPCMD." ".$CXX;
540	# Change path to lower case.
541	# not realy usefull for *sh
542	# $COMPATH = lc $COMPATH;
543	$CVER = "MI200";	536	$CVER = "MI200";
544	$DLLSUFFIX = "mi";	537	$DLLSUFFIX = "mi";
545	$OUTPATH = "wntmsci7";	538	$OUTPATH = "wntmsci@COMEX@";
546	$INPATH = $OUTPATH.$PROEXT;	539	$INPATH = $OUTPATH.$PROEXT;
547	$GVERDIR = $INPATH;	540	$GVERDIR = $INPATH;
		541	$COMEX = '@COMEX@';
		542
		543	if ( $USE_SHELL ne "4nt" )
		544	{ print "Setting Windows NT cygwin without 4NT specific values... ";
		545	$WRAPCMD = "guw.pl";
		546	$CC = $WRAPCMD." ".$CC;
		547	$CXX = $WRAPCMD." ".$CXX;
548	$PATH_SEPERATOR = ':';	548	$PATH_SEPERATOR = ':';
549	$COMEX = 7;
550	}	549	}
551	else	550	else # $USE_SHELL ne "4nt"
552	{ print "Setting Windows NT specific values... ";	551	{ print "Setting Windows NT with 4NT specific values... ";
553	$outfile = "winenv.set";
554	$COM = "MSC";
555	# Change path to lower case.	552	# Change path to lower case.
556	$COMPATH = lc $COMPATH;	553	$COMPATH = lc $COMPATH;
557	$CVER = "MI200";
558	$DLLSUFFIX = "mi";
559	$OUTPATH = "wntmsci7";
560	$INPATH = $OUTPATH.$PROEXT;
561	$GVERDIR = $INPATH;
562	$PATH_SEPERATOR = ';';	554	$PATH_SEPERATOR = ';';
563	$COMEX = 7;	555	}
		556
564	}	557	}
565	}	558	}
566	elsif ( $platform eq "$Macosx" )	559	elsif ( $platform eq "$Macosx" )
Lines 916-921 Link Here
916	$I.$SOLARENV.$ds.$INPATH.$INC.	909	$I.$SOLARENV.$ds.$INPATH.$INC.
917	$I.$SOLARENV.$INC.	910	$I.$SOLARENV.$INC.
918	$I."'".$PSDK_HOME.$INCLUDE."'".	911	$I."'".$PSDK_HOME.$INCLUDE."'".
		912	# FIXME: Mingw is different
919	$I.'$COMPATH'.$ds."include";	913	$I.'$COMPATH'.$ds."include";
920	}	914	}
921	elsif ($platform eq "$Macosx")	915	elsif ($platform eq "$Macosx")
Lines 936-941 Link Here
936	$ps.$SOLARENV.$ds.$OUTPATH.$INC.	930	$ps.$SOLARENV.$ds.$OUTPATH.$INC.
937	$ps.$SOLARENV.$INC.	931	$ps.$SOLARENV.$INC.
938	$ps.'$PSDK_HOME'.$INCLUDE.	932	$ps.'$PSDK_HOME'.$INCLUDE.
		933	# FIXME: Mingw is different
939	$ps.'$COMPATH'.$INCLUDE;	934	$ps.'$COMPATH'.$INCLUDE;
940		935
941	$WIN_LIB = $cur_dir.$ps_STLPORT_LIB.$ps.	936	$WIN_LIB = $cur_dir.$ps_STLPORT_LIB.$ps.
Lines 944-949 Link Here
944	$ps.$SOLARENV.$ds.$OUTPATH.$LIB.	939	$ps.$SOLARENV.$ds.$OUTPATH.$LIB.
945	$ps.$JAVA_HOME.$LIB.	940	$ps.$JAVA_HOME.$LIB.
946	$ps.'$PSDK_HOME'.$LIB.	941	$ps.'$PSDK_HOME'.$LIB.
		942	# FIXME: Mingw is different
947	$ps.'$COMPATH'.$LIB;	943	$ps.'$COMPATH'.$LIB;
948		944
949	if ( $JAVA_HOME ne "" )	945	if ( $JAVA_HOME ne "" )
Lines 1008-1016 Link Here
1008	# convert path to posix if using native NT perl	1004	# convert path to posix if using native NT perl
1009	$noldPATH = PosixFormat($noldPATH);	1005	$noldPATH = PosixFormat($noldPATH);
1010		1006
1011	$COMPATH_ROOT = $COMPATH;
1012	$COMPATH_ROOT =~ s/\/vc98$//i;
1013
1014	$PATH = $cur_dir.	1007	$PATH = $cur_dir.
1015	$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.	1008	$ps.'$SOLARVER'.$ds.'$UPD'.$ds.'$INPATH'.$BIN.
1016	$ps.'$SOLARENV'.$ds."bin".	1009	$ps.'$SOLARENV'.$ds."bin".
Lines 1023-1044 Link Here
1023	# 1.3.x - hotspot, client missing	1016	# 1.3.x - hotspot, client missing
1024	# 1.4.x - client, hotspot missing	1017	# 1.4.x - client, hotspot missing
1025		1018
1026	$PATH .= $ps.$JAVA_HOME.$BIN.	1019	$PATH .= $ps.$JAVA_HOME.$BIN;
1027	$ps.$JAVA_HOME.$ds."jre".$ds."bin".$ds."hotspot".	1020	if ( -d $JAVA_HOME.$ds."jre".$ds."bin".$ds."hotspot" ) {
1028	$ps.$JAVA_HOME.$ds."jre".$ds."bin".$ds."client";	1021	$PATH .= $ps.$JAVA_HOME.$ds."jre".$ds."bin".$ds."hotspot";
		1022	}
		1023	if ( -d $JAVA_HOME.$ds."jre".$ds."bin".$ds."client" ) {
		1024	$PATH .= $ps.$JAVA_HOME.$ds."jre".$ds."bin".$ds."client";
		1025	}
1029	}	1026	}
1030	# MSVC++ Environement sets the PATH variable, dont add $COMPATH to $PATH !	1027	# MSVC++ Environement sets the PATH variable, dont add $COMPATH to $PATH !
1031	# anyway, add if path to compiler isn't already set in PATH	1028	# anyway, add if path to compiler isn't already set in PATH
1032	if ( ! ( $noldPATH =~ /(?:[:]\|\A)(?:$COMPATH)(?:[:]\|\Z\|$ds)/ ) )	1029	if ( ! ( $noldPATH =~ /(?:[:]\|\A)(?:$COMPATH)(?:[:]\|\Z\|$ds)/ ) )
1033	{	1030	{
		1031	# FIXME: Mingw doesn't need $BIN
1034	$PATH .= $ps.'$COMPATH'.$BIN;	1032	$PATH .= $ps.'$COMPATH'.$BIN;
1035	}	1033	}
		1034	if ( $COM eq "MSC" )
		1035	{
1036	# for MS-Visual Studio 6.0 to find mspdb60.dll (need by CL.EXE C/C++ Compiler)	1036	# for MS-Visual Studio 6.0 to find mspdb60.dll (need by CL.EXE C/C++ Compiler)
1037	# and rcdll.dll (need by RC.EXE -- 32 bit Resource Compiler) location.	1037	# and rcdll.dll (need by RC.EXE -- 32 bit Resource Compiler) location.
		1038	$COMPATH_ROOT = $COMPATH;
		1039	$COMPATH_ROOT =~ s/\/vc98$//i;
1038	if ( $noldPATH !~ /[^\/]\b$COMPATH_ROOT\/Common\/MSDev98\/Bin\b[^\/]/ )	1040	if ( $noldPATH !~ /[^\/]\b$COMPATH_ROOT\/Common\/MSDev98\/Bin\b[^\/]/ )
1039	{	1041	{
1040	$PATH .= $ps.$COMPATH_ROOT.'/Common/MSDev98/Bin';	1042	$PATH .= $ps.$COMPATH_ROOT.'/Common/MSDev98/Bin';
1041	}	1043	}
		1044	}
1042		1045
1043	# Check if $PERL_PATH is already set in PATH	1046	# Check if $PERL_PATH is already set in PATH
1044	if ( ! ( $noldPATH =~ /(?:[:]\|\A)(?:$PERL_PATH)(?:[:]\|\Z\|$ds)/ ) )	1047	if ( ! ( $noldPATH =~ /(?:[:]\|\A)(?:$PERL_PATH)(?:[:]\|\Z\|$ds)/ ) )
Lines 1049-1055 Link Here
1049	if ( ( "$USE_SHELL" eq "tcsh" ) && ( ! $noldPATH =~ /(?:[:]\|\A)(?:$TCSH_PATH)(?:[:]\|\Z)/ ) )	1052	if ( ( "$USE_SHELL" eq "tcsh" ) && ( ! $noldPATH =~ /(?:[:]\|\A)(?:$TCSH_PATH)(?:[:]\|\Z)/ ) )
1050	{ $PATH .= $ps.$TCSH_PATH;	1053	{ $PATH .= $ps.$TCSH_PATH;
1051	}	1054	}
1052	if ($ASM_PATH ne "ASM_IN_PATH")	1055	if ( ($COM eq "MSC") && ($ASM_PATH ne "ASM_IN_PATH") )
1053	{ $PATH .= $ps.'${ASM_PATH}';	1056	{ $PATH .= $ps.'${ASM_PATH}';
1054	}	1057	}
1055	if ($UNZIP_PATH ne "UNZIP_IN_PATH")	1058	if ($UNZIP_PATH ne "UNZIP_IN_PATH")
Lines 1223-1228 Link Here
1223	$I.'$JAVA_HOME'.$ds."include".$ds."win32".	1226	$I.'$JAVA_HOME'.$ds."include".$ds."win32".
1224	$I.'$JAVA_HOME'.$ds."include".	1227	$I.'$JAVA_HOME'.$ds."include".
1225	$I."'".$PSDK_HOME.$INCLUDE."'".	1228	$I."'".$PSDK_HOME.$INCLUDE."'".
		1229	# FIXME: Mingw is different
1226	$I.'$COMPATH'.$ds."include";	1230	$I.'$COMPATH'.$ds."include";
1227	}	1231	}
1228	elsif ($platform eq "$Macosx")	1232	elsif ($platform eq "$Macosx")

Return to issue 13775