aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClemens Lang <cal@macports.org>2015-03-15 17:26:24 +0100
committerMihai Moldovan <ionic@ionic.de>2015-03-15 17:26:24 +0100
commitad7e12ed39cc4091ff878ea2b3e748e0147dd57f (patch)
tree7d6caaf15fc504e4b99aca667295864a4dd2a1a1
parent5464a6dba5742a9f22ba18c9b307d4ee42394378 (diff)
downloadnx-libs-ad7e12ed39cc4091ff878ea2b3e748e0147dd57f.tar.gz
nx-libs-ad7e12ed39cc4091ff878ea2b3e748e0147dd57f.tar.bz2
nx-libs-ad7e12ed39cc4091ff878ea2b3e748e0147dd57f.zip
nxcomp{,shad}: fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle.
-rw-r--r--debian/changelog1
-rw-r--r--nxcomp/configure.in4
-rw-r--r--nxcompshad/configure.in4
3 files changed, 5 insertions, 4 deletions
diff --git a/debian/changelog b/debian/changelog
index 664717898..771139d9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ nx-libs (2:3.5.0.31-0x2go1) UNRELEASED; urgency=low
[ Clemens Lang ]
* Use path discovery for finding makedepend. Remove old cruft.
+ * Fix dynamic library linking on OS X. Use -dynamiclib instead of -bundle.
-- X2Go Release Manager <git-admin@x2go.org> Sun, 15 Mar 2015 00:48:06 +0100
diff --git a/nxcomp/configure.in b/nxcomp/configure.in
index 2378a9398..07c88df77 100644
--- a/nxcomp/configure.in
+++ b/nxcomp/configure.in
@@ -183,11 +183,11 @@ if test "$FreeBSD" = yes; then
fi
dnl Under Darwin we don't have support for -soname option and
-dnl we need the -bundle flag. Under Solaris, instead, we need
+dnl we need the -dynamiclib flag. Under Solaris, instead, we need
dnl the options -G -h.
if test "$DARWIN" = yes; then
- LDFLAGS="$LDFLAGS -bundle"
+ LDFLAGS="$LDFLAGS -dynamiclib"
elif test "$SUN" = yes; then
LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
else
diff --git a/nxcompshad/configure.in b/nxcompshad/configure.in
index a76c6b9a1..4e91361ff 100644
--- a/nxcompshad/configure.in
+++ b/nxcompshad/configure.in
@@ -175,11 +175,11 @@ if test "$FreeBSD" = yes; then
fi
dnl Under Darwin we don't have support for -soname option and
-dnl we need the -bundle flag. Under Solaris, instead, we need
+dnl we need the -dynamiclib flag. Under Solaris, instead, we need
dnl the options -G -h.
if test "$DARWIN" = yes; then
- LDFLAGS="$LDFLAGS -bundle"
+ LDFLAGS="$LDFLAGS -dynamiclib"
elif test "$SUN" = yes; then
LDFLAGS="$LDFLAGS -G -h \$(LIBLOAD)"
else