Attachment #5313 for issue #12442

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

Lines 19-28 Link Here

(-)configure.in (-54 / +50 lines)
19	AC_ARG_ENABLE(gcc3,	19	AC_ARG_ENABLE(gcc3,
20	[ --enable-gcc3 Deprecated: Now has no effect, checks compiler version.	20	[ --enable-gcc3 Deprecated: Now has no effect, checks compiler version.
21	],,)	21	],,)
22	AC_ARG_ENABLE(debug,	22	AC_ARG_ENABLE(symbols,
23	[ --enable-debug if you like to build with debug symbols	23	[ --enable-symbols Include debugging symbols in output. Warning -
		24	a complete build needs 8 Gb of space and takes
		25	much longer. (enables -g compiler flag)
24		26
25	Usage: --enable-debug	27	],,)
		28	AC_ARG_ENABLE(debug,
		29	[ --enable-debug: Include debugging symbols from --enable-symbols
		30	plus extra debugging code. Extra large build!
		31	(enables -g compiler flag and dmake debug=true)
26	],,)	32	],,)
27	AC_ARG_WITH(stlport4-home,	33	AC_ARG_WITH(stlport4-home,
28	[ --with-stlport4-home The location that STLport4 is installed in. The STL	34	[ --with-stlport4-home The location that STLport4 is installed in. The STL
Lines 226-231 Link Here
226		232
227	AC_MSG_RESULT([checked ($_os)])	233	AC_MSG_RESULT([checked ($_os)])
228		234
		235	dnl ===================================================================
		236	dnl First setting is whether to include symbols into final build.
		237	dnl ===================================================================
		238	if test "$enable_symbols" = "yes"; then
		239	ENVCFLAGSCXX="-g"
		240	else
		241	ENVCFLAGSCXX=""
		242	fi
229		243
230	dnl ===================================================================	244	dnl ===================================================================
231	dnl WINNT uses either 4nt or tcsh, all other O/S use tcsh.	245	dnl WINNT uses either 4nt or tcsh, all other O/S use tcsh.
Lines 321-356 Link Here
321	AC_MSG_CHECKING([the GNU gcc compiler version])	335	AC_MSG_CHECKING([the GNU gcc compiler version])
322	_gcc_version=`$CC -dumpversion`	336	_gcc_version=`$CC -dumpversion`
323	_gcc_major=`echo $_gcc_version \| $AWK -F. '{ print \$1 }'`	337	_gcc_major=`echo $_gcc_version \| $AWK -F. '{ print \$1 }'`
324	if test "$_gcc_major" = "3"; then	338	_gcc_longver=`echo $_gcc_version \| $AWK -F. '{ print \$110000+\$2100+\$3 }'`
325		339
		340	if test "$_gcc_major" = "3"; then
326	USE_GCC3="TRUE"	341	USE_GCC3="TRUE"
327
328	else	342	else
329	USE_GCC3="FALSE"	343	USE_GCC3="FALSE"
330		344	if test "$_gcc_longver" -lt "029502"; then
331	if test "$_gcc_major" != "2"; then	345	AC_MSG_ERROR([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
332	AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
333	AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
334	COMPATH="NO_GCC"
335	else
336	_gcc_middle=`$CC -dumpversion \| $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
337	if test "$_gcc_middle" = "false"; then
338	AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
339	AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
340	COMPATH="NO_GCC"
341	else	346	else
342	_gcc_minor=`$CC -dumpversion \| $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`	347	if test "$_gcc_longver" -gt "029599"; then
343	if test "$_gcc_minor" = "false"; then	348	AC_MSG_ERROR([found version "$_gcc_version", Not supported. Upgrade to gcc 3])
344	AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
345	AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
346	COMPATH="NO_GCC"
347	fi	349	fi
348	fi	350	fi
		351	echo "gcc 2.95 support is not perfect, suggest upgrade to gcc 3" >>warn
349	fi	352	fi
350	fi
351	if test "$COMPATH" != "NO_GCC"; then
352	AC_MSG_RESULT([checked (gcc $_gcc_version)])	353	AC_MSG_RESULT([checked (gcc $_gcc_version)])
353	fi
354		354
355	dnl Set the include paths	355	dnl Set the include paths
356	_gcc_include_path=`$CC -print-search-dirs \| grep instal \|$AWK '{ print \$2 }'`/include	356	_gcc_include_path=`$CC -print-search-dirs \| grep instal \|$AWK '{ print \$2 }'`/include
Lines 373-379 Link Here
373		373
374	dnl Change empty GNUMAKE from warning to error, pending testing.	374	dnl Change empty GNUMAKE from warning to error, pending testing.
375	if test -z "$GNUMAKE"; then	375	if test -z "$GNUMAKE"; then
376	AC_MSG_WARN([not found build may fail]) >> warn	376	AC_MSG_WARN([not found build may fail])
		377	echo "gnu make not found build may fail" >> warn
377	else	378	else
378	_make_version=`$GNUMAKE --version \| grep GNU \| $SED -e 's@^[[^0-9]]@@' -e 's@ .@@' -e 's@,.*@@'`;	379	_make_version=`$GNUMAKE --version \| grep GNU \| $SED -e 's@^[[^0-9]]@@' -e 's@ .@@' -e 's@,.*@@'`;
379	_make_major=`echo $_make_version \| $AWK -F. '{print $1;}'`	380	_make_major=`echo $_make_version \| $AWK -F. '{print $1;}'`
Lines 390-395 Link Here
390	else	391	else
391	if test "$_os" = "Darwin"; then	392	if test "$_os" = "Darwin"; then
392	AC_MSG_WARN([failed ($GNUMAKE $_make_version need 3.79.1+)])	393	AC_MSG_WARN([failed ($GNUMAKE $_make_version need 3.79.1+)])
		394	echo "$GNUMAKE $_make_version may cause problems need 3.79.1+" >> warn
393	else	395	else
394	AC_MSG_ERROR([failed ($GNUMAKE $_make_version need 3.79.1+)])	396	AC_MSG_ERROR([failed ($GNUMAKE $_make_version need 3.79.1+)])
395	fi	397	fi
Lines 414-426 Link Here
414	_workshop_major=`echo $_workshop_version \| $AWK -F. '{ print $1 }'`	416	_workshop_major=`echo $_workshop_version \| $AWK -F. '{ print $1 }'`
415	if test "$_workshop_major" != "5"; then	417	if test "$_workshop_major" != "5"; then
416	AC_MSG_WARN([found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler])	418	AC_MSG_WARN([found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler])
417	AC_MSG_WARN([found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler]) >> warn	419	echo "found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler" >> warn
418	COMPATH="NO_COMPATH"	420	COMPATH="NO_COMPATH"
419	else	421	else
420	_workshop_minor=`echo $_workshop_version \| $AWK -F. '{ if ($2 == 0) print "true"; else if ($2 == 2) print "true"; else print "false" }'`	422	_workshop_minor=`echo $_workshop_version \| $AWK -F. '{ if ($2 == 0) print "true"; else if ($2 == 2) print "true"; else print "false" }'`
421	if test "$_workshop_minor" = "false"; then	423	if test "$_workshop_minor" = "false"; then
422	AC_MSG_WARN([found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler])	424	AC_MSG_WARN([found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler])
423	AC_MSG_WARN([found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler]) >> warn	425	echo "found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler" >> warn
424	COMPATH="NO_COMPATH"	426	COMPATH="NO_COMPATH"
425	else	427	else
426	dnl compiler will do	428	dnl compiler will do
Lines 443-455 Link Here
443	_mipspro_major=`echo $_mipspro_version \| $AWK -F. '{ print $1 }'`	445	_mipspro_major=`echo $_mipspro_version \| $AWK -F. '{ print $1 }'`
444	if test "$_mipspro_major" != "7"; then	446	if test "$_mipspro_major" != "7"; then
445	AC_MSG_WARN([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler])	447	AC_MSG_WARN([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler])
446	AC_MSG_WARN([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler]) >> warn	448	echo "found version $_mipspro_version, use version 7.2+ of the SGI MIPSpro C compiler" >> warn
447	COMPATH="NO_COMPATH"	449	COMPATH="NO_COMPATH"
448	else	450	else
449	_mipspro_minor=`echo $_mipspro_version \| $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'`	451	_mipspro_minor=`echo $_mipspro_version \| $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'`
450	if test "$_mipspro_minor" = "false"; then	452	if test "$_mipspro_minor" = "false"; then
451	AC_MSG_WARN([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler])	453	AC_MSG_WARN([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler])
452	AC_MSG_WARN([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler]) >> warn	454	echo "found version $_mipspro_version, use version 7.2+ of the SGI MIPSpro C compiler" >> warn
453	COMPATH="NO_COMPATH"	455	COMPATH="NO_COMPATH"
454	else	456	else
455	dnl compiler will do	457	dnl compiler will do
Lines 473-479 Link Here
473	_compaqc_major=`echo $_compaqc_version \| $AWK -F. '{ print $1 }'`	475	_compaqc_major=`echo $_compaqc_version \| $AWK -F. '{ print $1 }'`
474	if test "$_compaqc_major" != "T6"; then	476	if test "$_compaqc_major" != "T6"; then
475	AC_MSG_WARN([found version "$_compaqc_version", use version 6 of the Compaq C compiler])	477	AC_MSG_WARN([found version "$_compaqc_version", use version 6 of the Compaq C compiler])
476	AC_MSG_WARN([found version "$_compaqc_version", use version 6 of the Compaq C compiler]) >> warn	478	echo "found version "$_compaqc_version", use version 6 of the Compaq C compiler" >> warn
477	COMPATH="NO_COMPATH"	479	COMPATH="NO_COMPATH"
478	else	480	else
479	dnl compiler will do	481	dnl compiler will do
Lines 530-536 Link Here
530	AC_MSG_RESULT([yes])	532	AC_MSG_RESULT([yes])
531	else	533	else
532	AC_MSG_WARN([pam_appl.h could not be found in /usr/include/security])	534	AC_MSG_WARN([pam_appl.h could not be found in /usr/include/security])
533	AC_MSG_WARN([pam_appl.h could not be found in /usr/include/security]) >> warn	535	echo "pam_appl.h could not be found in /usr/include/security" >> warn
534	fi	536	fi
535	fi	537	fi
536		538
Lines 576-582 Link Here
576	AC_MSG_CHECKING([Sun Workshop C++ Compiler])	578	AC_MSG_CHECKING([Sun Workshop C++ Compiler])
577	if test "$CXX" != "CC"; then	579	if test "$CXX" != "CC"; then
578	AC_MSG_WARN([Sun Workshop C++ was not found])	580	AC_MSG_WARN([Sun Workshop C++ was not found])
579	AC_MSG_WARN([Sun Worlshop C++ was not found]) >> warn	581	echo "Sun Workshop C++ was not found" >> warn
580	else	582	else
581	AC_MSG_RESULT([checked])	583	AC_MSG_RESULT([checked])
582	fi	584	fi
Lines 591-597 Link Here
591	AC_MSG_CHECKING([Macosx c++ Compiler])	593	AC_MSG_CHECKING([Macosx c++ Compiler])
592	if test "$CXX" != "c++"; then	594	if test "$CXX" != "c++"; then
593	AC_MSG_WARN([Macosx C++ was not found])	595	AC_MSG_WARN([Macosx C++ was not found])
594	AC_MSG_WARN([Macosx C++ was not found]) >> warn	596	echo "Macosx C++ was not found" >> warn
595	else	597	else
596	AC_MSG_RESULT([checked])	598	AC_MSG_RESULT([checked])
597	fi	599	fi
Lines 606-612 Link Here
606	AC_MSG_CHECKING([SGI MIPSpro C++ Compiler])	608	AC_MSG_CHECKING([SGI MIPSpro C++ Compiler])
607	if test "$CXX" != "CC"; then	609	if test "$CXX" != "CC"; then
608	AC_MSG_WARN([SGI MIPSpro C++ was not found])	610	AC_MSG_WARN([SGI MIPSpro C++ was not found])
609	AC_MSG_WARN([SGI MIPSpro C++ was not found]) >> warn	611	echo "SGI MIPSpro C++ was not found" >> warn
610	else	612	else
611	AC_MSG_RESULT([checked])	613	AC_MSG_RESULT([checked])
612	fi	614	fi
Lines 622-628 Link Here
622	_compaqcxx_major=`echo $_compaqcxx_version \| $AWK -F. '{ print $1 }'`	624	_compaqcxx_major=`echo $_compaqcxx_version \| $AWK -F. '{ print $1 }'`
623	if test "$_compaqcxx_major" != "V6"; then	625	if test "$_compaqcxx_major" != "V6"; then
624	AC_MSG_WARN([found version "$_compaqc_version", use version 6 of the Compaq C++ compiler])	626	AC_MSG_WARN([found version "$_compaqc_version", use version 6 of the Compaq C++ compiler])
625	AC_MSG_WARN([found version "$_compaqc_version", use version 6 of the Compaq C++ compiler]) >> warn	627	echo "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn
626	else	628	else
627	dnl compiler will do	629	dnl compiler will do
628	AC_MSG_RESULT([checked])	630	AC_MSG_RESULT([checked])
Lines 676-682 Link Here
676	AC_MSG_RESULT([found])	678	AC_MSG_RESULT([found])
677	else	679	else
678	AC_MSG_WARN([patch 106327-06 not found, please install compiler patch 106327-06 or greater])	680	AC_MSG_WARN([patch 106327-06 not found, please install compiler patch 106327-06 or greater])
679	AC_MSG_WARN([patch 106327-06 not found, please install compiler patch 106327-06 or greater]) >> warn	681	echo "patch 106327-06 not found, please install compiler patch 106327-06 or greater" >> warn
680	fi	682	fi
681	dnl ***************	683	dnl ***************
682	dnl patch 106950-11	684	dnl patch 106950-11
Lines 698-704 Link Here
698	AC_MSG_RESULT([found])	700	AC_MSG_RESULT([found])
699	else	701	else
700	AC_MSG_WARN([patch 106950-11 not found, please install linker patch 106950-11 or greater])	702	AC_MSG_WARN([patch 106950-11 not found, please install linker patch 106950-11 or greater])
701	AC_MSG_WARN([patch 106950-11 not found, please install linker patch 106950-11 or greater]) >> warn	703	echo "patch 106950-11 not found, please install linker patch 106950-11 or greater" >> warn
702	fi	704	fi
703	else	705	else
704	if test "$_os_release" = "6"; then	706	if test "$_os_release" = "6"; then
Lines 722-728 Link Here
722	AC_MSG_RESULT([found])	724	AC_MSG_RESULT([found])
723	else	725	else
724	AC_MSG_WARN([patch 105591-09 not found, please install compiler patch 105591-09 or greater])	726	AC_MSG_WARN([patch 105591-09 not found, please install compiler patch 105591-09 or greater])
725	AC_MSG_WARN([patch 105591-09 not found, please install compiler patch 105591-09 or greater]) >> warn	727	echo "patch 105591-09 not found, please install compiler patch 105591-09 or greater" >> warn
726	fi	728	fi
727	dnl ***************	729	dnl ***************
728	dnl patch 107733-08	730	dnl patch 107733-08
Lines 744-750 Link Here
744	AC_MSG_RESULT([found])	746	AC_MSG_RESULT([found])
745	else	747	else
746	AC_MSG_WARN([patch 107733-06 not found, please install linker patch 107733-08 or greater])	748	AC_MSG_WARN([patch 107733-06 not found, please install linker patch 107733-08 or greater])
747	AC_MSG_WARN([patch 107733-06 not found, please install linker patch 107733-08 or greater]) >> warn	749	echo "patch 107733-06 not found, please install linker patch 107733-08 or greater" >> warn
748	fi	750	fi
749	fi	751	fi
750	fi	752	fi
Lines 847-878 Link Here
847	fi	849	fi
848	AC_MSG_CHECKING([the installed JDK])	850	AC_MSG_CHECKING([the installed JDK])
849	if test "$JAVA"; then	851	if test "$JAVA"; then
850	_correct_jdk_exists="false"
851	dnl java -version sends output to stderr!	852	dnl java -version sends output to stderr!
852	_jdk=`$JAVA -J-version 2>&1 \| $AWK -F'"' '{ print \$2 }' \| $SED s/[-A-Za-z]*//`	853	_jdk=`$JAVA -J-version 2>&1 \| $AWK -F'"' '{ print \$2 }' \| $SED s/[-A-Za-z]*//`
853		854
854	_jdk_ver=`echo "$_jdk" \| $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`	855	_jdk_ver=`echo "$_jdk" \| $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
855		856
856	if test "$_jdk_ver" -lt 10300; then	857	if test "$_jdk_ver" -lt 10300; then
857	AC_MSG_WARN([You need at least jdk-1.3])	858	AC_MSG_ERROR([You need at least jdk-1.3])
858	_correct_jdk_exists="false"
859	else	859	else
860	_correct_jdk_exists="true"
861	JAVA_HOME=`echo $JAVA \| $SED -n "s/\/bin\/javac//p"`	860	JAVA_HOME=`echo $JAVA \| $SED -n "s/\/bin\/javac//p"`
862	AC_MSG_RESULT([checked (JDK $_jdk)])	861	AC_MSG_RESULT([checked (JDK $_jdk)])
863	fi	862	fi
864	else	863	else
865	_correct_jdk_exists="false"	864	AC_MSG_ERROR([JAVA not found. You need at least jdk-1.3])
866	fi
867	if test "$_correct_jdk_exists" = "false"; then
868	JAVA_HOME="NO_JAVA_HOME"
869	AC_MSG_WARN([Correct jdk not found])
870	AC_MSG_WARN([Correct jdk not found]) >> warn
871	fi	865	fi
872	dnl ===================================================================	866	dnl ===================================================================
873	dnl Checks for specific files.	867	dnl Checks for specific files.
874	dnl ===================================================================	868	dnl ===================================================================
875	dnl AC_CHECK_FILE(set_soenv.1)
876	dnl ===================================================================	869	dnl ===================================================================
877	dnl Checks for programs.	870	dnl Checks for programs.
878	dnl ===================================================================	871	dnl ===================================================================
Lines 1033-1050 Link Here
1033	dnl ***************************************	1026	dnl ***************************************
1034	AC_PATH_PROG(BISON, bison)	1027	AC_PATH_PROG(BISON, bison)
1035	if test -z "$BISON"; then	1028	if test -z "$BISON"; then
1036	AC_MSG_WARN([no bison found in \$PATH, install bison]) >> warn	1029	AC_MSG_ERROR([no bison found in \$PATH, install bison])
1037	fi	1030	fi
1038	AC_PATH_PROG(FLEX, flex)	1031	AC_PATH_PROG(FLEX, flex)
1039	if test -z "$FLEX"; then	1032	if test -z "$FLEX"; then
1040	AC_MSG_WARN([no flex found in \$PATH, install flex]) >> warn	1033	AC_MSG_ERROR([no flex found in \$PATH, install flex])
1041	fi	1034	fi
1042	dnl ***************************************	1035	dnl ***************************************
1043	dnl testing that patch exists	1036	dnl testing that patch exists
1044	dnl ***************************************	1037	dnl ***************************************
1045	AC_PATH_PROG(PATCH, patch)	1038	AC_PATH_PROG(PATCH, patch)
1046	if test -z "$PATCH"; then	1039	if test -z "$PATCH"; then
1047	AC_MSG_WARN([\"patch\" not found in \$PATH, install the development tool named\"patch"\]) >> warn	1040	AC_MSG_ERROR([\"patch\" not found in \$PATH, install the development tool named\"patch"\])
1048	fi	1041	fi
1049	dnl ***************************************	1042	dnl ***************************************
1050	dnl testing bash tools path on Windows	1043	dnl testing bash tools path on Windows
Lines 1131-1137 Link Here
1131		1124
1132		1125
1133	if test -z "$ANT"; then	1126	if test -z "$ANT"; then
1134	AC_MSG_RESULT([Ant not found - Some Java projects will not build])	1127	AC_MSG_WARN([Ant not found - Some Java projects will not build])
		1128	echo "Ant not found - Some Java projects will not build" >>warn
1135	else	1129	else
1136	AC_MSG_CHECKING([if $ANT works])	1130	AC_MSG_CHECKING([if $ANT works])
1137	cat > conftest.java << EOF	1131	cat > conftest.java << EOF
Lines 1161-1166 Link Here
1161	cat conftest.java >&5	1155	cat conftest.java >&5
1162	cat conftest.xml >&5	1156	cat conftest.xml >&5
1163	AC_MSG_WARN([Ant does not work - Some Java projects will not build!])	1157	AC_MSG_WARN([Ant does not work - Some Java projects will not build!])
		1158	echo "Ant does not work - Some Java projects will not build!" >>warn
1164	fi	1159	fi
1165		1160
1166	rm -f conftest* core core.* *.core	1161	rm -f conftest* core core.* *.core
Lines 1277-1282 Link Here
1277	AC_SUBST(PTHREAD_CFLAGS)	1272	AC_SUBST(PTHREAD_CFLAGS)
1278	AC_SUBST(PTHREAD_LIBS)	1273	AC_SUBST(PTHREAD_LIBS)
1279	AC_SUBST(ENABLE_DEBUG)	1274	AC_SUBST(ENABLE_DEBUG)
		1275	AC_SUBST(ENVCFLAGSCXX)
1280		1276
1281	AC_OUTPUT([set_soenv])	1277	AC_OUTPUT([set_soenv])
1282		1278




     $STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );

# Environment variables.
my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $SHELL, $GCC_HOME,
     $UPD, $SOLARUPD, $WORK_STAMP, $TF_ONE51, $TF_UCB, 
     $URD_ONLY, $SOLARROOT, $SOLARSRC, $RSCRES, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV, 
     $STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI, 

     $LD_LIBRARY_PATH, $PATH, $SOLARDEF, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARINCLUDES, $SOLARLIB, 
     $SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL, 
     $COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
     $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
     $WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
#
#-------------------------------------------

$Macosx         = "Darwin";         # return of uname command on Mac OS X/Darwin
$empty          = "";               # used as argument
$no_jdk         = "NO_JAVA_HOME";   # possible argument
$no_ant         = "NO_ANT_HOME";    # possible argument
$no_stl		= "NO_STLPORT4";    # possible argument
$no_tcsh        = "NO_TCSH";        # possible argument
$no_cl          = "NO_CL";

   {  print "Setting Linux Alpha specific values... ";
      $outfile        = "LinuxAlphaEnv.Set"; 
      $CPU            = "A";
      $CPUNAME        = "ALPHA_";
      $DLLSUFFIX      = "la";
      $OUTPATH        = "unxlnga";
      $JRELIBDIR      = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha";

      $COM            = "CXX";
      $COMPATH        = '@COMPATH@'; 
      $CPU            = "A";
      $CPUNAME        = "ALPHA_";
      $CVER           = "C62";
      $DLLSUFFIX      = "t64";
      $GUI            = "UNX";

   }
}
if ( '@STLPORT4@' eq $no_stl )
{
   $STLPORT4 = "$no_stl";
}


   }
}

# Ant Home directory
if ( '@ANT_HOME@' eq $no_ant )
{  AddWarning( "set_soenv", "Ant was not found in the path.  Some Java projects will not build." );
   $ANT_HOME = "$no_ant";
}
else 
{  # ANT_HOME as argument from autoconf.
   $ANT_HOME = '@ANT_HOME@';
}

#
# E. Determining the envionment values based on the information
#    that was gathered earlier on.

ToFile( "SRC_ROOT",	     $SRC_ROOT,          "e" );
ToFile( "SHELL",             $SHELL,             "e" );
ToFile( "JAVA_HOME",         $JAVA_HOME,         "e" );
ToFile( "ANT_HOME",          "@ANT_HOME@",       "e" );
ToFile( "JDKLIB",            $JAVA_LIB,          "e" );
ToFile( "STLPORT4",          $STLPORT4,          "e" );
ToFile( "ASM_PATH",          $ASM_PATH,          "e" );

if ( $COM ne "MSC" ) {
  ToFile( "LINK",			 $CC,				 "e" );
}
ToFile( "ENVCFLAGSCXX",      "@ENVCFLAGSCXX@",    "e" );
ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@","e" );
ToFile( "BISON_HAIRY",       $BISON_HAIRY,       "e" );
ToFile( "BISON_SIMPLE",      $BISON_SIMPLE,      "e" );
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
if ($platform ne "$Winnt")
{  ToFile( "TEMP",              $TEMP,              "e" );

{  if ( $_[ 2 ] eq "e" ) 
   {  # Write an environment variable to file.
      if (defined $_[ 1 ])
      {  printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout
         if (( $platform ne "$Winnt" ) or ( $USE_SHELL ne "4nt" ))
         {   
         print OUT "$setenv $_[ 0 ] \"$_[ 1 ]\"$newline";          # to tcsh file
         if(defined($outfile_sh))
         {  print OUT_SH "$_[ 0 ]=\"$_[ 1 ]\"$newline";            # to sh file
            $exportvars .= " $_[ 0 ]";                             # add to export list for sh file
         }
         }
         if(defined($outfile_bat))
         {   $win_format_var = WinFormat( $_[ 1 ] );  #Filter for Windows
             print OUT_BAT "IF DEFINED $_[ 0 ] $unset $_[ 0 ] $newline";

         }
      }
      else
      {  printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") ; # to stdout
         if (( $platform ne "$Winnt" ) or ( $USE_SHELL ne "4nt" ))
         {  
         $unsetvars .= "$unsetenv $_[ 0 ] >& /dev/null$newline";            # for tcsh file
         $unsetvarssh .= " $_[ 0 ]";                                        # for sh file
         }
         else
         {  $unsetvars .= "$unset $_[ 0 ] >& NUL$newline";
         }
      }
   }

Return to issue 12442

Lines 79-85 Link Here

(-)set_soenv.in (-23 / +17 lines)
79	$STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );	79	$STLPORT_stlport, $STLPORT_inc_stlport, $PERL_PATH );
80		80
81	# Environment variables.	81	# Environment variables.
82	my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $ANT_HOME, $SHELL, $GCC_HOME,	82	my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $SHELL, $GCC_HOME,
83	$UPD, $SOLARUPD, $WORK_STAMP, $TF_ONE51, $TF_UCB,	83	$UPD, $SOLARUPD, $WORK_STAMP, $TF_ONE51, $TF_UCB,
84	$URD_ONLY, $SOLARROOT, $SOLARSRC, $RSCRES, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV,	84	$URD_ONLY, $SOLARROOT, $SOLARSRC, $RSCRES, $DEVROOT, $SOLARVER, $SOLARVERSION, $SOLARENV,
85	$STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI,	85	$STAR_INIROOT, $STAR_INIROOTOLD, $STAR_STANDLST, $STAR_SSCOMMON, $STAR_SSOLARINI,
Lines 87-93 Link Here
87	$LD_LIBRARY_PATH, $PATH, $SOLARDEF, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARINCLUDES, $SOLARLIB,	87	$LD_LIBRARY_PATH, $PATH, $SOLARDEF, $SOLAREXTRAINC, $SOLAREXTRALIB, $SOLARINCLUDES, $SOLARLIB,
88	$SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL,	88	$SOLARINC, $LOCALINI, $MAC_LIB, $PATHEXTRA, $FRAMEWORKSHOME, $COMEX, $MULTITHREAD_OBJ, $PERL,
89	$COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,	89	$COMP_ENV, $IENV, $ILIB, $WIN_INCLUDE, $JAVAHOME, $WIN_LIB, $WIN_HOME, $PSDK_HOME, $USE_NEW_SDK, $NO_HIDS,
90	$BISON_HAIRY, $BISON_SIMPLE, $TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,	90	$TEMP, $COMMON_BUILD_TOOLS, $WIN_GREP, $WIN_FIND, $WIN_LS,
91	$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );	91	$WIN_GNUCOPY, $WIN_TOUCH, $STLPORT4, $USE_GCC3, $ENABLE_DEBUG );
92	#	92	#
93	#-------------------------------------------	93	#-------------------------------------------
Lines 125-131 Link Here
125	$Macosx = "Darwin"; # return of uname command on Mac OS X/Darwin	125	$Macosx = "Darwin"; # return of uname command on Mac OS X/Darwin
126	$empty = ""; # used as argument	126	$empty = ""; # used as argument
127	$no_jdk = "NO_JAVA_HOME"; # possible argument	127	$no_jdk = "NO_JAVA_HOME"; # possible argument
128	$no_ant = "NO_ANT_HOME"; # possible argument
129	$no_stl = "NO_STLPORT4"; # possible argument	128	$no_stl = "NO_STLPORT4"; # possible argument
130	$no_tcsh = "NO_TCSH"; # possible argument	129	$no_tcsh = "NO_TCSH"; # possible argument
131	$no_cl = "NO_CL";	130	$no_cl = "NO_CL";
Lines 390-396 Link Here
390	{ print "Setting Linux Alpha specific values... ";	389	{ print "Setting Linux Alpha specific values... ";
391	$outfile = "LinuxAlphaEnv.Set";	390	$outfile = "LinuxAlphaEnv.Set";
392	$CPU = "A";	391	$CPU = "A";
393	$CPUNAME = "ALPHA";	392	$CPUNAME = "ALPHA_";
394	$DLLSUFFIX = "la";	393	$DLLSUFFIX = "la";
395	$OUTPATH = "unxlnga";	394	$OUTPATH = "unxlnga";
396	$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha";	395	$JRELIBDIR = '$JAVA_HOME'.$ds."jre".$ds."lib".$ds."alpha";
Lines 449-455 Link Here
449	$COM = "CXX";	448	$COM = "CXX";
450	$COMPATH = '@COMPATH@';	449	$COMPATH = '@COMPATH@';
451	$CPU = "A";	450	$CPU = "A";
452	$CPUNAME = "ALPHA";	451	$CPUNAME = "ALPHA_";
453	$CVER = "C62";	452	$CVER = "C62";
454	$DLLSUFFIX = "t64";	453	$DLLSUFFIX = "t64";
455	$GUI = "UNX";	454	$GUI = "UNX";
Lines 654-660 Link Here
654	}	653	}
655	}	654	}
656	if ( '@STLPORT4@' eq $no_stl )	655	if ( '@STLPORT4@' eq $no_stl )
657	{ AddWarning( "set_soenv", "No path to STLport was given with the --with-stlport4-home option. The one provided with OOo will be build." );	656	{
658	$STLPORT4 = "$no_stl";	657	$STLPORT4 = "$no_stl";
659	}	658	}
660		659
Lines 710-725 Link Here
710	}	709	}
711	}	710	}
712		711
713	# Ant Home directory
714	if ( '@ANT_HOME@' eq $no_ant )
715	{ AddWarning( "set_soenv", "Ant was not found in the path. Some Java projects will not build." );
716	$ANT_HOME = "$no_ant";
717	}
718	else
719	{ # ANT_HOME as argument from autoconf.
720	$ANT_HOME = '@ANT_HOME@';
721	}
722
723	#	712	#
724	# E. Determining the envionment values based on the information	713	# E. Determining the envionment values based on the information
725	# that was gathered earlier on.	714	# that was gathered earlier on.
Lines 1362-1368 Link Here
1362	ToFile( "SRC_ROOT", $SRC_ROOT, "e" );	1351	ToFile( "SRC_ROOT", $SRC_ROOT, "e" );
1363	ToFile( "SHELL", $SHELL, "e" );	1352	ToFile( "SHELL", $SHELL, "e" );
1364	ToFile( "JAVA_HOME", $JAVA_HOME, "e" );	1353	ToFile( "JAVA_HOME", $JAVA_HOME, "e" );
1365	ToFile( "ANT_HOME", $ANT_HOME, "e" );	1354	ToFile( "ANT_HOME", "@ANT_HOME@", "e" );
1366	ToFile( "JDKLIB", $JAVA_LIB, "e" );	1355	ToFile( "JDKLIB", $JAVA_LIB, "e" );
1367	ToFile( "STLPORT4", $STLPORT4, "e" );	1356	ToFile( "STLPORT4", $STLPORT4, "e" );
1368	ToFile( "ASM_PATH", $ASM_PATH, "e" );	1357	ToFile( "ASM_PATH", $ASM_PATH, "e" );
Lines 1685-1693 Link Here
1685	if ( $COM ne "MSC" ) {	1674	if ( $COM ne "MSC" ) {
1686	ToFile( "LINK", $CC, "e" );	1675	ToFile( "LINK", $CC, "e" );
1687	}	1676	}
		1677	ToFile( "ENVCFLAGSCXX", "@ENVCFLAGSCXX@", "e" );
1688	ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@","e" );	1678	ToFile( "GXX_INCLUDE_PATH", "@GXX_INCLUDE_PATH@","e" );
1689	ToFile( "BISON_HAIRY", $BISON_HAIRY, "e" );
1690	ToFile( "BISON_SIMPLE", $BISON_SIMPLE, "e" );
1691	ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );	1679	ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
1692	if ($platform ne "$Winnt")	1680	if ($platform ne "$Winnt")
1693	{ ToFile( "TEMP", $TEMP, "e" );	1681	{ ToFile( "TEMP", $TEMP, "e" );
Lines 2009-2020 Link Here
2009	{ if ( $_[ 2 ] eq "e" )	1997	{ if ( $_[ 2 ] eq "e" )
2010	{ # Write an environment variable to file.	1998	{ # Write an environment variable to file.
2011	if (defined $_[ 1 ])	1999	if (defined $_[ 1 ])
2012	{ printf("%-12s %-17s %-10s %-39s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout	2000	{ printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout
		2001	if (( $platform ne "$Winnt" ) or ( $USE_SHELL ne "4nt" ))
		2002	{
2013	print OUT "$setenv $_[ 0 ] \"$_[ 1 ]\"$newline"; # to tcsh file	2003	print OUT "$setenv $_[ 0 ] \"$_[ 1 ]\"$newline"; # to tcsh file
2014	if(defined($outfile_sh))	2004	if(defined($outfile_sh))
2015	{ print OUT_SH "$_[ 0 ]=\"$_[ 1 ]\"$newline"; # to sh file	2005	{ print OUT_SH "$_[ 0 ]=\"$_[ 1 ]\"$newline"; # to sh file
2016	$exportvars .= " $_[ 0 ]"; # add to export list for sh file	2006	$exportvars .= " $_[ 0 ]"; # add to export list for sh file
2017	}	2007	}
		2008	}
2018	if(defined($outfile_bat))	2009	if(defined($outfile_bat))
2019	{ $win_format_var = WinFormat( $_[ 1 ] ); #Filter for Windows	2010	{ $win_format_var = WinFormat( $_[ 1 ] ); #Filter for Windows
2020	print OUT_BAT "IF DEFINED $_[ 0 ] $unset $_[ 0 ] $newline";	2011	print OUT_BAT "IF DEFINED $_[ 0 ] $unset $_[ 0 ] $newline";
Lines 2022-2032 Link Here
2022	}	2013	}
2023	}	2014	}
2024	else	2015	else
2025	{ printf("%-12s %-17s %-10s %-39s\n", "The variable", $_[ 0 ], "is set to:", "unset") ; # to stdout	2016	{ printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") ; # to stdout
		2017	if (( $platform ne "$Winnt" ) or ( $USE_SHELL ne "4nt" ))
		2018	{
2026	$unsetvars .= "$unsetenv $_[ 0 ] >& /dev/null$newline"; # for tcsh file	2019	$unsetvars .= "$unsetenv $_[ 0 ] >& /dev/null$newline"; # for tcsh file
2027	$unsetvarssh .= " $_[ 0 ]"; # for sh file	2020	$unsetvarssh .= " $_[ 0 ]"; # for sh file
2028	if(defined($outfile_bat))	2021	}
2029	{ $unsetvarsbat .= "$unset $_[ 0 ] >& NUL$newline";	2022	else
		2023	{ $unsetvars .= "$unset $_[ 0 ] >& NUL$newline";
2030	}	2024	}
2031	}	2025	}
2032	}	2026	}