CVS: tvision config.pl,1.86.2.21.2.4,1.86.2.21.2.5 conflib.pl,1.35.2.8.2.3,1.35.2.8.2.4

[Grzegorz A. H. <gr...@us...>]

Update of /cvsroot/tvision/tvision
In directory sc8-pr-cvs1:/tmp/cvs-serv17125

Modified Files:
      Tag: r2_0_1a
	config.pl conflib.pl 
Log Message:
Working MingW build under Cygwin for Alcon.

Index: config.pl
===================================================================
RCS file: /cvsroot/tvision/tvision/config.pl,v
retrieving revision 1.86.2.21.2.4
retrieving revision 1.86.2.21.2.5
diff -C2 -d -r1.86.2.21.2.4 -r1.86.2.21.2.5
*** config.pl	5 Dec 2003 16:28:45 -0000	1.86.2.21.2.4
--- config.pl	5 Dec 2003 19:50:05 -0000	1.86.2.21.2.5
***************
*** 34,37 ****
--- 34,38 ----
  # Determine the OS
  $OS=DetectOS();
+ $conf{'MinGW_under_cygwin'}='yes' if ($conf{'alcon'} eq 'yes') && ($Compf =~ 'Cygwin.*');
  # Determine C flags
  $CFLAGS=FindCFLAGS();
***************
*** 172,176 ****
     $MakeDefsRHIDE[3]='TVOBJ=../../makes ';
     $MakeDefsRHIDE[3].=$here.'/makes ' unless $conf{'libs-here'} eq 'no';
!    $MakeDefsRHIDE[3].=$realPrefix.'/lib '.$LDExtraDirs;
     $MakeDefsRHIDE[3].=' ../../intl/dummy' if $UseDummyIntl;
     $MakeDefsRHIDE[3].=' '.$conf{'X11LibPath'} if ($conf{'HAVE_X11'} eq 'yes');
--- 173,184 ----
     $MakeDefsRHIDE[3]='TVOBJ=../../makes ';
     $MakeDefsRHIDE[3].=$here.'/makes ' unless $conf{'libs-here'} eq 'no';
!    if ($conf{'MinGW_under_cygwin'} eq yes)
!      {
!       $MakeDefsRHIDE[3].=$LDExtraDirs;
!      }
!    else
!      {
!       $MakeDefsRHIDE[3].=$realPrefix.'/lib '.$LDExtraDirs;
!      }
     $MakeDefsRHIDE[3].=' ../../intl/dummy' if $UseDummyIntl;
     $MakeDefsRHIDE[3].=' '.$conf{'X11LibPath'} if ($conf{'HAVE_X11'} eq 'yes');
***************
*** 286,297 ****
      elsif ($i eq '--force-mingw')
        {
!        $conf{'GCC'}='gcc -mno-cygwin';
!        $conf{'GXX'}='g++ -mno-cygwin';
        }
      elsif ($i eq '--with-alcon')
        {
         $conf{'alcon'}='yes';
-        $conf{'GCC'}='gcc -mno-cygwin';
-        $conf{'GXX'}='g++ -mno-cygwin';
        }
      elsif ($i eq '--without-alcon')
--- 294,302 ----
      elsif ($i eq '--force-mingw')
        {
!        $conf{'MinGW_under_cygwin'}='yes';
        }
      elsif ($i eq '--with-alcon')
        {
         $conf{'alcon'}='yes';
        }
      elsif ($i eq '--without-alcon')

Index: conflib.pl
===================================================================
RCS file: /cvsroot/tvision/tvision/conflib.pl,v
retrieving revision 1.35.2.8.2.3
retrieving revision 1.35.2.8.2.4
diff -C2 -d -r1.35.2.8.2.3 -r1.35.2.8.2.4
*** conflib.pl	5 Dec 2003 16:28:45 -0000	1.35.2.8.2.3
--- conflib.pl	5 Dec 2003 19:50:05 -0000	1.35.2.8.2.4
***************
*** 243,247 ****
           {
            @lista=split(/:/,@ENV{'PATH'});
-           @conf{'MinGW_under_cygwin'} = 'yes';
           }
         else
--- 243,246 ----
***************
*** 334,337 ****
--- 333,338 ----
     {
      $cc='gcc';
+     $cc.=' -mno-cygwin' if ($Compf =~ 'Cygwin.*') &&
+                            ($conf{'MinGW_under_cygwin'} eq 'yes');
     }
   print "$cc ";
***************
*** 344,348 ****
  ';
   $test=RunGCCTest($cc,'c',$test,'');
!  if ($test ne "OK\n")
     {
      CreateCache();
--- 345,349 ----
  ';
   $test=RunGCCTest($cc,'c',$test,'');
!  if ($test =~ "OK\s?\n")
     {
      CreateCache();
***************
*** 464,469 ****
   foreach $i (@list)
     {
      $res=RunGCCTest($i,'cc',$test,$stdcxx);
!     if ($res eq "OK\n")
        {
         print "$i\n";
--- 465,472 ----
   foreach $i (@list)
     {
+     $i.=' -mno-cygwin' if ($Compf =~ 'Cygwin.*') &&
+                           ($conf{'MinGW_under_cygwin'} eq 'yes');
      $res=RunGCCTest($i,'cc',$test,$stdcxx);
!     if ($res =~ "OK\r?\n")
        {
         print "$i\n";