diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2011-03-04 08:42:12 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2011-03-04 08:42:12 +0000 |
| commit | 36ed5e78e9650b30663166ae79f660ce14372662 (patch) | |
| tree | 9a405cf8b7746170921468bb077bfaabe72b34eb | |
| parent | About. Fix for Bug #216386 (Help-window build-date text is clipped). (diff) | |
| download | inkscape-36ed5e78e9650b30663166ae79f660ce14372662.tar.gz inkscape-36ed5e78e9650b30663166ae79f660ce14372662.zip | |
Fix for build on OS X. Fixes bug 707205.
Fixed bugs:
- https://launchpad.net/bugs/707205
(bzr r10078)
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 17 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 5b66ddc2c..36200710c 100644 --- a/configure.ac +++ b/configure.ac @@ -314,6 +314,19 @@ AC_MSG_RESULT([$platform_win32]) AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes") AC_SUBST(WIN32_CFLAGS) +dnl TODO - switch to a linker/libtool/feature check, not OS check: +dnl ****************************** +dnl MacOS X +dnl ****************************** +AC_MSG_CHECKING([for OSX platform]) +if test "x$build_vendor" = "xapple" ; then + platform_osx=yes +else + platform_osx=no +fi +AC_MSG_RESULT([$platform_osx]) +AM_CONDITIONAL(EXPORT_DYNAMIC_DIRECT, test "$platform_osx" = "yes") + AC_MSG_CHECKING([for Solaris platform]) case "$host" in *-solaris2.*) diff --git a/src/Makefile.am b/src/Makefile.am index 993fd01ac..731e9bfd6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -212,7 +212,11 @@ libinkscape_a_SOURCES = $(ink_common_sources) inkscape_SOURCES += main.cpp $(win32_sources) inkscape_LDADD = $(all_libs) +if EXPORT_DYNAMIC_DIRECT +inkscape_LDFLAGS = --export-dynamic $(kdeldflags) $(mwindows) +else inkscape_LDFLAGS = -Wl,--export-dynamic $(kdeldflags) $(mwindows) +endif inkview_SOURCES += inkview.cpp $(win32_sources) inkview_LDADD = $(all_libs) |