Really compile with -DHAVE_FREEIMAGE if FreeImage is found.
Really compile with -DHAVE_FREEIMAGE if FreeImage is found.

Fix variable names, use those found in ros/adm/make/TKService/Makefile.am
Also link against freeimageplus, we need it.

Submitted upstream: http://www.opencascade.org/org/forum/thread_20043/

finetjul/oce,EvgeneOskin/oce,Tridify/oce,Tech-XCorp/oce,finetjul/oce,BenoitPerrot/oce,mathstuf/oce,tpaviot/oce,Tridify/oce,heartvalve/oce,Tech-XCorp/oce,Tech-XCorp/oce,finetjul/oce,tpaviot/oce,EvgeneOskin/oce,heartvalve/oce,mathstuf/oce,heartvalve/oce,Tridify/oce,mathstuf/oce,Tech-XCorp/oce,BenoitPerrot/oce,EvgeneOskin/oce,Tech-XCorp/oce,mathstuf/oce,BenoitPerrot/oce,Tridify/oce,finetjul/oce,EvgeneOskin/oce,finetjul/oce,EvgeneOskin/oce,BenoitPerrot/oce,Tridify/oce,heartvalve/oce,heartvalve/oce,tpaviot/oce,tpaviot/oce,tpaviot/oce,mathstuf/oce,BenoitPerrot/oce