Deprecated Darkstar fourms

This used to go in the Compiling On Linux thread on the old forum. I try to update my svn source code (local copy) every day, but this week has been crazy, so I'm not sure exactly when this problem cropped up, but I've had it yesterday and today. When I run make I get

michael@carter /home/work/trunk $ make
g++ -std=gnu++0x -g -O2 -o dsgame dsgame-blowfish.o dsgame-kernel.o dsgame-malloc.o dsgame-md52.o dsgame-showmsg.o dsgame-socket.o dsgame-sql.o dsgame-strlib.o dsgame-taskmgr.o dsgame-timer.o dsgame-utils.o dsgame-zlib.o dsgame-ability.o dsgame-ai_char_gm.o dsgame-ai_char_normal.o dsgame-ai_general.o dsgame-ai_mob_dummy.o dsgame-ai_pet_dummy.o dsgame-alliance.o dsgame-baseentity.o dsgame-battleentity.o dsgame-battleutils.o dsgame-charentity.o dsgame-charutils.o dsgame-commandhandler.o dsgame-conquest_system.o dsgame-enmity_container.o dsgame-fishingutils.o dsgame-grades.o dsgame-guildutils.o dsgame-instance.o dsgame-instanceutils.o dsgame-instance_handler.o dsgame-item.o dsgame-item_armor.o dsgame-item_currency.o dsgame-item_furnishing.o dsgame-item_general.o dsgame-item_linkshell.o dsgame-item_puppet.o dsgame-item_shop.o dsgame-item_usable.o dsgame-item_weapon.o dsgame-itemutils.o dsgame-item_container.o dsgame-linkshell.o dsgame-luautils.o dsgame-lua_baseentity.o dsgame-lua_instance.o dsgame-lua_mobskill.o dsgame-lua_region.o dsgame-lua_spell.o dsgame-lua_statuseffect.o dsgame-lua_trade_container.o dsgame-lua_zone.o dsgame-map.o dsgame-mobentity.o dsgame-mobskill.o dsgame-mobutils.o dsgame-modifier.o dsgame-npcentity.o dsgame-action.o dsgame-auction_house.o dsgame-automaton_update.o dsgame-basic.o dsgame-bazaar_confirmation.o dsgame-bazaar_purchase.o dsgame-bazaar_check.o dsgame-bazaar_close.o dsgame-bazaar_item.o dsgame-bazaar_message.o dsgame-campaing_map.o dsgame-caught_fish.o dsgame-char.o dsgame-char_abilities.o dsgame-char_appearance.o dsgame-char_check.o dsgame-char_emotion.o dsgame-char_equip.o dsgame-char_health.o dsgame-char_jobs.o dsgame-char_skills.o dsgame-char_spells.o dsgame-char_stats.o dsgame-char_sync.o dsgame-char_update.o dsgame-chat_message.o dsgame-chocobo_digging.o dsgame-chocobo_music.o dsgame-conquest_map.o dsgame-cs_position.o dsgame-delivery_box.o dsgame-downloading_data.o dsgame-entity_update.o dsgame-event.o dsgame-event_update.o dsgame-fade_out.o dsgame-fishing.o dsgame-guild_menu.o dsgame-guild_menu_buy.o dsgame-guild_menu_sell.o dsgame-inventory_assign.o dsgame-inventory_finish.o dsgame-inventory_item.o dsgame-inventory_modify.o dsgame-inventory_size.o dsgame-key_items.o dsgame-linkshell_message.o dsgame-linkshell_equip.o dsgame-lock_on.o dsgame-menu_config.o dsgame-menu_merit.o dsgame-menu_mog.o dsgame-menu_raisetractor.o dsgame-merit_points_categories.o dsgame-message_basic.o dsgame-message_debug.o dsgame-message_special.o dsgame-message_standard.o dsgame-message_system.o dsgame-message_text.o dsgame-trade_action.o dsgame-trade_item.o dsgame-trade_request.o dsgame-trade_update.o dsgame-world_pass.o dsgame-party_define.o dsgame-party_invite.o dsgame-party_map.o dsgame-party_member_update.o dsgame-party_search.o dsgame-pet_sync.o dsgame-position.o dsgame-quest_mission_log.o dsgame-release.o dsgame-server_ip.o dsgame-server_message.o dsgame-shop_appraise.o dsgame-shop_buy.o dsgame-shop_items.o dsgame-shop_menu.o dsgame-stop_downloading.o dsgame-synth_animation.o dsgame-synth_message.o dsgame-treasure_find_item.o dsgame-treasure_lot_item.o dsgame-uncnown_39.o dsgame-weather.o dsgame-wide_scan.o dsgame-wide_scan_track.o dsgame-zone_in.o dsgame-zone_visited.o dsgame-packet_system.o dsgame-party.o dsgame-petentity.o dsgame-petutils.o dsgame-region.o dsgame-spell.o dsgame-status_effect.o dsgame-status_effect_container.o dsgame-synthutils.o dsgame-time_server.o dsgame-trade_container.o dsgame-trait.o dsgame-transport.o dsgame-treasure_pool.o dsgame-universal_container.o dsgame-vana_time.o dsgame-weapon_skill.o dsgame-zone.o dsgame-zoneutils.o -llua -lmysqlclient -ldl -lrt -lm
dsgame-linkshell.o: In function `CLinkshell::PushPacket(CCharEntity*, CBasicPacket*)':
/home/work/trunk/src/map/linkshell.cpp:273: undefined reference to `jailutils::InPrison(CCharEntity*)'
dsgame-ai_char_normal.o: In function `CAICharNormal::CheckCurrentAction(unsigned int)':
/home/work/trunk/src/map/ai/ai_char_normal.cpp:80: undefined reference to `jailutils::InPrison(CCharEntity*)'
dsgame-packet_system.o: In function `SmallPacket0x0DD(map_session_data_t*, CCharEntity*, char*)':
/home/work/trunk/src/map/packet_system.cpp:2857: undefined reference to `jailutils::InPrison(CCharEntity*)'
dsgame-packet_system.o: In function `SmallPacket0x0B5(map_session_data_t*, CCharEntity*, char*)':
/home/work/trunk/src/map/packet_system.cpp:2495: undefined reference to `jailutils::InPrison(CCharEntity*)'
dsgame-packet_system.o: In function `SmallPacket0x06E(map_session_data_t*, CCharEntity*, char*)':
/home/work/trunk/src/map/packet_system.cpp:2069: undefined reference to `jailutils::InPrison(CCharEntity*)'
dsgame-packet_system.o:/home/work/trunk/src/map/packet_system.cpp:2094: more undefined references to `jailutils::InPrison(CCharEntity*)' follow
collect2: ld returned 1 exit status
make: *** [dsgame] Error 1

Can anyone help me with this?

What revision?

You can revert yoru SRC directory, then apply dssearchv6.
and recompile.
and re-run autogen/make

That worked.

I'm running revision 1633 on Linux. I did:

michael@carter /home/work/trunk $ svn revert --recursive src
Reverted 'src/search/tcp_request.cpp'
Reverted 'src/search/tcp_request.h'
Reverted 'src/search/data_loader.h'
Reverted 'src/search/search.cpp'
Reverted 'src/search/packets/party_list.h'
Reverted 'src/map/zone.h'
Reverted 'src/map/packets/trade_update.h'
michael@carter /home/work/trunk $ svn up
Updating '.':
At revision 1633.
michael@carter /home/work/trunk $ patch -p0 -i dssearchv6.diff
patching file src/search/tcp_request.cpp
patching file src/search/tcp_request.h
patching file src/search/data_loader.h
Hunk #1 succeeded at 28 with fuzz 1.
patching file src/search/search.cpp
Hunk #2 succeeded at 76 (offset 5 lines).
Hunk #3 succeeded at 134 (offset 7 lines).
Hunk #4 succeeded at 148 (offset 7 lines).
Hunk #5 succeeded at 170 (offset 7 lines).
Hunk #6 succeeded at 184 (offset 7 lines).
Hunk #7 succeeded at 194 (offset 7 lines).
Hunk #8 succeeded at 209 (offset 7 lines).
Hunk #9 succeeded at 227 (offset 7 lines).
Hunk #10 succeeded at 248 (offset 7 lines).
Hunk #11 succeeded at 261 (offset 7 lines).
Hunk #12 succeeded at 389 (offset 7 lines).
Hunk #13 succeeded at 444 (offset 10 lines).
Hunk #14 succeeded at 506 (offset 10 lines).
Hunk #15 succeeded at 563 (offset 13 lines).
Hunk #16 succeeded at 884 with fuzz 2 (offset 33 lines).
patching file src/search/packets/party_list.h
patching file src/map/packets/trade_update.h
michael@carter /home/work/trunk $ make
g++ -std=gnu++0x -DHAVE_CONFIG_H -I. -I./src/common -DdsUDPSERV -g -O2 -MT dsgame-ability.o -MD -MP -MF .deps/dsgame-ability.Tpo -c -o dsgame-ability.o `test -f 'src/map/ability.cpp' || echo './'`src/map/ability.cpp
In file included from src/map/instance_handler.h:30:0,
from src/map/zone.h:36,
from src/map/map.h:39,
from src/map/baseentity.h:29,
from src/map/battleentity.h:33,
from src/map/ability.h:30,
from src/map/ability.cpp:24:
src/map/instance.h:127:7: warning: extra tokens at end of #endif directive [enabled by default]
In file included from src/map/map.h:39:0,
from src/map/baseentity.h:29,
from src/map/battleentity.h:33,
from src/map/ability.h:30,
from src/map/ability.cpp:24:
src/map/zone.h:37:29: fatal error: packets\weather.h: No such file or directory
compilation terminated.
make: *** [dsgame-ability.o] Error 1

I think that if I change packets\weather.h to packets/weather.h it might resolve this error, but will drop me another one. I'll check...

Yep:


michael@carter /home/work/trunk $ make
g++ -std=gnu++0x -DHAVE_CONFIG_H -I. -I./src/common -DdsUDPSERV -g -O2 -MT dsgame-ai_mob_dummy.o -MD -MP -MF .deps/dsgame-ai_mob_dummy.Tpo -c -o dsgame-ai_mob_dummy.o `test -f 'src/map/ai/ai_mob_dummy.cpp' || echo './'`src/map/ai/ai_mob_dummy.cpp
In file included from src/map/ai/../instance_handler.h:30:0,
from src/map/ai/../zone.h:36,
from src/map/ai/../map.h:39,
from src/map/ai/../baseentity.h:29,
from src/map/ai/../battleentity.h:33,
from src/map/ai/../battleutils.h:31,
from src/map/ai/ai_mob_dummy.cpp:27:
src/map/ai/../instance.h:127:7: warning: extra tokens at end of #endif directive [enabled by default]
In file included from src/map/ai/../charutils.h:29:0,
from src/map/ai/ai_mob_dummy.cpp:28:
src/map/ai/../trait.h:170:7: warning: extra tokens at end of #endif directive [enabled by default]
In file included from src/map/ai/ai_mob_dummy.cpp:30:0:
src/map/ai/../mobskill.h:98:7: warning: extra tokens at end of #endif directive [enabled by default]
src/map/ai/ai_mob_dummy.cpp: In member function 'std::vector<CBattleEntity*> CAIMobDummy::GetAdditionalTargets(AOERANGE, position_t, float)':
src/map/ai/ai_mob_dummy.cpp:1128:36: error: no matching function for call to 'std::vector<CBattleEntity*>::erase(std::vector<CBattleEntity*>::const_iterator&)'
src/map/ai/ai_mob_dummy.cpp:1128:36: note: candidates are:
/usr/lib/gcc/i686-pc-linux-gnu/4.6.3/include/g++-v4/bits/vector.tcc:135:5: note: std::vector<_Tp, _Alloc>::iterator std::vector<_Tp, _Alloc>::erase(std::vector<_Tp, _Alloc>::iterator) [with _Tp = CBattleEntity*, _Alloc = std::allocator<CBattleEntity*>, std::vector<_Tp, _Alloc>::iterator = __gnu_cxx::__normal_iterator<CBattleEntity**, std::vector<CBattleEntity*> >, typename std::_Vector_base<_Tp, _Alloc>::_Tp_alloc_type::pointer = CBattleEntity**]
/usr/lib/gcc/i686-pc-linux-gnu/4.6.3/include/g++-v4/bits/vector.tcc:135:5: note: no known conversion for argument 1 from 'std::vector<CBattleEntity*>::const_iterator {aka __gnu_cxx::__normal_iterator<CBattleEntity* const*, std::vector<CBattleEntity*> >}' to '__gnu_cxx::__normal_iterator<CBattleEntity**, std::vector<CBattleEntity*> >'
/usr/lib/gcc/i686-pc-linux-gnu/4.6.3/include/g++-v4/bits/vector.tcc:147:5: note: std::vector<_Tp, _Alloc>::iterator std::vector<_Tp, _Alloc>::erase(std::vector<_Tp, _Alloc>::iterator, std::vector<_Tp, _Alloc>::iterator) [with _Tp = CBattleEntity*, _Alloc = std::allocator<CBattleEntity*>, std::vector<_Tp, _Alloc>::iterator = __gnu_cxx::__normal_iterator<CBattleEntity**, std::vector<CBattleEntity*> >, typename std::_Vector_base<_Tp, _Alloc>::_Tp_alloc_type::pointer = CBattleEntity**]
/usr/lib/gcc/i686-pc-linux-gnu/4.6.3/include/g++-v4/bits/vector.tcc:147:5: note: candidate expects 2 arguments, 1 provided
make: *** [dsgame-ai_mob_dummy.o] Error 1

I'm up to revision 1649 and I'm still getting this error:

michael@carter /home/work/trunk $ make
g++ -std=gnu++0x -DHAVE_CONFIG_H -I. -I./src/common -DdsUDPSERV -g -O2 -MT dsgame-ai_mob_dummy.o -MD -MP -MF .deps/dsgame-ai_mob_dummy.Tpo -c -o dsgame-ai_mob_dummy.o `test -f 'src/map/ai/ai_mob_dummy.cpp' || echo './'`src/map/ai/ai_mob_dummy.cpp
In file included from src/map/ai/../instance_handler.h:30:0,
from src/map/ai/../zone.h:36,
from src/map/ai/../map.h:39,
from src/map/ai/../baseentity.h:29,
from src/map/ai/../battleentity.h:33,
from src/map/ai/../battleutils.h:31,
from src/map/ai/ai_mob_dummy.cpp:27:
src/map/ai/../instance.h:127:7: warning: extra tokens at end of #endif directive [enabled by default]
In file included from src/map/ai/../charutils.h:29:0,
from src/map/ai/ai_mob_dummy.cpp:28:
src/map/ai/../trait.h:170:7: warning: extra tokens at end of #endif directive [enabled by default]
In file included from src/map/ai/ai_mob_dummy.cpp:30:0:
src/map/ai/../mobskill.h:98:7: warning: extra tokens at end of #endif directive [enabled by default]
src/map/ai/ai_mob_dummy.cpp: In member function 'std::vector<CBattleEntity*> CAIMobDummy::GetAdditionalTargets(AOERANGE, position_t, float)':
src/map/ai/ai_mob_dummy.cpp:1173:36: error: no matching function for call to 'std::vector<CBattleEntity*>::erase(std::vector<CBattleEntity*>::const_iterator&)'
src/map/ai/ai_mob_dummy.cpp:1173:36: note: candidates are:
/usr/lib/gcc/i686-pc-linux-gnu/4.6.3/include/g++-v4/bits/vector.tcc:135:5: note: std::vector<_Tp, _Alloc>::iterator std::vector<_Tp, _Alloc>::erase(std::vector<_Tp, _Alloc>::iterator) [with _Tp = CBattleEntity*, _Alloc = std::allocator<CBattleEntity*>, std::vector<_Tp, _Alloc>::iterator = __gnu_cxx::__normal_iterator<CBattleEntity**, std::vector<CBattleEntity*> >, typename std::_Vector_base<_Tp, _Alloc>::_Tp_alloc_type::pointer = CBattleEntity**]
/usr/lib/gcc/i686-pc-linux-gnu/4.6.3/include/g++-v4/bits/vector.tcc:135:5: note: no known conversion for argument 1 from 'std::vector<CBattleEntity*>::const_iterator {aka __gnu_cxx::__normal_iterator<CBattleEntity* const*, std::vector<CBattleEntity*> >}' to '__gnu_cxx::__normal_iterator<CBattleEntity**, std::vector<CBattleEntity*> >'
/usr/lib/gcc/i686-pc-linux-gnu/4.6.3/include/g++-v4/bits/vector.tcc:147:5: note: std::vector<_Tp, _Alloc>::iterator std::vector<_Tp, _Alloc>::erase(std::vector<_Tp, _Alloc>::iterator, std::vector<_Tp, _Alloc>::iterator) [with _Tp = CBattleEntity*, _Alloc = std::allocator<CBattleEntity*>, std::vector<_Tp, _Alloc>::iterator = __gnu_cxx::__normal_iterator<CBattleEntity**, std::vector<CBattleEntity*> >, typename std::_Vector_base<_Tp, _Alloc>::_Tp_alloc_type::pointer = CBattleEntity**]
/usr/lib/gcc/i686-pc-linux-gnu/4.6.3/include/g++-v4/bits/vector.tcc:147:5: note: candidate expects 2 arguments, 1 provided
make: *** [dsgame-ai_mob_dummy.o] Error 1

I commented out src/map/ai/ai_mob_dummy.cpp:1173 and it finished building correctly. I have no idea what itr = results.erase(itr); does in this context. I hope it wasn't important. There are only two of us on my server, so we would probably never even need to use that code. Maybe someone will fix it now that I've commented it out just to get my server to build...

Sorry, I maintain the linux builds, but I've been busy with work recently. I'll go through tomorrow and try and iron out as many linux-specific issues as possible.

Alright, linux builds are solid again. Still need the search patch for now, though. Hopefully I'll come up with a good enough compromise at some point to make it unnecessary.

Now on revision 1984:

michael@carter /home/work/dsp $ make
g++ -std=gnu++0x -DHAVE_CONFIG_H -I. -I./src/common -DdsUDPSERV -g -O2 -MT dsgame-charutils.o -MD -MP -MF .deps/dsgame-charutils.Tpo -c -o dsgame-charutils.o `test -f 'src/map/charutils.cpp' || echo './'`src/map/charutils.cpp
In file included from src/map/instance_handler.h:30:0,
from src/map/zone.h:36,
from src/map/map.h:39,
from src/map/battleentity.h:37,
from src/map/ability.h:30,
from src/map/charutils.cpp:62:
src/map/instance.h:151:7: warning: extra tokens at end of #endif directive [enabled by default]
In file included from src/map/charutils.h:29:0,
from src/map/charutils.cpp:64:
src/map/trait.h:170:7: warning: extra tokens at end of #endif directive [enabled by default]
In file included from src/map/charutils.cpp:72:0:
src/map/weapon_skill.h:89:7: warning: extra tokens at end of #endif directive [enabled by default]
mv -f .deps/dsgame-charutils.Tpo .deps/dsgame-charutils.Po
g++ -std=gnu++0x -g -O2 -o dsgame dsgame-blowfish.o dsgame-kernel.o dsgame-malloc.o dsgame-md52.o dsgame-showmsg.o dsgame-socket.o dsgame-sql.o dsgame-strlib.o dsgame-taskmgr.o dsgame-timer.o dsgame-utils.o dsgame-zlib.o dsgame-ability.o dsgame-ai_char_gm.o dsgame-ai_char_normal.o dsgame-ai_char_prisoner.o dsgame-ai_general.o dsgame-ai_mob_dummy.o dsgame-ai_pet_dummy.o dsgame-alliance.o dsgame-baseentity.o dsgame-battleentity.o dsgame-battleutils.o dsgame-charentity.o dsgame-charutils.o dsgame-commandhandler.o dsgame-conquest_system.o dsgame-enmity_container.o dsgame-fishingutils.o dsgame-grades.o dsgame-guildutils.o dsgame-instance.o dsgame-instanceutils.o dsgame-instance_handler.o dsgame-item.o dsgame-item_armor.o dsgame-item_currency.o dsgame-item_furnishing.o dsgame-item_general.o dsgame-item_linkshell.o dsgame-item_puppet.o dsgame-item_shop.o dsgame-item_usable.o dsgame-item_weapon.o dsgame-itemutils.o dsgame-item_container.o dsgame-jailutils.o dsgame-linkshell.o dsgame-luautils.o dsgame-lua_ability.o dsgame-lua_baseentity.o dsgame-lua_instance.o dsgame-lua_mobskill.o dsgame-lua_region.o dsgame-lua_spell.o dsgame-lua_statuseffect.o dsgame-lua_trade_container.o dsgame-lua_zone.o dsgame-map.o dsgame-mobentity.o dsgame-mobskill.o dsgame-mobutils.o dsgame-modifier.o dsgame-npcentity.o dsgame-action.o dsgame-auction_house.o dsgame-automaton_update.o dsgame-basic.o dsgame-bazaar_confirmation.o dsgame-bazaar_purchase.o dsgame-bazaar_check.o dsgame-bazaar_close.o dsgame-bazaar_item.o dsgame-bazaar_message.o dsgame-campaing_map.o dsgame-caught_fish.o dsgame-char.o dsgame-char_abilities.o dsgame-char_appearance.o dsgame-char_check.o dsgame-char_emotion.o dsgame-char_equip.o dsgame-char_health.o dsgame-char_jobs.o dsgame-char_skills.o dsgame-char_spells.o dsgame-char_stats.o dsgame-char_sync.o dsgame-char_update.o dsgame-chat_message.o dsgame-chocobo_digging.o dsgame-chocobo_music.o dsgame-conquest_map.o dsgame-cs_position.o dsgame-delivery_box.o dsgame-downloading_data.o dsgame-entity_update.o dsgame-event.o dsgame-event_update.o dsgame-fade_out.o dsgame-fishing.o dsgame-guild_menu.o dsgame-guild_menu_buy.o dsgame-guild_menu_sell.o dsgame-inventory_assign.o dsgame-inventory_finish.o dsgame-inventory_item.o dsgame-inventory_modify.o dsgame-inventory_size.o dsgame-key_items.o dsgame-linkshell_message.o dsgame-linkshell_equip.o dsgame-lock_on.o dsgame-menu_config.o dsgame-menu_merit.o dsgame-menu_mog.o dsgame-menu_raisetractor.o dsgame-merit_points_categories.o dsgame-message_basic.o dsgame-message_debug.o dsgame-message_special.o dsgame-message_standard.o dsgame-message_system.o dsgame-message_text.o dsgame-trade_action.o dsgame-trade_item.o dsgame-trade_request.o dsgame-trade_update.o dsgame-world_pass.o dsgame-party_define.o dsgame-party_invite.o dsgame-party_map.o dsgame-party_member_update.o dsgame-party_search.o dsgame-pet_sync.o dsgame-position.o dsgame-quest_mission_log.o dsgame-release.o dsgame-server_ip.o dsgame-server_message.o dsgame-shop_appraise.o dsgame-shop_buy.o dsgame-shop_items.o dsgame-shop_menu.o dsgame-stop_downloading.o dsgame-synth_animation.o dsgame-synth_message.o dsgame-treasure_find_item.o dsgame-treasure_lot_item.o dsgame-uncnown_39.o dsgame-weather.o dsgame-wide_scan.o dsgame-wide_scan_track.o dsgame-zone_in.o dsgame-zone_visited.o dsgame-packet_system.o dsgame-party.o dsgame-petentity.o dsgame-petutils.o dsgame-recast_container.o dsgame-region.o dsgame-spell.o dsgame-status_effect.o dsgame-status_effect_container.o dsgame-synthutils.o dsgame-time_server.o dsgame-trade_container.o dsgame-trait.o dsgame-transport.o dsgame-treasure_pool.o dsgame-universal_container.o dsgame-vana_time.o dsgame-weapon_skill.o dsgame-zone.o dsgame-zoneutils.o -llua -lmysqlclient -ldl -lrt -lm
dsgame-charentity.o: In function `CCharEntity':
/home/work/dsp/src/map/charentity.cpp:113: undefined reference to `CMeritPoints::CMeritPoints()'
dsgame-charutils.o: In function `charutils::SaveCharExp(CCharEntity*, JOBTYPE)':
/home/work/dsp/src/map/charutils.cpp:3311: undefined reference to `CMeritPoints::GetLimitPoints()'
/home/work/dsp/src/map/charutils.cpp:3310: undefined reference to `CMeritPoints::GetMeritPoints()'
dsgame-charutils.o: In function `charutils::AddExperiencePoints(CCharEntity*, CBaseEntity*, unsigned int, unsigned int, bool)':
/home/work/dsp/src/map/charutils.cpp:2842: undefined reference to `CMeritPoints::GetLimitPoints()'
/home/work/dsp/src/map/charutils.cpp:2845: undefined reference to `CMeritPoints::AddLimitPoints(unsigned short)'
/home/work/dsp/src/map/charutils.cpp:2848: undefined reference to `CMeritPoints::GetMeritPoints()'
/home/work/dsp/src/map/charutils.cpp:2848: undefined reference to `CMeritPoints::GetMaxMerits()'
/home/work/dsp/src/map/charutils.cpp:2850: undefined reference to `CMeritPoints::GetMeritPoints()'
dsgame-charutils.o: In function `charutils::LoadChar(CCharEntity*)':
/home/work/dsp/src/map/charutils.cpp:532: undefined reference to `CMeritPoints::SetMeritPoints(unsigned short)'
/home/work/dsp/src/map/charutils.cpp:533: undefined reference to `CMeritPoints::SetLimitPoints(unsigned short)'
dsgame-lua_baseentity.o: In function `CLuaBaseEntity::setMerits(lua_State*)':
/home/work/dsp/src/map/lua/lua_baseentity.cpp:3633: undefined reference to `CMeritPoints::SetMeritPoints(unsigned short)'
dsgame-menu_merit.o: In function `CMenuMeritPacket':
/home/work/dsp/src/map/packets/menu_merit.cpp:40: undefined reference to `CMeritPoints::GetLimitPoints()'
/home/work/dsp/src/map/packets/menu_merit.cpp:41: undefined reference to `CMeritPoints::GetMeritPoints()'
collect2: ld returned 1 exit status
make: *** [dsgame] Error 1

Works fine in r1986

Do not forget to run autogen.sh each time you update the svn version