Skip to content

Commit 8886ebf

Browse files
committed
configure: remove obsolete test for socket.h link args
~~~ runit 0.13.1 Mon, 19 Jan 2004 18:32:58 +0000 * trysocketlib.c: new; check for libraries needed for socket() on some systems (fixes link failure on solaris, thx Uffe Jakobsen). ~~~ 19 years later, we don't really need to care about solaris oddities anymore.
1 parent 0d723eb commit 8886ebf

File tree

3 files changed

+1
-41
lines changed

3 files changed

+1
-41
lines changed

configure

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -327,34 +327,6 @@ if test -n "$HASWAITPID"; then
327327
echo "CPPFLAGS += -DHASWAITPID" >> $CONFIG_MK
328328
fi
329329

330-
#
331-
# Check for socket() link args.
332-
# XXX: Is this correct?
333-
#
334-
printf "Checking for socket library ... "
335-
if test -n "$SOCKETLIB"; then
336-
# XXX: this seems very wrong, the value we want is empty in most cases, yet empty means "check again"?
337-
echo "$SOCKETLIB (cached)."
338-
else
339-
_CC="$XCC configure_tests/trysocketlib.c -o trysocketlib"
340-
if $_CC 2>/dev/null; then
341-
SOCKETLIB=
342-
echo yes.
343-
elif $_CC -lxnet 2>/dev/null; then
344-
SOCKETLIB="-lxnet"
345-
echo "-lxnet"
346-
elif $_CC -lsocket -lnsl 2>/dev/null; then
347-
SOCKETLIB="-lsocket -lnsl"
348-
echo "-lsocket -lnsl"
349-
else
350-
echo no.
351-
echo "Can't find socket library!"
352-
exit 1
353-
fi
354-
rm -f trysocketlib
355-
fi
356-
echo "SOCKETLIB_LDFLAGS = $SOCKETLIB" >> $CONFIG_MK
357-
358330
#
359331
# Check for utmpx/utmp.
360332
#

configure_tests/trysocketlib.c

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ runsvchdir: runsvchdir.o unix.a byte.a
4848

4949
svlogd: svlogd.o pmatch.o fmt_ptime.o unix.a byte.a time.a
5050
@printf " [CCLD]\t\t$@\n"
51-
${SILENT}$(CC) $^ $(LDFLAGS) $(BUILD_STATIC) $(SOCKETLIB_LDFLAGS) -o $@
51+
${SILENT}$(CC) $^ $(LDFLAGS) $(BUILD_STATIC) -o $@
5252

5353
chpst: chpst.o uidgid.o unix.a byte.a
5454
@printf " [CCLD]\t\t$@\n"

0 commit comments

Comments
 (0)