Attachment #1422 for issue #4176

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




if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then
   AC_PROG_CC
fi
if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$GCC" = "yes" \) ; then
   dnl ******************************************
   dnl Testing for GNU compiler and version...
   dnl ******************************************
   dnl Check whether the gnu gcc compiler is used.
   if test -z "$with_gcc_home"; then

      AC_PROG_CC
      COMPATH=`echo $CC | $SED -n "s,/[^/]\+$,,p"`
      _gcc_include_start=/usr/lib/gcc-lib
      _gxx_include_start=/usr/include

   else
      dnl Compiler has been installed to its own directory and it's home is arg with_gcc_home
      _gcc_path="$with_gcc_home/bin/gcc"

echo "\$MINGWIN32="$WITH_MINGWIN
echo "\$with_use_shell="$with_use_shell
echo "\$USE_GCC3="$USE_GCC3
echo "\$CC="$CC
echo "\$CXX="$CXX
echo
fi

# Executing the set_soenv script to setup the environment variables.
if test -z "$enable_check_only"; then
   './set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $CC $CXX
else
   echo
   echo Test Complete

Lines 40-46 Link Here

(-)oo_cvs/config_office/set_soenv.1 (-2 / +6 lines)
40	#	40	#
41	# Set this value equal to the corresponding amount of	41	# Set this value equal to the corresponding amount of
42	# command line arguments.	42	# command line arguments.
43	my $numArgs = 20;	43	my $numArgs = 22;
44	# Determining the amount of arguments in the call.	44	# Determining the amount of arguments in the call.
45	my $numEnter = $#ARGV + 1;	45	my $numEnter = $#ARGV + 1;
46	if ( $numEnter != $numArgs )	46	if ( $numEnter != $numArgs )
Lines 96-102 Link Here
96	$SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL,	96	$SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL,
97	$COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME,	97	$COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME,
98	$BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,	98	$BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
99	$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3 );	99	$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $CC, $CXX );
100	#	100	#
101	#-------------------------------------------	101	#-------------------------------------------
102	# IId. Declaring the aliases.	102	# IId. Declaring the aliases.
Lines 146-151 Link Here
146	$MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32	146	$MINGWIN32 = $ARGV [ 17 ]; # use MINGWIN32
147	$use_shell = $ARGV [ 18 ]; # preferred shell	147	$use_shell = $ARGV [ 18 ]; # preferred shell
148	$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment)	148	$USE_GCC3 = $ARGV [ 19 ]; # use gcc3 (only for unxlngi4 at the moment)
		149	$CC = $ARGV [ 20 ]; # C compiler
		150	$CXX = $ARGV [ 21 ]; # C++ compiler
149	#	151	#
150	#---------------------------------------------------------------	152	#---------------------------------------------------------------
151	# IIIb. Initialising the variables for the system commands, etc.	153	# IIIb. Initialising the variables for the system commands, etc.
Lines 1464-1469 Link Here
1464	ToFile( "SOLARINC", $SOLARINC, "e" );	1466	ToFile( "SOLARINC", $SOLARINC, "e" );
1465	ToFile( "COMP_ENV", $COMP_ENV, "e" );	1467	ToFile( "COMP_ENV", $COMP_ENV, "e" );
1466	ToFile( "JAVAHOME", $JAVAHOME, "e" );	1468	ToFile( "JAVAHOME", $JAVAHOME, "e" );
		1469	ToFile( "CCCOMP", $CC, "e" );
		1470	ToFile( "CXXCOMP", $CXX, "e" );
1467	ToFile( "BISON_HAIRY", $BISON_HAIRY, "e" );	1471	ToFile( "BISON_HAIRY", $BISON_HAIRY, "e" );
1468	ToFile( "BISON_SIMPLE", $BISON_SIMPLE, "e" );	1472	ToFile( "BISON_SIMPLE", $BISON_SIMPLE, "e" );
1469	ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS,"e" );	1473	ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS,"e" );

Return to issue 4176

Lines 241-258 Link Here

(-)oo_cvs/config_office/configure.in (-8 / +10 lines)
241	if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then	241	if test "$_os" != "WINNT" && test -z "$with_gcc_home"; then
242	AC_PROG_CC	242	AC_PROG_CC
243	fi	243	fi
244	if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$CC" = "gcc" \) ; then	244	if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" -o \( \( "$_os" = "IRIX" -o "$_os" = "IRIX64" \) -a "$GCC" = "yes" \) ; then
245	dnl ******************************************	245	dnl ******************************************
246	dnl Testing for GNU compiler and version...	246	dnl Testing for GNU compiler and version...
247	dnl ******************************************	247	dnl ******************************************
248	dnl Check whether the gnu gcc compiler is used.	248	dnl Check whether the gnu gcc compiler is used.
249	if test -z "$with_gcc_home"; then	249	if test -z "$with_gcc_home"; then
250	if test "$CC" = "gcc"; then	250
251	AC_PATH_PROG(GCC, gcc)	251	AC_PROG_CC
252	COMPATH=`echo $GCC \| $SED -n "s/\/gcc//p"`	252	COMPATH=`echo $CC \| $SED -n "s,/[^/]\+$,,p"`
253	_gcc_include_start=/usr/lib/gcc-lib	253	_gcc_include_start=/usr/lib/gcc-lib
254	_gxx_include_start=/usr/include	254	_gxx_include_start=/usr/include
255	fi	255
256	else	256	else
257	dnl Compiler has been installed to its own directory and it's home is arg with_gcc_home	257	dnl Compiler has been installed to its own directory and it's home is arg with_gcc_home
258	_gcc_path="$with_gcc_home/bin/gcc"	258	_gcc_path="$with_gcc_home/bin/gcc"
Lines 1177-1188 Link Here
1177	echo "\$MINGWIN32="$WITH_MINGWIN	1177	echo "\$MINGWIN32="$WITH_MINGWIN
1178	echo "\$with_use_shell="$with_use_shell	1178	echo "\$with_use_shell="$with_use_shell
1179	echo "\$USE_GCC3="$USE_GCC3	1179	echo "\$USE_GCC3="$USE_GCC3
		1180	echo "\$CC="$CC
		1181	echo "\$CXX="$CXX
1180	echo	1182	echo
1181	fi	1183	fi
1182		1184
1183	# Executing the set_soenv script to setup the environment variables.	1185	# Executing the set_soenv script to setup the environment variables.
1184	if test -z "$enable_check_only"; then	1186	if test -z "$enable_check_only"; then
1185	'./set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3	1187	'./set_soenv' $COMPATH $_gcc_include_path $_gxx_include_path $JAVA_HOME $TCSH $PERL $x_libraries $x_includes $_LOCAL_SOLENV $_LOCAL_SOLVER $upd $CYGWIN $STLPORT4 $enable_xprint $with_lang $with_asm_home $with_unzip_home $WITH_MINGWIN $with_use_shell $USE_GCC3 $CC $CXX
1186	else	1188	else
1187	echo	1189	echo
1188	echo Test Complete	1190	echo Test Complete