Added support for road types to integrate to each other so that tiles having
integrating road types get road movement bonus even if they don't have exactly
same road type.

Patch by Emmet Hikory <persia>

See patch #3829


git-svn-id: svn://svn.gna.org/svn/freeciv/trunk@24743 a0f10bec-cc02-0410-94fc-a9cfff90b4cd
Removed obsolete definition of oceanic city gfx tags from city styles. Oceanic
cities can now be defined with their own complete city styles.

See patch #4638


git-svn-id: svn://svn.gna.org/svn/freeciv/trunk@24744 a0f10bec-cc02-0410-94fc-a9cfff90b4cd
Add LUA_LIBS, TOLUA_LIBS, and LUASQL_LIBS to the libraries actually needing them, not
to the final executables linked against those libraries.

Reported by Patrick Welche <prlw1>

See bug #21696


git-svn-id: svn://svn.gna.org/svn/freeciv/trunk@24745 a0f10bec-cc02-0410-94fc-a9cfff90b4cd