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

(-)configure (-80 / +73 lines)
Lines 271-277 PACKAGE_VERSION= Link Here
271
PACKAGE_STRING=
271
PACKAGE_STRING=
272
PACKAGE_BUGREPORT=
272
PACKAGE_BUGREPORT=
273
273
274
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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH _cc CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP JAVA PERL TCSH X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS BISON FLEX PATCH CYGWIN ML_EXE ZIP_EXE ANT ANT_HOME GCC_INCLUDE_PATH GXX_INCLUDE_PATH GCC_HOME GNUMAKE JAVA_HOME XLIB XINC LOCAL_SOLENV LOCAL_SOLVER UPD STLPORT4 WITH_LANG PSDK_HOME ASM_HOME UNZIP_HOME WITH_MINGWIN USE_SHELL EXCEPTIONS OSVERSION USE_GCC3 PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_DEBUG LIBOBJS LTLIBOBJS'
274
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 CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH _cc CPP EGREP CXX CXXFLAGS ac_ct_CXX CXXCPP JAVA PERL TCSH X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS BISON FLEX PATCH CYGWIN ML_EXE ZIP_EXE ANT ANT_HOME GCC_INCLUDE_PATH GXX_INCLUDE_PATH GCC_HOME GNUMAKE JAVA_HOME XLIB XINC LOCAL_SOLENV LOCAL_SOLVER UPD STLPORT4 WITH_LANG PSDK_HOME ASM_HOME UNZIP_HOME WITH_MINGWIN USE_SHELL EXCEPTIONS OSVERSION USE_GCC3 PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_DEBUG ENVCFLAGSCXX LIBOBJS LTLIBOBJS'
275
ac_subst_files=''
275
ac_subst_files=''
276
276
277
# Initialize some variables set by options.
277
# Initialize some variables set by options.
Lines 820-826 Optional Features: Link Here
820
  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
820
  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
821
  --enable-gcc3          Deprecated: Now has no effect, checks compiler version.
821
  --enable-gcc3          Deprecated: Now has no effect, checks compiler version.
822
822
823
  --enable-debug          if you like to build with debug symbols
823
  --enable-symbols        if you like to build with symbols in the final build.
824
                          Warning: This creates a large build of about 8 gig.
825
826
                          Usage: --enable-symbols
827
828
  --enable-debug          if you like to build with debug symbols and extra
829
                          debugging code.  This creates a LARGE build (8 gig)
824
830
825
                          Usage: --enable-debug
831
                          Usage: --enable-debug
826
832
Lines 1352-1357 if test "${enable_gcc3+set}" = set; then Link Here
1352
  enableval="$enable_gcc3"
1358
  enableval="$enable_gcc3"
1353
1359
1354
fi;
1360
fi;
1361
# Check whether --enable-symbols or --disable-symbols was given.
1362
if test "${enable_symbols+set}" = set; then
1363
  enableval="$enable_symbols"
1364
1365
fi;
1355
# Check whether --enable-debug or --disable-debug was given.
1366
# Check whether --enable-debug or --disable-debug was given.
1356
if test "${enable_debug+set}" = set; then
1367
if test "${enable_debug+set}" = set; then
1357
  enableval="$enable_debug"
1368
  enableval="$enable_debug"
Lines 1660-1665 esac Link Here
1660
echo "$as_me:$LINENO: result: checked ($_os)" >&5
1671
echo "$as_me:$LINENO: result: checked ($_os)" >&5
1661
echo "${ECHO_T}checked ($_os)" >&6
1672
echo "${ECHO_T}checked ($_os)" >&6
1662
1673
1674
if test "$enable_symbols" = "yes"; then
1675
   ENVCFLAGSCXX="-g"
1676
else
1677
   ENVCFLAGSCXX=""
1678
fi
1663
1679
1664
if test $_os = "WINNT" -a $CygwinVer = "true"; then
1680
if test $_os = "WINNT" -a $CygwinVer = "true"; then
1665
   if test "$with_use_shell" = "0"; then
1681
   if test "$with_use_shell" = "0"; then
Lines 2654-2696 if test "$GCC" = "yes"; then Link Here
2654
echo $ECHO_N "checking the GNU gcc compiler version... $ECHO_C" >&6
2670
echo $ECHO_N "checking the GNU gcc compiler version... $ECHO_C" >&6
2655
    _gcc_version=`$CC -dumpversion`
2671
    _gcc_version=`$CC -dumpversion`
2656
   _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
2672
   _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'`
2657
   if test "$_gcc_major" = "3"; then
2673
   _gcc_middle=`echo $_gcc_version | $AWK -F. '{ print \$2 }'`
2674
   _gcc_longver=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
2658
2675
2659
      USE_GCC3="TRUE"
2660
2676
2677
   if test "$_gcc_longver" -lt "030200" ; then
2678
      ENVCFLAGSCXX="$ENVCFLAGSCXX -fno-rtti"
2679
   fi
2680
2681
   if test "$_gcc_major" = "3"; then
2682
      USE_GCC3="TRUE"
2661
   else
2683
   else
2662
      USE_GCC3="FALSE"
2684
      USE_GCC3="FALSE"
2663
2685
      if test "$_gcc_longver"  -lt "029502"; then
2664
      if test "$_gcc_major" != "2"; then
2686
         { { echo "$as_me:$LINENO: error: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&5
2665
         { echo "$as_me:$LINENO: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&5
2687
echo "$as_me: error: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&2;}
2666
echo "$as_me: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&2;}
2688
   { (exit 1); exit 1; }; }
2667
         { echo "$as_me:$LINENO: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&5
2689
      else
2668
echo "$as_me: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&2;} >> warn
2690
         if test "$_gcc_longver" -gt "029599"; then
2669
         COMPATH="NO_GCC"
2691
            { { echo "$as_me:$LINENO: error: found version \"$_gcc_version\", Not supported. Upgrade to gcc 3" >&5
2670
      else
2692
echo "$as_me: error: found version \"$_gcc_version\", Not supported. Upgrade to gcc 3" >&2;}
2671
         _gcc_middle=`$CC -dumpversion | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'`
2693
   { (exit 1); exit 1; }; }
2672
         if test "$_gcc_middle" = "false"; then
2673
            { echo "$as_me:$LINENO: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&5
2674
echo "$as_me: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&2;}
2675
            { echo "$as_me:$LINENO: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&5
2676
echo "$as_me: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&2;} >> warn
2677
            COMPATH="NO_GCC"
2678
         else
2679
            _gcc_minor=`$CC -dumpversion | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'`
2680
            if test "$_gcc_minor" = "false"; then
2681
               { echo "$as_me:$LINENO: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&5
2682
echo "$as_me: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&2;}
2683
               { echo "$as_me:$LINENO: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&5
2684
echo "$as_me: WARNING: found version \"$_gcc_version\", use version 2.95.2+ of the gcc compiler" >&2;} >> warn
2685
               COMPATH="NO_GCC"
2686
            fi
2687
         fi
2694
         fi
2688
      fi
2695
      fi
2696
	  echo "gcc 2.95 support is not perfect, suggest upgrade to gcc 3" >>warn
2689
   fi
2697
   fi
2690
   if test "$COMPATH" != "NO_GCC"; then
2691
      echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5
2698
      echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5
2692
echo "${ECHO_T}checked (gcc $_gcc_version)" >&6
2699
echo "${ECHO_T}checked (gcc $_gcc_version)" >&6
2693
   fi
2694
2700
2695
   _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
2701
   _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include
2696
   if test "$_gcc_include_path" = "/usr/libexec/(null)/include"; then
2702
   if test "$_gcc_include_path" = "/usr/libexec/(null)/include"; then
Lines 2710-2716 done ; Link Here
2710
2716
2711
if test -z "$GNUMAKE"; then
2717
if test -z "$GNUMAKE"; then
2712
    { echo "$as_me:$LINENO: WARNING: not found build may fail" >&5
2718
    { echo "$as_me:$LINENO: WARNING: not found build may fail" >&5
2713
echo "$as_me: WARNING: not found build may fail" >&2;} >> warn
2719
echo "$as_me: WARNING: not found build may fail" >&2;}
2720
    echo "gnu make not found build may fail" >> warn
2714
else
2721
else
2715
    _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
2722
    _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
2716
    _make_major=`echo $_make_version | $AWK -F. '{print $1;}'`
2723
    _make_major=`echo $_make_version | $AWK -F. '{print $1;}'`
Lines 2731-2736 echo "${ECHO_T}checked ($GNUMAKE $_make_ Link Here
2731
             if test "$_os" = "Darwin"; then
2738
             if test "$_os" = "Darwin"; then
2732
                 { echo "$as_me:$LINENO: WARNING: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5
2739
                 { echo "$as_me:$LINENO: WARNING: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5
2733
echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;}
2740
echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;}
2741
                 echo "$GNUMAKE $_make_version may cause problems need 3.79.1+" >> warn
2734
			 else
2742
			 else
2735
                 { { echo "$as_me:$LINENO: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5
2743
                 { { echo "$as_me:$LINENO: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5
2736
echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;}
2744
echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;}
Lines 2798-2813 echo $ECHO_N "checking the SUN Workshop Link Here
2798
      if test "$_workshop_major" != "5"; then
2806
      if test "$_workshop_major" != "5"; then
2799
         { echo "$as_me:$LINENO: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&5
2807
         { echo "$as_me:$LINENO: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&5
2800
echo "$as_me: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&2;}
2808
echo "$as_me: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&2;}
2801
         { echo "$as_me:$LINENO: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&5
2809
         echo "found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler" >> warn
2802
echo "$as_me: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&2;} >> warn
2803
         COMPATH="NO_COMPATH"
2810
         COMPATH="NO_COMPATH"
2804
      else
2811
      else
2805
         _workshop_minor=`echo $_workshop_version | $AWK -F. '{ if ($2 == 0) print "true"; else if ($2 == 2) print "true"; else print "false" }'`
2812
         _workshop_minor=`echo $_workshop_version | $AWK -F. '{ if ($2 == 0) print "true"; else if ($2 == 2) print "true"; else print "false" }'`
2806
         if test "$_workshop_minor" = "false"; then
2813
         if test "$_workshop_minor" = "false"; then
2807
            { echo "$as_me:$LINENO: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&5
2814
            { echo "$as_me:$LINENO: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&5
2808
echo "$as_me: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&2;}
2815
echo "$as_me: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&2;}
2809
            { echo "$as_me:$LINENO: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&5
2816
            echo "found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler" >> warn
2810
echo "$as_me: WARNING: found version \"$_workshop_version\", use version 5.0 or 5.2 of the Sun Workshop C compiler" >&2;} >> warn
2811
            COMPATH="NO_COMPATH"
2817
            COMPATH="NO_COMPATH"
2812
         else
2818
         else
2813
                        echo "$as_me:$LINENO: result: checked" >&5
2819
                        echo "$as_me:$LINENO: result: checked" >&5
Lines 2871-2886 echo $ECHO_N "checking the SGI MIPSpro C Link Here
2871
      if test "$_mipspro_major" != "7"; then
2877
      if test "$_mipspro_major" != "7"; then
2872
         { echo "$as_me:$LINENO: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5
2878
         { echo "$as_me:$LINENO: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5
2873
echo "$as_me: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;}
2879
echo "$as_me: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;}
2874
         { echo "$as_me:$LINENO: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5
2880
         echo "found version $_mipspro_version, use version 7.2+ of the SGI MIPSpro C compiler" >> warn
2875
echo "$as_me: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} >> warn
2876
         COMPATH="NO_COMPATH"
2881
         COMPATH="NO_COMPATH"
2877
      else
2882
      else
2878
         _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'`
2883
         _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'`
2879
         if test "$_mipspro_minor" = "false"; then
2884
         if test "$_mipspro_minor" = "false"; then
2880
            { echo "$as_me:$LINENO: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5
2885
            { echo "$as_me:$LINENO: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5
2881
echo "$as_me: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;}
2886
echo "$as_me: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;}
2882
            { echo "$as_me:$LINENO: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&5
2887
            echo "found version $_mipspro_version, use version 7.2+ of the SGI MIPSpro C compiler" >> warn
2883
echo "$as_me: WARNING: found version \"$_mipspro_version\", use version 7.2+ of the SGI MIPSpro C compiler" >&2;} >> warn
2884
            COMPATH="NO_COMPATH"
2888
            COMPATH="NO_COMPATH"
2885
         else
2889
         else
2886
                        echo "$as_me:$LINENO: result: checked" >&5
2890
                        echo "$as_me:$LINENO: result: checked" >&5
Lines 2946-2953 echo $ECHO_N "checking the Compaq C comp Link Here
2946
      if test "$_compaqc_major" != "T6"; then
2950
      if test "$_compaqc_major" != "T6"; then
2947
         { echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&5
2951
         { echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&5
2948
echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;}
2952
echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;}
2949
         { echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&5
2953
         echo "found version "$_compaqc_version", use version 6 of the Compaq C compiler" >> warn
2950
echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;} >> warn
2951
         COMPATH="NO_COMPATH"
2954
         COMPATH="NO_COMPATH"
2952
      else
2955
      else
2953
                  echo "$as_me:$LINENO: result: checked" >&5
2956
                  echo "$as_me:$LINENO: result: checked" >&5
Lines 3450-3457 echo "${ECHO_T}yes" >&6 Link Here
3450
   else
3453
   else
3451
      { echo "$as_me:$LINENO: WARNING: pam_appl.h could not be found in /usr/include/security" >&5
3454
      { echo "$as_me:$LINENO: WARNING: pam_appl.h could not be found in /usr/include/security" >&5
3452
echo "$as_me: WARNING: pam_appl.h could not be found in /usr/include/security" >&2;}
3455
echo "$as_me: WARNING: pam_appl.h could not be found in /usr/include/security" >&2;}
3453
      { echo "$as_me:$LINENO: WARNING: pam_appl.h could not be found in /usr/include/security" >&5
3456
      echo "pam_appl.h could not be found in /usr/include/security" >> warn
3454
echo "$as_me: WARNING: pam_appl.h could not be found in /usr/include/security" >&2;} >> warn
3455
   fi
3457
   fi
3456
fi
3458
fi
3457
3459
Lines 3805-3812 echo $ECHO_N "checking Sun Workshop C++ Link Here
3805
      if test "$CXX" != "CC"; then
3807
      if test "$CXX" != "CC"; then
3806
         { echo "$as_me:$LINENO: WARNING: Sun Workshop C++ was not found" >&5
3808
         { echo "$as_me:$LINENO: WARNING: Sun Workshop C++ was not found" >&5
3807
echo "$as_me: WARNING: Sun Workshop C++ was not found" >&2;}
3809
echo "$as_me: WARNING: Sun Workshop C++ was not found" >&2;}
3808
         { echo "$as_me:$LINENO: WARNING: Sun Worlshop C++ was not found" >&5
3810
         echo "Sun Workshop C++ was not found" >> warn
3809
echo "$as_me: WARNING: Sun Worlshop C++ was not found" >&2;} >> warn
3810
      else
3811
      else
3811
         echo "$as_me:$LINENO: result: checked" >&5
3812
         echo "$as_me:$LINENO: result: checked" >&5
3812
echo "${ECHO_T}checked" >&6
3813
echo "${ECHO_T}checked" >&6
Lines 3820-3827 echo $ECHO_N "checking Macosx c++ Compil Link Here
3820
      if test "$CXX" != "c++"; then
3821
      if test "$CXX" != "c++"; then
3821
         { echo "$as_me:$LINENO: WARNING: Macosx C++ was not found" >&5
3822
         { echo "$as_me:$LINENO: WARNING: Macosx C++ was not found" >&5
3822
echo "$as_me: WARNING: Macosx C++ was not found" >&2;}
3823
echo "$as_me: WARNING: Macosx C++ was not found" >&2;}
3823
         { echo "$as_me:$LINENO: WARNING: Macosx C++ was not found" >&5
3824
         echo "Macosx C++ was not found" >> warn
3824
echo "$as_me: WARNING: Macosx C++ was not found" >&2;} >> warn
3825
      else
3825
      else
3826
         echo "$as_me:$LINENO: result: checked" >&5
3826
         echo "$as_me:$LINENO: result: checked" >&5
3827
echo "${ECHO_T}checked" >&6
3827
echo "${ECHO_T}checked" >&6
Lines 3835-3842 echo $ECHO_N "checking SGI MIPSpro C++ C Link Here
3835
      if test "$CXX" != "CC"; then
3835
      if test "$CXX" != "CC"; then
3836
         { echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5
3836
         { echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5
3837
echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;}
3837
echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;}
3838
         { echo "$as_me:$LINENO: WARNING: SGI MIPSpro C++ was not found" >&5
3838
         echo "SGI MIPSpro C++ was not found" >> warn
3839
echo "$as_me: WARNING: SGI MIPSpro C++ was not found" >&2;} >> warn
3840
      else
3839
      else
3841
         echo "$as_me:$LINENO: result: checked" >&5
3840
         echo "$as_me:$LINENO: result: checked" >&5
3842
echo "${ECHO_T}checked" >&6
3841
echo "${ECHO_T}checked" >&6
Lines 3851-3858 echo $ECHO_N "checking Compaq C++ compil Link Here
3851
   if test "$_compaqcxx_major" != "V6"; then
3850
   if test "$_compaqcxx_major" != "V6"; then
3852
      { echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&5
3851
      { echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&5
3853
echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;}
3852
echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;}
3854
      { echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&5
3853
      echo "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn
3855
echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;} >> warn
3856
   else
3854
   else
3857
            echo "$as_me:$LINENO: result: checked" >&5
3855
            echo "$as_me:$LINENO: result: checked" >&5
3858
echo "${ECHO_T}checked" >&6
3856
echo "${ECHO_T}checked" >&6
Lines 3949-3956 echo "${ECHO_T}found" >&6 Link Here
3949
      else
3947
      else
3950
         { echo "$as_me:$LINENO: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5
3948
         { echo "$as_me:$LINENO: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5
3951
echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;}
3949
echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;}
3952
         { echo "$as_me:$LINENO: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5
3950
         echo "patch 106327-06 not found, please install compiler patch 106327-06 or greater" >> warn
3953
echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;} >> warn
3954
      fi
3951
      fi
3955
                        echo "$as_me:$LINENO: checking for patch 106950-11 or greater" >&5
3952
                        echo "$as_me:$LINENO: checking for patch 106950-11 or greater" >&5
3956
echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6
3953
echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6
Lines 3972-3979 echo "${ECHO_T}found" >&6 Link Here
3972
      else
3969
      else
3973
         { echo "$as_me:$LINENO: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5
3970
         { echo "$as_me:$LINENO: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5
3974
echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;}
3971
echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;}
3975
         { echo "$as_me:$LINENO: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5
3972
         echo "patch 106950-11 not found, please install linker patch 106950-11 or greater" >> warn
3976
echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;} >> warn
3977
      fi
3973
      fi
3978
   else
3974
   else
3979
      if test "$_os_release" = "6"; then
3975
      if test "$_os_release" = "6"; then
Lines 3997-4004 echo "${ECHO_T}found" >&6 Link Here
3997
         else
3993
         else
3998
            { echo "$as_me:$LINENO: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5
3994
            { echo "$as_me:$LINENO: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5
3999
echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;}
3995
echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;}
4000
            { echo "$as_me:$LINENO: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5
3996
            echo "patch 105591-09 not found, please install compiler patch 105591-09 or greater" >> warn
4001
echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;} >> warn
4002
         fi
3997
         fi
4003
                                    echo "$as_me:$LINENO: checking for patch 107733-08 or greater" >&5
3998
                                    echo "$as_me:$LINENO: checking for patch 107733-08 or greater" >&5
4004
echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6
3999
echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6
Lines 4020-4027 echo "${ECHO_T}found" >&6 Link Here
4020
         else
4015
         else
4021
            { echo "$as_me:$LINENO: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5
4016
            { echo "$as_me:$LINENO: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5
4022
echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;}
4017
echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;}
4023
            { echo "$as_me:$LINENO: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5
4018
            echo "patch 107733-06 not found, please install linker patch 107733-08 or greater" >> warn
4024
echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;} >> warn
4025
         fi
4019
         fi
4026
      fi
4020
      fi
4027
   fi
4021
   fi
Lines 4478-4507 fi Link Here
4478
echo "$as_me:$LINENO: checking the installed JDK" >&5
4472
echo "$as_me:$LINENO: checking the installed JDK" >&5
4479
echo $ECHO_N "checking the installed JDK... $ECHO_C" >&6
4473
echo $ECHO_N "checking the installed JDK... $ECHO_C" >&6
4480
if test "$JAVA"; then
4474
if test "$JAVA"; then
4481
   _correct_jdk_exists="false"
4482
      _jdk=`$JAVA -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/-A-Za-z*//`
4475
      _jdk=`$JAVA -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/-A-Za-z*//`
4483
4476
4484
   _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
4477
   _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
4485
4478
4486
   if test "$_jdk_ver" -lt 10300; then
4479
   if test "$_jdk_ver" -lt 10300; then
4487
	{ echo "$as_me:$LINENO: WARNING: You need at least jdk-1.3" >&5
4480
        { { echo "$as_me:$LINENO: error: You need at least jdk-1.3" >&5
4488
echo "$as_me: WARNING: You need at least jdk-1.3" >&2;}
4481
echo "$as_me: error: You need at least jdk-1.3" >&2;}
4489
        _correct_jdk_exists="false"
4482
   { (exit 1); exit 1; }; }
4490
   else
4483
   else
4491
      _correct_jdk_exists="true"
4492
      JAVA_HOME=`echo $JAVA | $SED -n "s/\/bin\/javac//p"`
4484
      JAVA_HOME=`echo $JAVA | $SED -n "s/\/bin\/javac//p"`
4493
      echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5
4485
      echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5
4494
echo "${ECHO_T}checked (JDK $_jdk)" >&6
4486
echo "${ECHO_T}checked (JDK $_jdk)" >&6
4495
   fi
4487
   fi
4496
else
4488
else
4497
   _correct_jdk_exists="false"
4489
   { { echo "$as_me:$LINENO: error: JAVA not found. You need at least jdk-1.3" >&5
4498
fi
4490
echo "$as_me: error: JAVA not found. You need at least jdk-1.3" >&2;}
4499
if test "$_correct_jdk_exists" = "false"; then
4491
   { (exit 1); exit 1; }; }
4500
   JAVA_HOME="NO_JAVA_HOME"
4501
   { echo "$as_me:$LINENO: WARNING: Correct jdk not found" >&5
4502
echo "$as_me: WARNING: Correct jdk not found" >&2;}
4503
   { echo "$as_me:$LINENO: WARNING: Correct jdk not found" >&5
4504
echo "$as_me: WARNING: Correct jdk not found" >&2;} >> warn
4505
fi
4492
fi
4506
if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
4493
if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "NetBSD" ; then
4507
   ac_ext=c
4494
   ac_ext=c
Lines 6534-6541 echo "${ECHO_T}no" >&6 Link Here
6534
fi
6521
fi
6535
6522
6536
if test -z "$BISON"; then
6523
if test -z "$BISON"; then
6537
   { echo "$as_me:$LINENO: WARNING: no bison found in \$PATH, install bison" >&5
6524
   { { echo "$as_me:$LINENO: error: no bison found in \$PATH, install bison" >&5
6538
echo "$as_me: WARNING: no bison found in \$PATH, install bison" >&2;} >> warn
6525
echo "$as_me: error: no bison found in \$PATH, install bison" >&2;}
6526
   { (exit 1); exit 1; }; }
6539
fi
6527
fi
6540
# Extract the first word of "flex", so it can be a program name with args.
6528
# Extract the first word of "flex", so it can be a program name with args.
6541
set dummy flex; ac_word=$2
6529
set dummy flex; ac_word=$2
Lines 6577-6584 echo "${ECHO_T}no" >&6 Link Here
6577
fi
6565
fi
6578
6566
6579
if test -z "$FLEX"; then
6567
if test -z "$FLEX"; then
6580
   { echo "$as_me:$LINENO: WARNING: no flex found in \$PATH, install flex" >&5
6568
   { { echo "$as_me:$LINENO: error: no flex found in \$PATH, install flex" >&5
6581
echo "$as_me: WARNING: no flex found in \$PATH, install flex" >&2;} >> warn
6569
echo "$as_me: error: no flex found in \$PATH, install flex" >&2;}
6570
   { (exit 1); exit 1; }; }
6582
fi
6571
fi
6583
# Extract the first word of "patch", so it can be a program name with args.
6572
# Extract the first word of "patch", so it can be a program name with args.
6584
set dummy patch; ac_word=$2
6573
set dummy patch; ac_word=$2
Lines 6620-6627 echo "${ECHO_T}no" >&6 Link Here
6620
fi
6609
fi
6621
6610
6622
if test -z "$PATCH"; then
6611
if test -z "$PATCH"; then
6623
   { echo "$as_me:$LINENO: WARNING: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&5
6612
   { { echo "$as_me:$LINENO: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&5
6624
echo "$as_me: WARNING: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&2;} >> warn
6613
echo "$as_me: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&2;}
6614
   { (exit 1); exit 1; }; }
6625
fi
6615
fi
6626
if test "$_os" = "WINNT"; then
6616
if test "$_os" = "WINNT"; then
6627
	# Extract the first word of "bash", so it can be a program name with args.
6617
	# Extract the first word of "bash", so it can be a program name with args.
Lines 6902-6909 fi Link Here
6902
6892
6903
6893
6904
if test -z "$ANT"; then
6894
if test -z "$ANT"; then
6905
  echo "$as_me:$LINENO: result: Ant not found - Some Java projects will not build" >&5
6895
  { echo "$as_me:$LINENO: WARNING: Ant not found - Some Java projects will not build" >&5
6906
echo "${ECHO_T}Ant not found - Some Java projects will not build" >&6
6896
echo "$as_me: WARNING: Ant not found - Some Java projects will not build" >&2;}
6897
  echo "Ant not found - Some Java projects will not build" >>warn
6907
else
6898
else
6908
  echo "$as_me:$LINENO: checking if $ANT works" >&5
6899
  echo "$as_me:$LINENO: checking if $ANT works" >&5
6909
echo $ECHO_N "checking if $ANT works... $ECHO_C" >&6
6900
echo $ECHO_N "checking if $ANT works... $ECHO_C" >&6
Lines 6940-6945 echo "${ECHO_T}Ant works" >&6 Link Here
6940
    cat conftest.xml >&5
6931
    cat conftest.xml >&5
6941
    { echo "$as_me:$LINENO: WARNING: Ant does not work - Some Java projects will not build!" >&5
6932
    { echo "$as_me:$LINENO: WARNING: Ant does not work - Some Java projects will not build!" >&5
6942
echo "$as_me: WARNING: Ant does not work - Some Java projects will not build!" >&2;}
6933
echo "$as_me: WARNING: Ant does not work - Some Java projects will not build!" >&2;}
6934
    echo "Ant does not work - Some Java projects will not build!" >>warn
6943
  fi
6935
  fi
6944
6936
6945
  rm -f conftest* core core.* *.core
6937
  rm -f conftest* core core.* *.core
Lines 7740-7745 s,@USE_GCC3@,$USE_GCC3,;t t Link Here
7740
s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
7733
s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t
7741
s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
7734
s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t
7742
s,@ENABLE_DEBUG@,$ENABLE_DEBUG,;t t
7735
s,@ENABLE_DEBUG@,$ENABLE_DEBUG,;t t
7736
s,@ENVCFLAGSCXX@,$ENVCFLAGSCXX,;t t
7743
s,@LIBOBJS@,$LIBOBJS,;t t
7737
s,@LIBOBJS@,$LIBOBJS,;t t
7744
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
7738
s,@LTLIBOBJS@,$LTLIBOBJS,;t t
7745
CEOF
7739
CEOF
(-)configure.in (-52 / +54 lines)
Lines 19-26 echo "$@" >config.parms Link Here
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(symbols,
23
[  --enable-symbols        if you like to build with symbols in the final build.
24
                          Warning: This creates a large build of about 8 gig.
25
26
                          Usage: --enable-symbols
27
],,)
22
AC_ARG_ENABLE(debug,
28
AC_ARG_ENABLE(debug,
23
[  --enable-debug          if you like to build with debug symbols
29
[  --enable-debug          if you like to build with debug symbols and extra
30
                          debugging code.  This creates a LARGE build (8 gig)
24
31
25
                          Usage: --enable-debug
32
                          Usage: --enable-debug
26
],,)
33
],,)
Lines 226-231 esac Link Here
226
233
227
AC_MSG_RESULT([checked ($_os)])
234
AC_MSG_RESULT([checked ($_os)])
228
235
236
dnl ===================================================================
237
dnl First setting is whether to include symbols into final build.
238
dnl ===================================================================
239
if test "$enable_symbols" = "yes"; then
240
   ENVCFLAGSCXX="-g"
241
else
242
   ENVCFLAGSCXX=""
243
fi
229
244
230
dnl ===================================================================
245
dnl ===================================================================
231
dnl WINNT uses either 4nt or tcsh, all other O/S use tcsh.
246
dnl WINNT uses either 4nt or tcsh, all other O/S use tcsh.
Lines 321-356 if test "$GCC" = "yes"; then Link Here
321
    AC_MSG_CHECKING([the GNU gcc compiler version])
336
    AC_MSG_CHECKING([the GNU gcc compiler version])
322
    _gcc_version=`$CC -dumpversion`
337
    _gcc_version=`$CC -dumpversion`
323
   _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` 
338
   _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` 
324
   if test "$_gcc_major" = "3"; then
339
   _gcc_longver=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'`
325
340
326
      USE_GCC3="TRUE"
327
341
328
   else
342
   if test "$_gcc_longver" -lt "030200" ; then
329
      USE_GCC3="FALSE"
343
      ENVCFLAGSCXX="$ENVCFLAGSCXX -fno-rtti"
344
   fi
330
345
331
      if test "$_gcc_major" != "2"; then
346
   if test "$_gcc_major" = "3"; then
332
         AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
347
      USE_GCC3="TRUE"
333
         AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler]) >> warn
334
         COMPATH="NO_GCC"
335
      else
348
      else
336
         _gcc_middle=`$CC -dumpversion | $AWK -F. '{ if ($2 != 95) print "false"; else print "true" }'` 
349
      USE_GCC3="FALSE"
337
         if test "$_gcc_middle" = "false"; then
350
      if test "$_gcc_longver"  -lt "029502"; then
338
            AC_MSG_WARN([found version "$_gcc_version", use version 2.95.2+ of the gcc compiler])
351
         AC_MSG_ERROR([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
352
         else
342
            _gcc_minor=`$CC -dumpversion | $AWK -F. '{ if ($3 < 2) print "false"; else print "true" }'` 
353
         if test "$_gcc_longver" -gt "029599"; then
343
            if test "$_gcc_minor" = "false"; then
354
            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
355
            fi
348
         fi
356
         fi
357
	  echo "gcc 2.95 support is not perfect, suggest upgrade to gcc 3" >>warn
349
      fi
358
      fi
350
   fi
351
   if test "$COMPATH" != "NO_GCC"; then
352
      AC_MSG_RESULT([checked (gcc $_gcc_version)])
359
      AC_MSG_RESULT([checked (gcc $_gcc_version)])
353
   fi
354
360
355
dnl Set the include paths
361
dnl Set the include paths
356
   _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include 
362
   _gcc_include_path=`$CC -print-search-dirs | grep instal |$AWK '{ print \$2 }'`/include 
Lines 373-379 done ; Link Here
373
379
374
dnl Change empty GNUMAKE from warning to error, pending testing.
380
dnl Change empty GNUMAKE from warning to error, pending testing.
375
if test -z "$GNUMAKE"; then
381
if test -z "$GNUMAKE"; then
376
    AC_MSG_WARN([not found build may fail]) >> warn
382
    AC_MSG_WARN([not found build may fail])
383
    echo "gnu make not found build may fail" >> warn
377
else
384
else
378
    _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[[^0-9]]*@@' -e 's@ .*@@' -e 's@,.*@@'`;
385
    _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;}'` 
386
    _make_major=`echo $_make_version | $AWK -F. '{print $1;}'` 
Lines 390-395 else Link Here
390
          else
397
          else
391
             if test "$_os" = "Darwin"; then
398
             if test "$_os" = "Darwin"; then
392
                 AC_MSG_WARN([failed ($GNUMAKE $_make_version need 3.79.1+)])
399
                 AC_MSG_WARN([failed ($GNUMAKE $_make_version need 3.79.1+)])
400
                 echo "$GNUMAKE $_make_version may cause problems need 3.79.1+" >> warn
393
			 else
401
			 else
394
                 AC_MSG_ERROR([failed ($GNUMAKE $_make_version need 3.79.1+)])
402
                 AC_MSG_ERROR([failed ($GNUMAKE $_make_version need 3.79.1+)])
395
			 fi
403
			 fi
Lines 414-426 if test "$_os" = "SunOS"; then Link Here
414
      _workshop_major=`echo $_workshop_version | $AWK -F. '{ print $1 }'` 
422
      _workshop_major=`echo $_workshop_version | $AWK -F. '{ print $1 }'` 
415
      if test "$_workshop_major" != "5"; then
423
      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])
424
         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
425
         echo "found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler" >> warn
418
         COMPATH="NO_COMPATH"
426
         COMPATH="NO_COMPATH"
419
      else
427
      else
420
         _workshop_minor=`echo $_workshop_version | $AWK -F. '{ if ($2 == 0) print "true"; else if ($2 == 2) print "true"; else print "false" }'` 
428
         _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
429
         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])
430
            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
431
            echo "found version "$_workshop_version", use version 5.0 or 5.2 of the Sun Workshop C compiler" >> warn
424
            COMPATH="NO_COMPATH"
432
            COMPATH="NO_COMPATH"
425
         else
433
         else
426
            dnl compiler will do
434
            dnl compiler will do
Lines 443-455 if test "$_os" = "IRIX" -o "$_os" = "IRI Link Here
443
      _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'`
451
      _mipspro_major=`echo $_mipspro_version | $AWK -F. '{ print $1 }'`
444
      if test "$_mipspro_major" != "7"; then
452
      if test "$_mipspro_major" != "7"; then
445
         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])
446
         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
447
         COMPATH="NO_COMPATH"
455
         COMPATH="NO_COMPATH"
448
      else
456
      else
449
         _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'`
457
         _mipspro_minor=`echo $_mipspro_version | $AWK -F. '{ if ($2 <= 1) print "false"; else print "true" }'`
450
         if test "$_mipspro_minor" = "false"; then
458
         if test "$_mipspro_minor" = "false"; then
451
            AC_MSG_WARN([found version "$_mipspro_version", use version 7.2+ of the SGI MIPSpro C compiler])
459
            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
460
            echo "found version $_mipspro_version, use version 7.2+ of the SGI MIPSpro C compiler" >> warn
453
            COMPATH="NO_COMPATH"
461
            COMPATH="NO_COMPATH"
454
         else
462
         else
455
            dnl compiler will do
463
            dnl compiler will do
Lines 473-479 if test "$_os" = "OSF1"; then Link Here
473
      _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'`
481
      _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'`
474
      if test "$_compaqc_major" != "T6"; then
482
      if test "$_compaqc_major" != "T6"; then
475
         AC_MSG_WARN([found version "$_compaqc_version", use version 6 of the Compaq C compiler])
483
         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
484
         echo "found version "$_compaqc_version", use version 6 of the Compaq C compiler" >> warn
477
         COMPATH="NO_COMPATH"
485
         COMPATH="NO_COMPATH"
478
      else
486
      else
479
         dnl compiler will do
487
         dnl compiler will do
Lines 530-536 if test "$_os" = "Linux" -o "$_os" = "Fr Link Here
530
      AC_MSG_RESULT([yes])
538
      AC_MSG_RESULT([yes])
531
   else
539
   else
532
      AC_MSG_WARN([pam_appl.h could not be found in /usr/include/security])
540
      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
541
      echo "pam_appl.h could not be found in /usr/include/security" >> warn
534
   fi
542
   fi
535
fi
543
fi
536
544
Lines 576-582 if test "$_os" = "SunOS"; then Link Here
576
   AC_MSG_CHECKING([Sun Workshop C++ Compiler])
584
   AC_MSG_CHECKING([Sun Workshop C++ Compiler])
577
      if test "$CXX" != "CC"; then
585
      if test "$CXX" != "CC"; then
578
         AC_MSG_WARN([Sun Workshop C++ was not found])
586
         AC_MSG_WARN([Sun Workshop C++ was not found])
579
         AC_MSG_WARN([Sun Worlshop C++ was not found]) >> warn
587
         echo "Sun Workshop C++ was not found" >> warn
580
      else
588
      else
581
         AC_MSG_RESULT([checked]) 
589
         AC_MSG_RESULT([checked]) 
582
      fi
590
      fi
Lines 591-597 if test "$_os" = "Darwin"; then Link Here
591
      AC_MSG_CHECKING([Macosx c++ Compiler])
599
      AC_MSG_CHECKING([Macosx c++ Compiler])
592
      if test "$CXX" != "c++"; then
600
      if test "$CXX" != "c++"; then
593
         AC_MSG_WARN([Macosx C++ was not found])
601
         AC_MSG_WARN([Macosx C++ was not found])
594
         AC_MSG_WARN([Macosx C++ was not found]) >> warn
602
         echo "Macosx C++ was not found" >> warn
595
      else
603
      else
596
         AC_MSG_RESULT([checked]) 
604
         AC_MSG_RESULT([checked]) 
597
      fi
605
      fi
Lines 606-612 if test "$_os" = "IRIX" -o "$_os" = "IRI Link Here
606
      AC_MSG_CHECKING([SGI MIPSpro C++ Compiler])
614
      AC_MSG_CHECKING([SGI MIPSpro C++ Compiler])
607
      if test "$CXX" != "CC"; then
615
      if test "$CXX" != "CC"; then
608
         AC_MSG_WARN([SGI MIPSpro C++ was not found])
616
         AC_MSG_WARN([SGI MIPSpro C++ was not found])
609
         AC_MSG_WARN([SGI MIPSpro C++ was not found]) >> warn
617
         echo "SGI MIPSpro C++ was not found" >> warn
610
      else
618
      else
611
         AC_MSG_RESULT([checked])
619
         AC_MSG_RESULT([checked])
612
      fi
620
      fi
Lines 622-628 if test "$_os" = "OSF1"; then Link Here
622
   _compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'`
630
   _compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'`
623
   if test "$_compaqcxx_major" != "V6"; then
631
   if test "$_compaqcxx_major" != "V6"; then
624
      AC_MSG_WARN([found version "$_compaqc_version", use version 6 of the Compaq C++ compiler])
632
      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
633
      echo "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn
626
   else
634
   else
627
      dnl compiler will do
635
      dnl compiler will do
628
      AC_MSG_RESULT([checked])
636
      AC_MSG_RESULT([checked])
Lines 676-682 if test "$_os" = "SunOS"; then Link Here
676
         AC_MSG_RESULT([found])
684
         AC_MSG_RESULT([found])
677
      else
685
      else
678
         AC_MSG_WARN([patch 106327-06 not found, please install compiler patch 106327-06 or greater])
686
         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
687
         echo "patch 106327-06 not found, please install compiler patch 106327-06 or greater" >> warn
680
      fi
688
      fi
681
      dnl ***************
689
      dnl ***************
682
      dnl patch 106950-11
690
      dnl patch 106950-11
Lines 698-704 if test "$_os" = "SunOS"; then Link Here
698
         AC_MSG_RESULT([found])
706
         AC_MSG_RESULT([found])
699
      else
707
      else
700
         AC_MSG_WARN([patch 106950-11 not found, please install linker patch 106950-11 or greater])
708
         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
709
         echo "patch 106950-11 not found, please install linker patch 106950-11 or greater" >> warn
702
      fi
710
      fi
703
   else
711
   else
704
      if test "$_os_release" = "6"; then
712
      if test "$_os_release" = "6"; then
Lines 722-728 if test "$_os" = "SunOS"; then Link Here
722
            AC_MSG_RESULT([found])
730
            AC_MSG_RESULT([found])
723
         else
731
         else
724
            AC_MSG_WARN([patch 105591-09 not found, please install compiler patch 105591-09 or greater])
732
            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
733
            echo "patch 105591-09 not found, please install compiler patch 105591-09 or greater" >> warn
726
         fi
734
         fi
727
         dnl ***************
735
         dnl ***************
728
         dnl patch 107733-08
736
         dnl patch 107733-08
Lines 744-750 if test "$_os" = "SunOS"; then Link Here
744
            AC_MSG_RESULT([found])
752
            AC_MSG_RESULT([found])
745
         else
753
         else
746
            AC_MSG_WARN([patch 107733-06 not found, please install linker patch 107733-08 or greater])
754
            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
755
            echo "patch 107733-06 not found, please install linker patch 107733-08 or greater" >> warn
748
         fi
756
         fi
749
      fi
757
      fi
750
   fi
758
   fi
Lines 847-878 else Link Here
847
fi
855
fi
848
AC_MSG_CHECKING([the installed JDK])
856
AC_MSG_CHECKING([the installed JDK])
849
if test "$JAVA"; then
857
if test "$JAVA"; then
850
   _correct_jdk_exists="false"
851
   dnl java -version sends output to stderr!
858
   dnl java -version sends output to stderr!
852
   _jdk=`$JAVA -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[-A-Za-z]*//`
859
   _jdk=`$JAVA -J-version 2>&1 | $AWK -F'"' '{ print \$2 }' | $SED s/[-A-Za-z]*//`
853
860
854
   _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
861
   _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'`
855
862
856
   if test "$_jdk_ver" -lt 10300; then
863
   if test "$_jdk_ver" -lt 10300; then
857
	AC_MSG_WARN([You need at least jdk-1.3])
864
        AC_MSG_ERROR([You need at least jdk-1.3])
858
        _correct_jdk_exists="false"
859
   else
865
   else
860
      _correct_jdk_exists="true"
861
      JAVA_HOME=`echo $JAVA | $SED -n "s/\/bin\/javac//p"`
866
      JAVA_HOME=`echo $JAVA | $SED -n "s/\/bin\/javac//p"`
862
      AC_MSG_RESULT([checked (JDK $_jdk)])
867
      AC_MSG_RESULT([checked (JDK $_jdk)])
863
   fi
868
   fi
864
else
869
else
865
   _correct_jdk_exists="false"
870
   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
871
fi
872
dnl ===================================================================
872
dnl ===================================================================
873
dnl Checks for specific files.
873
dnl Checks for specific files.
874
dnl ===================================================================
874
dnl ===================================================================
875
dnl AC_CHECK_FILE(set_soenv.1)
876
dnl ===================================================================
875
dnl ===================================================================
877
dnl Checks for programs.
876
dnl Checks for programs.
878
dnl ===================================================================
877
dnl ===================================================================
Lines 1033-1050 dnl testing bison and flex exist Link Here
1033
dnl ***************************************
1032
dnl ***************************************
1034
AC_PATH_PROG(BISON, bison)
1033
AC_PATH_PROG(BISON, bison)
1035
if test -z "$BISON"; then
1034
if test -z "$BISON"; then
1036
   AC_MSG_WARN([no bison found in \$PATH, install bison]) >> warn
1035
   AC_MSG_ERROR([no bison found in \$PATH, install bison])
1037
fi
1036
fi
1038
AC_PATH_PROG(FLEX, flex)
1037
AC_PATH_PROG(FLEX, flex)
1039
if test -z "$FLEX"; then
1038
if test -z "$FLEX"; then
1040
   AC_MSG_WARN([no flex found in \$PATH, install flex]) >> warn
1039
   AC_MSG_ERROR([no flex found in \$PATH, install flex])
1041
fi
1040
fi
1042
dnl ***************************************
1041
dnl ***************************************
1043
dnl testing that patch exists
1042
dnl testing that patch exists
1044
dnl ***************************************
1043
dnl ***************************************
1045
AC_PATH_PROG(PATCH, patch)
1044
AC_PATH_PROG(PATCH, patch)
1046
if test -z "$PATCH"; then
1045
if test -z "$PATCH"; then
1047
   AC_MSG_WARN([\"patch\" not found in \$PATH, install the development tool named\"patch"\]) >> warn
1046
   AC_MSG_ERROR([\"patch\" not found in \$PATH, install the development tool named\"patch"\])
1048
fi
1047
fi
1049
dnl ***************************************
1048
dnl ***************************************
1050
dnl testing bash tools path on Windows
1049
dnl testing bash tools path on Windows
Lines 1131-1137 fi Link Here
1131
1130
1132
1131
1133
if test -z "$ANT"; then
1132
if test -z "$ANT"; then
1134
  AC_MSG_RESULT([Ant not found - Some Java projects will not build])
1133
  AC_MSG_WARN([Ant not found - Some Java projects will not build])
1134
  echo "Ant not found - Some Java projects will not build" >>warn
1135
else
1135
else
1136
  AC_MSG_CHECKING([if $ANT works])
1136
  AC_MSG_CHECKING([if $ANT works])
1137
cat > conftest.java << EOF
1137
cat > conftest.java << EOF
Lines 1161-1166 EOF Link Here
1161
    cat conftest.java >&5
1161
    cat conftest.java >&5
1162
    cat conftest.xml >&5
1162
    cat conftest.xml >&5
1163
    AC_MSG_WARN([Ant does not work - Some Java projects will not build!])
1163
    AC_MSG_WARN([Ant does not work - Some Java projects will not build!])
1164
    echo "Ant does not work - Some Java projects will not build!" >>warn
1164
  fi
1165
  fi
1165
1166
1166
  rm -f conftest* core core.* *.core
1167
  rm -f conftest* core core.* *.core
Lines 1277-1282 AC_SUBST(USE_GCC3) Link Here
1277
AC_SUBST(PTHREAD_CFLAGS)
1278
AC_SUBST(PTHREAD_CFLAGS)
1278
AC_SUBST(PTHREAD_LIBS)
1279
AC_SUBST(PTHREAD_LIBS)
1279
AC_SUBST(ENABLE_DEBUG)
1280
AC_SUBST(ENABLE_DEBUG)
1281
AC_SUBST(ENVCFLAGSCXX)
1280
1282
1281
AC_OUTPUT([set_soenv])
1283
AC_OUTPUT([set_soenv])
1282
1284
(-)set_soenv.in (-24 / +12 lines)
Lines 44-50 use File::Basename; Link Here
44
#
44
#
45
my ( $outfile, $outfile_sh, $bootfile, $newline, $comment, $compiler, $unsetenv, $setenv, $unset, $set, $ds, $ps, $cur_dir, 
45
my ( $outfile, $outfile_sh, $bootfile, $newline, $comment, $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, $MINGWIN32, $USE_SHELL,
47
     $WScomp, $GNUcomp, $platform, $cygwinver, $machine_type, $empty, $no_jdk, $no_ant, $no_stl, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include, 
47
     $WScomp, $GNUcomp, $platform, $cygwinver, $machine_type, $empty, $no_jdk, $no_stl, $no_tcsh, $no_cl, $no_gcc, $no_gcc_home, $no_gcc_include, 
48
     $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $exportvars, $win_format_var, $perl_os);
48
     $no_gxx_include, $warnfile, $Warning, $result, $unsetvars, $unsetvarssh, $exportvars, $win_format_var, $perl_os);
49
#
49
#
50
#-------------------------------------------------
50
#-------------------------------------------------
Lines 79-85 my ( $USR, $ETC, $BIN, $LIB, $INC, $INCL Link Here
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 my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAV 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 $Winnt = "WINNT"; # re 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 elsif ( $platform eq "$Linux" ) 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 elsif ( $platform eq "$Tru64" ) 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 664-670 if ($platform eq "$Winnt" and $MINGWIN32 Link Here
664
   }
663
   }
665
}
664
}
666
if ( '@STLPORT4@' eq $no_stl )
665
if ( '@STLPORT4@' eq $no_stl )
667
{  AddWarning( "set_soenv", "No path to STLport was given with the --with-stlport4-home option. The one provided with OOo will be build." );
666
{
668
   $STLPORT4 = "$no_stl";
667
   $STLPORT4 = "$no_stl";
669
}
668
}
670
669
Lines 720-735 if (($platform eq $Linux) or ($platform Link Here
720
   }
719
   }
721
}
720
}
722
721
723
# Ant Home directory
724
if ( '@ANT_HOME@' eq $no_ant )
725
{  AddWarning( "set_soenv", "Ant was not found in the path.  Some Java projects will not build." );
726
   $ANT_HOME = "$no_ant";
727
}
728
else 
729
{  # ANT_HOME as argument from autoconf.
730
   $ANT_HOME = '@ANT_HOME@';
731
}
732
733
#
722
#
734
# E. Determining the envionment values based on the information
723
# E. Determining the envionment values based on the information
735
#    that was gathered earlier on.
724
#    that was gathered earlier on.
Lines 1066-1071 elsif (($platform eq "$Linux") or ($plat Link Here
1066
      $PATH .=          $ps.'$JAVA_HOME'.$BIN;
1055
      $PATH .=          $ps.'$JAVA_HOME'.$BIN;
1067
   }
1056
   }
1068
1057
1058
   $PATH             .= $ps.$oldPATH;
1059
1069
   if ( $JAVA_HOME ne "" )
1060
   if ( $JAVA_HOME ne "" )
1070
   {
1061
   {
1071
      $PATH .=          $ps.'$JAVA_HOME'.$BIN;
1062
      $PATH .=          $ps.'$JAVA_HOME'.$BIN;
Lines 1073-1080 elsif (($platform eq "$Linux") or ($plat Link Here
1073
1064
1074
   $PATH             .= GetCorrectPath($COMPATH.$BIN, $PERL_PATH, $TCSH_PATH, $compiler);
1065
   $PATH             .= GetCorrectPath($COMPATH.$BIN, $PERL_PATH, $TCSH_PATH, $compiler);
1075
1066
1076
1077
   $PATH             .= $ps.$oldPATH;
1078
}
1067
}
1079
1068
1080
elsif ($platform eq "$Winnt")
1069
elsif ($platform eq "$Winnt")
Lines 1365-1371 CreateFileHeader( *OUT_SH, $UPD, $platfo Link Here
1365
ToFile( "SRC_ROOT",	     $SRC_ROOT,          "e" );
1354
ToFile( "SRC_ROOT",	     $SRC_ROOT,          "e" );
1366
ToFile( "SHELL",             $SHELL,             "e" );
1355
ToFile( "SHELL",             $SHELL,             "e" );
1367
ToFile( "JAVA_HOME",         $JAVA_HOME,         "e" );
1356
ToFile( "JAVA_HOME",         $JAVA_HOME,         "e" );
1368
ToFile( "ANT_HOME",          $ANT_HOME,          "e" );
1357
ToFile( "ANT_HOME",          "@ANT_HOME@",       "e" );
1369
ToFile( "JDKLIB",            $JAVA_LIB,          "e" );
1358
ToFile( "JDKLIB",            $JAVA_LIB,          "e" );
1370
ToFile( "STLPORT4",          $STLPORT4,          "e" );
1359
ToFile( "STLPORT4",          $STLPORT4,          "e" );
1371
ToFile( "ASM_PATH",          $ASM_PATH,          "e" );
1360
ToFile( "ASM_PATH",          $ASM_PATH,          "e" );
Lines 1688-1696 ToFile( "CXX", $CXX, Link Here
1688
if ( $COM ne "MSC" ) {
1677
if ( $COM ne "MSC" ) {
1689
  ToFile( "LINK",			 $CC,				 "e" );
1678
  ToFile( "LINK",			 $CC,				 "e" );
1690
}
1679
}
1680
ToFile( "ENVCFLAGSCXX",      "@ENVCFLAGSCXX@",    "e" );
1691
ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@","e" );
1681
ToFile( "GXX_INCLUDE_PATH",  "@GXX_INCLUDE_PATH@","e" );
1692
ToFile( "BISON_HAIRY",       $BISON_HAIRY,       "e" );
1693
ToFile( "BISON_SIMPLE",      $BISON_SIMPLE,      "e" );
1694
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
1682
ToFile( "COMMON_BUILD_TOOLS",$COMMON_BUILD_TOOLS, "e" );
1695
if ($platform ne "$Winnt")
1683
if ($platform ne "$Winnt")
1696
{  ToFile( "TEMP",              $TEMP,              "e" );
1684
{  ToFile( "TEMP",              $TEMP,              "e" );
Lines 1998-2004 sub ToFile Link Here
1998
{  if ( $_[ 2 ] eq "e" ) 
1986
{  if ( $_[ 2 ] eq "e" ) 
1999
   {  # Write an environment variable to file.
1987
   {  # Write an environment variable to file.
2000
      if (defined $_[ 1 ])
1988
      if (defined $_[ 1 ])
2001
      {  printf("%-12s %-17s %-10s %-39s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout
1989
      {  printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", $_[ 1 ]) ; # to stdout
2002
         if (( $platform ne "$Winnt" ) or ( $USE_SHELL ne "4nt" ))
1990
         if (( $platform ne "$Winnt" ) or ( $USE_SHELL ne "4nt" ))
2003
         {   
1991
         {   
2004
             print OUT "$setenv $_[ 0 ] \"$_[ 1 ]\"$newline";          # to tcsh file
1992
             print OUT "$setenv $_[ 0 ] \"$_[ 1 ]\"$newline";          # to tcsh file
Lines 2014-2020 sub ToFile Link Here
2014
         }
2002
         }
2015
      }
2003
      }
2016
      else
2004
      else
2017
      {  printf("%-12s %-17s %-10s %-39s\n", "The variable", $_[ 0 ], "is set to:", "unset") ; # to stdout
2005
      {  printf("%-12s %-17s %-10s %s\n", "The variable", $_[ 0 ], "is set to:", "unset") ; # to stdout
2018
         if (( $platform ne "$Winnt" ) or ( $USE_SHELL ne "4nt" ))
2006
         if (( $platform ne "$Winnt" ) or ( $USE_SHELL ne "4nt" ))
2019
         {  
2007
         {  
2020
            $unsetvars .= "$unsetenv $_[ 0 ] >& /dev/null$newline";            # for tcsh file
2008
            $unsetvars .= "$unsetenv $_[ 0 ] >& /dev/null$newline";            # for tcsh file

Return to issue 12442