--- Merging r20668 into '.':

U    packages/fpindexer/fpmake.pp

(manually adapted Makefile.fpc to remove Solaris sqldb/sqlite support)
# revisions: 20668
------------------------------------------------------------------------
r20668 | jonas | 2012-03-30 11:54:40 +0200 (Fri, 30 Mar 2012) | 6 lines
Changed paths:
   M /trunk/packages/fpindexer/fpmake.pp

  - removed solaris from the SqliteOSes, because ibconnection is not
    compiled for that target (which is unrelated to SQLite, but that
    set is also used to determine whether or not to compile fbindexdb,
    which depends on that unit -- please fix the dependencies properly
    when adding new units)

------------------------------------------------------------------------

git-svn-id: branches/fixes_2_6@21071 -

packages/fpindexer/Makefile

@@ -313,7 +313,7 @@ ifeq ($(FULL_TARGET),i386-netbsd)
 override TARGET_UNITS+=fpmasks fpindexer memindexdb ireaderhtml ireaderpas ireadertxt  fbindexdb sqldbindexdb dbindexer
 endif
 ifeq ($(FULL_TARGET),i386-solaris)
-override TARGET_UNITS+=fpmasks fpindexer memindexdb ireaderhtml ireaderpas ireadertxt  fbindexdb sqldbindexdb
+override TARGET_UNITS+=fpmasks fpindexer memindexdb ireaderhtml ireaderpas ireadertxt
 endif
 ifeq ($(FULL_TARGET),i386-qnx)
 override TARGET_UNITS+=fpmasks fpindexer memindexdb ireaderhtml ireaderpas ireadertxt
@@ -409,7 +409,7 @@ ifeq ($(FULL_TARGET),sparc-netbsd)
 override TARGET_UNITS+=fpmasks fpindexer memindexdb ireaderhtml ireaderpas ireadertxt  fbindexdb sqldbindexdb dbindexer
 endif
 ifeq ($(FULL_TARGET),sparc-solaris)
-override TARGET_UNITS+=fpmasks fpindexer memindexdb ireaderhtml ireaderpas ireadertxt  fbindexdb sqldbindexdb
+override TARGET_UNITS+=fpmasks fpindexer memindexdb ireaderhtml ireaderpas ireadertxt
 endif
 ifeq ($(FULL_TARGET),sparc-embedded)
 override TARGET_UNITS+=fpmasks fpindexer memindexdb ireaderhtml ireaderpas ireadertxt
@@ -421,7 +421,7 @@ ifeq ($(FULL_TARGET),x86_64-freebsd)
 override TARGET_UNITS+=fpmasks fpindexer memindexdb ireaderhtml ireaderpas ireadertxt  fbindexdb sqldbindexdb dbindexer
 endif
 ifeq ($(FULL_TARGET),x86_64-solaris)
-override TARGET_UNITS+=fpmasks fpindexer memindexdb ireaderhtml ireaderpas ireadertxt  fbindexdb sqldbindexdb
+override TARGET_UNITS+=fpmasks fpindexer memindexdb ireaderhtml ireaderpas ireadertxt
 endif
 ifeq ($(FULL_TARGET),x86_64-darwin)
 override TARGET_UNITS+=fpmasks fpindexer memindexdb ireaderhtml ireaderpas ireadertxt  fbindexdb sqldbindexdb dbindexer

packages/fpindexer/Makefile.fpc

@@ -19,8 +19,6 @@ units_darwin=fbindexdb sqldbindexdb dbindexer
 units_win32=fbindexdb sqldbindexdb dbindexer
 units_win64=fbindexdb sqldbindexdb dbindexer
 units_wince=fbindexdb sqldbindexdb dbindexer
-# no dbindexer for solaris (sqldb dep)
-units_solaris=fbindexdb sqldbindexdb 
 
 exampledirs=examples
 

packages/fpindexer/fpmake.pp

@@ -6,7 +6,7 @@ uses fpmkunit;
 
 Const
   SqldbConnectionOSes = [beos,linux,freebsd,win32,win64,wince,darwin,iphonesim,netbsd,openbsd];
-  SqliteOSes          = [beos,haiku,linux,freebsd,darwin,iphonesim,solaris,netbsd,openbsd,win32,wince];
+  SqliteOSes          = [beos,haiku,linux,freebsd,darwin,iphonesim,netbsd,openbsd,win32,wince];
     
 Var
   T : TTarget;