CVS: tvision change.log,2.732,2.733 config.pl,1.134,1.135

[Salvador E. T. <se...@us...>]

Update of /cvsroot/tvision/tvision
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv4845

Modified Files:
	change.log config.pl 
Log Message:
* Added: AlCon driver, this is the conio emulation code on top of Allegro.
>From the alcon branch and contributed by Grzegorz Adam Hankiewicz.
* Fixed: TVConfigFile::GetString() leaked memory and returned an
unprocessed string.
* Fixed: Memory leaks in X11 driver.


Index: change.log
===================================================================
RCS file: /cvsroot/tvision/tvision/change.log,v
retrieving revision 2.732
retrieving revision 2.733
diff -C2 -d -r2.732 -r2.733
*** change.log	22 Jun 2009 15:14:45 -0000	2.732
--- change.log	23 Jun 2009 16:48:25 -0000	2.733
***************
*** 1,7 ****
  $Log$
  Revision 2.732  2009/06/22 15:14:45  set
  * Modified: TParamText::setText to take a constant string as first argument
  (not modified).
! .
  Revision 2.731  2009/03/17 13:04:09  set
  * Modified: [WWW] SF Logo according to the new policy.
--- 1,14 ----
  $Log$
+ Revision 2.733  2009/06/23 16:48:25  set
+ * Added: AlCon driver, this is the conio emulation code on top of Allegro.
+ From the alcon branch and contributed by Grzegorz Adam Hankiewicz.
+ * Fixed: TVConfigFile::GetString() leaked memory and returned an
+ unprocessed string.
+ * Fixed: Memory leaks in X11 driver.
+ 
  Revision 2.732  2009/06/22 15:14:45  set
  * Modified: TParamText::setText to take a constant string as first argument
  (not modified).
! 
  Revision 2.731  2009/03/17 13:04:09  set
  * Modified: [WWW] SF Logo according to the new policy.

Index: config.pl
===================================================================
RCS file: /cvsroot/tvision/tvision/config.pl,v
retrieving revision 1.134
retrieving revision 1.135
diff -C2 -d -r1.134 -r1.135
*** config.pl	27 Feb 2009 11:32:27 -0000	1.134
--- config.pl	23 Jun 2009 16:48:25 -0000	1.135
***************
*** 1,4 ****
  #!/usr/bin/perl
! # Copyright (C) 1999-2007 by Salvador E. Tropea (SET),
  # see copyrigh file for details
  #
--- 1,4 ----
  #!/usr/bin/perl
! # Copyright (C) 1999-2009 by Salvador E. Tropea (SET),
  # see copyrigh file for details
  #
***************
*** 20,23 ****
--- 20,24 ----
  $NCursesVersionNeeded='1.8.6';
  $DJGPPVersionNeeded='2.0.2';
+ $AllegroVersionNeeded='4';
  unlink $ErrorLog;
  $UseDummyIntl=0;
***************
*** 85,88 ****
--- 86,90 ----
    }
  LookForIntlSupport();
+ LookForAllegro($AllegroVersionNeeded);
  LookForEndianess();
  LookForMaintainerTools() if $conf{'MAINTAINER_MODE'} eq 'yes';
***************
*** 148,151 ****
--- 150,166 ----
  $MakeDefsRHIDE[2].=' pthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
  $MakeDefsRHIDE[2].=' termlib unix' if ($OSf eq 'QNX4');
+ if ($conf{'HAVE_ALLEGRO'} eq 'yes')
+   {
+    $aux=`allegro-config --libs`;
+    $a1=$aux;
+    $aux=~s/\-L(\S+)//g;
+    $AllegroLibs=$aux;
+    $aux=~s/\-l//g;
+    $MakeDefsRHIDE[2].=" $aux";
+    $aux=$a1;
+    $aux=~s/\-l(\S+)//g;
+    $aux=~s/\-L//g;
+    $AllegroPath=$aux;
+   }
  if ($OS eq 'UNIX')
    {
***************
*** 166,169 ****
--- 181,185 ----
     $MakeDefsRHIDE[3].='../../intl/dummy ' if $UseDummyIntl;
     $MakeDefsRHIDE[3].=$conf{'X11LibPath'}.' ' if ($conf{'HAVE_X11'} eq 'yes');
+    $MakeDefsRHIDE[3].=$AllegroPath.' ' if $conf{'HAVE_ALLEGRO'} eq 'yes';
    }
  elsif ($OS eq 'DOS')
***************
*** 186,189 ****
--- 202,206 ----
     $MakeDefsRHIDE[3].=$realPrefix.'/lib '.$LDExtraDirs;
     $MakeDefsRHIDE[3].=' ../../intl/dummy' if $UseDummyIntl;
+    $MakeDefsRHIDE[3].=$AllegroPath.' ' if $conf{'HAVE_ALLEGRO'} eq 'yes';
    }
  elsif ($OS eq 'Win32')
***************
*** 196,199 ****
--- 213,217 ----
     $MakeDefsRHIDE[3].=' ../../intl/dummy' if $UseDummyIntl;
     $MakeDefsRHIDE[3].=' '.$conf{'X11LibPath'} if ($conf{'HAVE_X11'} eq 'yes');
+    $MakeDefsRHIDE[3].=$AllegroPath.' ' if $conf{'HAVE_ALLEGRO'} eq 'yes';
    }
  $MakeDefsRHIDE[4]='STDCPP_LIB='.$stdcxx;
***************
*** 241,244 ****
--- 259,263 ----
     $aux.=" $stdcxx -lm -lc";
     $aux.=' -lpthread' if $conf{'HAVE_LINUX_PTHREAD'} eq 'yes';
+    $aux.=' '.$AllegroLibs if ($conf{'HAVE_ALLEGRO'} eq 'yes');
     $aux.=' libtvfintl.a' if ($OSf eq 'Darwin') && $UseDummyIntl;
     $MakeDefsRHIDE[7].=$aux;
***************
*** 810,813 ****
--- 829,860 ----
  }
  
+ sub LookForAllegro
+ {
+  my $vNeed=$_[0],$test;
+ 
+  print 'Looking for allegro library: ';
+  if (@conf{'HAVE_ALLEGRO'})
+    {
+     print "@conf{'HAVE_ALLEGRO'} (cached)\n";
+     return;
+    }
+  $test=`allegro-config --version`;
+  chomp $test;
+  if (!length($test))
+    {
+     $conf{'HAVE_ALLEGRO'}='no';
+     print " no, disabling AlCon\n";
+     return;
+    }
+  if (!CompareVersion($test,$vNeed))
+    {
+     $conf{'HAVE_ALLEGRO'}='no';
+     print " too old, disabling AlCon\n";
+     return;
+    }
+  $conf{'HAVE_ALLEGRO'}='yes';
+  print "$test OK\n";
+ }
+ 
  sub LookForNCurses
  {
***************
*** 1253,1256 ****
--- 1300,1304 ----
   $text.=ConfigIncDefYes('HAVE_KEYSYMS','The X11 keysyms are there');
   $text.=ConfigIncDefYes('HAVE_X11','X11 library and headers');
+  $text.=ConfigIncDefYes('HAVE_ALLEGRO','Allegro library');
   # Disable i8n only if the user requested, otherwise use gettext or the dummy
   $conf{'HAVE_INTL_SUPPORT'}=@conf{'no-intl'} eq 'yes' ? 'no' : 'yes';