Fix package management compiling with linux

simgear/package/CMakeLists.txt

@@ -23,8 +23,8 @@ if (SIMGEAR_SHARED)
     set(APP_LIBS SimGearCore)
 else()
     set(APP_LIBS
-        ${LibArchive_LIBRARIES}
         SimGearCore
+        ${LibArchive_LIBRARIES}
         ${CMAKE_THREAD_LIBS_INIT}
         ${WINSOCK_LIBRARY}
         ${ZLIB_LIBRARY}

simgear/package/Catalog.cxx

@@ -3,6 +3,7 @@
 #include <simgear/package/Catalog.hxx>
 
 #include <boost/foreach.hpp>
+#include <algorithm>
 #include <fstream>
 #include <cstring>
 

simgear/package/Root.cxx

@@ -78,7 +78,7 @@ Package* Root::getPackageById(const std::string& aName) const
     size_t lastDot = aName.rfind('.');
     
     Package* pkg = NULL;
-    if (lastDot == -1) {
+    if (lastDot == std::string::npos) {
         // naked package ID
         CatalogDict::const_iterator it = m_catalogs.begin();
         for (; it != m_catalogs.end(); ++it) {