1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
$NetBSD: patch-ab,v 1.5 2003/05/22 16:16:04 salo Exp $
--- configure.orig 2000-05-28 12:22:06.000000000 +0200
+++ configure 2003-05-22 17:57:40.000000000 +0200
@@ -2626,7 +2626,7 @@
fi
-if [ $host_vendor = linux ] ; then
+if [ "$host_vendor" = linux ] ; then
LDFLAGS="$LDFLAGS -z"
fi
@@ -2908,7 +2908,7 @@
# It would also be nice to do this for all -L options, not just this one.
if test -n "$x_libraries"; then
- X_LIBS="$X_LIBS -L$x_libraries"
+ X_LIBS="$X_LIBS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries"
# For Solaris; some versions of Sun CC require a space after -R and
# others require no space. Words are not sufficient . . . .
case "`(uname -sr) 2>/dev/null`" in
@@ -3443,7 +3443,7 @@
# Check for libraries that X11R6 Xt/Xaw programs need.
ac_save_LDFLAGS="$LDFLAGS"
- test -n "$x_libraries" && LDFLAGS="$LDFLAGS -L$x_libraries"
+ test -n "$x_libraries" && LDFLAGS="$LDFLAGS -Wl,${RPATH_FLAG}$x_libraries -L$x_libraries"
# SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
# check for ICE first), but we must link in the order -lSM -lICE or
# we get undefined symbols. So assume we have SM if we have ICE.
@@ -3644,6 +3644,7 @@
fi
FLOPPYD="floppyd floppyd_installtest"
BINFLOPPYD="\$(bindir)/floppyd \$(bindir)/floppyd_installtest"
+ MANFLOPPYD="floppyd.1"
cat >> confdefs.h <<\EOF
#define USE_FLOPPYD 1
EOF
@@ -3651,6 +3652,7 @@
else
FLOPPYD=
BINFLOPPYD=
+ MANFLOPPYD=
fi
@@ -3823,6 +3825,7 @@
s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
s%@FLOPPYD@%$FLOPPYD%g
s%@BINFLOPPYD@%$BINFLOPPYD%g
+s%@MANFLOPPYD@%$MANFLOPPYD%g
s%@extraincludedir@%$extraincludedir%g
s%@extralibdir@%$extralibdir%g
s%@MACHDEPLIBS@%$MACHDEPLIBS%g
|
