Ticket #1094: auto-link-pkg-config.2.patch

boost/config/auto_link.hpp

@@ -87 +87 @@
 #  define BOOST_DO_STRINGIZE(X) #X
 #endif
 //
-// Only include what follows for known and supported compilers:
+// Unsupported compilers use pkg-config.
 //
 #if defined(BOOST_MSVC) \
     || defined(__BORLANDC__) \
     || (defined(__MWERKS__) && defined(_WIN32) && (__MWERKS__ >= 0x3000)) \
     || (defined(__ICL) && defined(_MSC_EXTENSIONS) && (_MSC_VER >= 1200))
+#undef BOOST_PKG_CONFIG
+#else
+#define BOOST_PKG_CONFIG 1
+#endif
 
 #ifndef BOOST_VERSION_HPP
 #  include <boost/version.hpp>
@@ -361 +365 @@
       && defined(BOOST_LIB_RT_OPT) \
       && defined(BOOST_LIB_VERSION)
 
-#ifdef BOOST_AUTO_LINK_TAGGED
-#  pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib")
-#  ifdef BOOST_LIB_DIAGNOSTIC
-#     pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
+#ifdef BOOST_PKG_CONFIG
+#  ifdef BOOST_PKG_CONFIG_DUMP
+#    ifndef BOOST_PKG_CONFIG_SETUP
+#      define BOOST_PKG_CONFIG_SETUP
+#      include <vector>
+#      include <string>
+namespace boost
+{
+  namespace pkg_config
+  {
+    struct library_list
+    {
+    public:
+      static std::vector<std::string> list;
+      library_list(const char *lib) { list.push_back(lib); }
+    };
+    std::vector<std::string> library_list::list;
+  }
+}
+#    endif
+
+namespace
+{
+  boost::pkg_config::library_list BOOST_LIB_NAME (BOOST_STRINGIZE(BOOST_LIB_NAME));
+}
 #  endif
+#else
+#  ifdef BOOST_AUTO_LINK_TAGGED
+#    pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT ".lib")
+#    ifdef BOOST_LIB_DIAGNOSTIC
+#      pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
+#    endif
 #elif defined(BOOST_AUTO_LINK_NOMANGLE)
-#  pragma comment(lib, BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib")
-#  ifdef BOOST_LIB_DIAGNOSTIC
-#     pragma message ("Linking to lib file: " BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib")
+#    pragma comment(lib, BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib")
+#    ifdef BOOST_LIB_DIAGNOSTIC
+#      pragma message ("Linking to lib file: " BOOST_STRINGIZE(BOOST_LIB_NAME) ".lib")
+#    endif
+#  else
+#    pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
+#    ifdef BOOST_LIB_DIAGNOSTIC
+#      pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
+#    endif
 #  endif
-#else
-#  pragma comment(lib, BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
-#  ifdef BOOST_LIB_DIAGNOSTIC
-#     pragma message ("Linking to lib file: " BOOST_LIB_PREFIX BOOST_STRINGIZE(BOOST_LIB_NAME) "-" BOOST_LIB_TOOLSET BOOST_LIB_THREAD_OPT BOOST_LIB_RT_OPT "-" BOOST_LIB_VERSION ".lib")
-#  endif
 #endif
 
 #else
@@ -383 +415 @@
 #endif
 
 
-#endif // _MSC_VER || __BORLANDC__
 
 //
 // finally undef any macros we may have set: