From 2277b076a72cbbbd43d77e830ae30b370dc9af3a Mon Sep 17 00:00:00 2001 From: Robin Mills Date: Tue, 10 Jul 2012 01:10:24 +0000 Subject: [PATCH] fix version.cpp to compile, link and run on linux --- config/config.mk.in | 2 +- src/version.cpp | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/config/config.mk.in b/config/config.mk.in index e36a1470..a19b785b 100644 --- a/config/config.mk.in +++ b/config/config.mk.in @@ -153,7 +153,7 @@ COMPILE.cc = $(CXX) $(CXXFLAGS) $(CPPFLAGS) -c COMPILE.c = $(CC) $(CFLAGS) $(CPPFLAGS) -c # LINK.cc does not need $(LIBS), libtool's dark magic takes care of that # when linking a binary with a libtool library. -LINK.cc = $(CXX) $(LDFLAGS) +LINK.cc = $(CXX) $(LDFLAGS) -ldl # ********************************************************************** # Installation programs diff --git a/src/version.cpp b/src/version.cpp index e87d095e..7d693d1c 100644 --- a/src/version.cpp +++ b/src/version.cpp @@ -68,6 +68,7 @@ namespace Exiv2 { } // namespace Exiv2 +#include // platform specific support for dumpLibraryInfo #ifdef WIN32 @@ -85,7 +86,7 @@ namespace Exiv2 { #elif __APPLE__ # include -#else __LINUX__ +#else __linux__ // http://syprog.blogspot.com/2011/12/listing-loaded-shared-objects-in-linux.html # include "link.h" # include @@ -162,7 +163,7 @@ EXIV2API void dumpLibraryInfo(std::ostream& os) } } -#elif __LINUX__ +#elif __linux__ bReport = true; // http://syprog.blogspot.com/2011/12/listing-loaded-shared-objects-in-linux.html struct lmap* pl;