[Fxruby-commits] CVS: FXRuby/ext/fox extconf.rb.in,1.1.2.2,1.1.2.3 extconf.rb,1.27.2.3,1.27.2.4

[Lyle J. <ly...@us...>]

Update of /cvsroot/fxruby/FXRuby/ext/fox
In directory usw-pr-cvs1:/tmp/cvs-serv17852/ext/fox

Modified Files:
      Tag: release10
	extconf.rb.in extconf.rb 
Log Message:
Incorporated Laurent Julliard's patches for the FXRuby.spec and extconf.rb
files, to reflect the new installation paths and filenames for FXScintilla.


Index: extconf.rb.in
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/Attic/extconf.rb.in,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** extconf.rb.in	10 May 2002 21:30:39 -0000	1.1.2.2
--- extconf.rb.in	30 May 2002 13:58:01 -0000	1.1.2.3
***************
*** 51,55 ****
  
  def is_scintilla_build?
!   args = ARGV.delete_if { |e| !(e =~ /--with-scintilla/) }
    args.length > 0
  end
--- 51,55 ----
  
  def is_scintilla_build?
!   args = ARGV.delete_if { |e| !(e =~ /--with-fxscintilla/) }
    args.length > 0
  end
***************
*** 59,66 ****
  dir_config('fox', nil, '/usr/local/lib')
  
! # This directive processes the "--with-scintilla-include" and
! # "--with-scintilla-lib" command line switches and modifies the CFLAGS
  # and LDFLAGS accordingly.
! dir_config('scintilla', '/usr/local/include', '/usr/local/lib')
  
  # Verify version number for FOX from the installed header files
--- 59,66 ----
  dir_config('fox', nil, '/usr/local/lib')
  
! # This directive processes the "--with-fxscintilla-include" and
! # "--with-fxscintilla-lib" command line switches and modifies the CFLAGS
  # and LDFLAGS accordingly.
! dir_config('fxscintilla', '/usr/local/include', '/usr/local/lib')
  
  # Verify version number for FOX from the installed header files
***************
*** 94,98 ****
      File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
      $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
!     $libs = append_library($libs, "scintilla")
    else
      File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
--- 94,98 ----
      File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
      $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
!     $libs = append_library($libs, "fxscintilla")
    else
      File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
***************
*** 123,127 ****
      File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
      $CFLAGS = $CFLAGS + " /DWITH_FXSCINTILLA"
!     $libs = append_library($libs, "scintilla-static")
    else
      File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
--- 123,127 ----
      File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
      $CFLAGS = $CFLAGS + " /DWITH_FXSCINTILLA"
!     $libs = append_library($libs, "fxscintilla-static")
    else
      File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
***************
*** 144,148 ****
      File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
      $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
!     $libs = append_library($libs, "scintilla")
    else
      File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
--- 144,148 ----
      File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
      $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
!     $libs = append_library($libs, "fxscintilla")
    else
      File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')

Index: extconf.rb
===================================================================
RCS file: /cvsroot/fxruby/FXRuby/ext/fox/extconf.rb,v
retrieving revision 1.27.2.3
retrieving revision 1.27.2.4
diff -C2 -d -r1.27.2.3 -r1.27.2.4
*** extconf.rb	10 May 2002 21:30:39 -0000	1.27.2.3
--- extconf.rb	30 May 2002 13:58:02 -0000	1.27.2.4
***************
*** 51,55 ****
  
  def is_scintilla_build?
!   args = ARGV.delete_if { |e| !(e =~ /--with-scintilla/) }
    args.length > 0
  end
--- 51,55 ----
  
  def is_scintilla_build?
!   args = ARGV.delete_if { |e| !(e =~ /--with-fxscintilla/) }
    args.length > 0
  end
***************
*** 59,66 ****
  dir_config('fox', nil, '/usr/local/lib')
  
! # This directive processes the "--with-scintilla-include" and
! # "--with-scintilla-lib" command line switches and modifies the CFLAGS
  # and LDFLAGS accordingly.
! dir_config('scintilla', '/usr/local/include', '/usr/local/lib')
  
  # Verify version number for FOX from the installed header files
--- 59,66 ----
  dir_config('fox', nil, '/usr/local/lib')
  
! # This directive processes the "--with-fxscintilla-include" and
! # "--with-fxscintilla-lib" command line switches and modifies the CFLAGS
  # and LDFLAGS accordingly.
! dir_config('fxscintilla', '/usr/local/include', '/usr/local/lib')
  
  # Verify version number for FOX from the installed header files
***************
*** 94,98 ****
      File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
      $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
!     $libs = append_library($libs, "scintilla")
    else
      File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
--- 94,98 ----
      File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
      $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
!     $libs = append_library($libs, "fxscintilla")
    else
      File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
***************
*** 123,127 ****
      File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
      $CFLAGS = $CFLAGS + " /DWITH_FXSCINTILLA"
!     $libs = append_library($libs, "scintilla-static")
    else
      File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
--- 123,127 ----
      File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
      $CFLAGS = $CFLAGS + " /DWITH_FXSCINTILLA"
!     $libs = append_library($libs, "fxscintilla-static")
    else
      File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
***************
*** 144,148 ****
      File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
      $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
!     $libs = append_library($libs, "scintilla")
    else
      File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')
--- 144,148 ----
      File.move('scintilla_wrap.cpp.bak', 'scintilla_wrap.cpp') if FileTest.exists?('scintilla_wrap.cpp.bak')
      $CFLAGS = $CFLAGS + " -DWITH_FXSCINTILLA"
!     $libs = append_library($libs, "fxscintilla")
    else
      File.move('scintilla_wrap.cpp', 'scintilla_wrap.cpp.bak') if FileTest.exists?('scintilla_wrap.cpp')