summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2016-10-02 10:30:07 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2016-10-02 10:30:07 +0000
commit7f256ac06bae526ec2a97de5bc1076b2d9e7a013 (patch)
tree1dc01474b420d704a29f2f1a1493a9a73517c737 /lib
parent489878a17828b12156d3194f423d51679320c2c0 (diff)
Remove local patch for platforms without shared libs
Diffstat (limited to 'lib')
-rw-r--r--lib/libXaw/configure.ac3
-rw-r--r--lib/libXaw/src/Makefile.am4
2 files changed, 0 insertions, 7 deletions
diff --git a/lib/libXaw/configure.ac b/lib/libXaw/configure.ac
index b3cb82b15..05ce684b1 100644
--- a/lib/libXaw/configure.ac
+++ b/lib/libXaw/configure.ac
@@ -66,9 +66,6 @@ AC_SUBST(LIBEXT)
AM_CONDITIONAL(PLATFORM_WIN32, test "x$platform_win32" = "xyes")
AM_CONDITIONAL(PLATFORM_DARWIN, test "x$platform_darwin" = "xyes")
-# some platforms don't even have shared libs
-AM_CONDITIONAL(SHARED_LIBS, [test -f /usr/libexec/ld.so])
-
# Whether to build Xaw6
AC_ARG_ENABLE(xaw6, AS_HELP_STRING([--disable-xaw6],
diff --git a/lib/libXaw/src/Makefile.am b/lib/libXaw/src/Makefile.am
index 426fd244c..7a3bc62ab 100644
--- a/lib/libXaw/src/Makefile.am
+++ b/lib/libXaw/src/Makefile.am
@@ -80,7 +80,6 @@ libXaw6_la_SOURCES = \
libXaw6_la_LDFLAGS = -version-info 6:1:0 -no-undefined
libXaw6_la_LIBADD = $(XAW6_LIBS)
-if SHARED_LIBS
if !PLATFORM_WIN32
install-exec-hook::
if PLATFORM_DARWIN
@@ -100,7 +99,6 @@ endif
endif
endif
-endif
if BUILD_XAW7
@@ -121,7 +119,6 @@ libXaw7_la_SOURCES = \
libXaw7_la_LDFLAGS = -version-info 7:0:0 -no-undefined
libXaw7_la_LIBADD = $(XAW7_LIBS)
-if SHARED_LIBS
if !PLATFORM_WIN32
install-exec-hook::
if PLATFORM_DARWIN
@@ -141,6 +138,5 @@ endif
endif
endif
-endif
EXTRA_DIST = sharedlib.c