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
56
57
58
|
$NetBSD: patch-ab,v 1.8 2005/04/04 08:56:18 adam Exp $
--- configure.orig 2005-02-28 22:10:33.000000000 +0000
+++ configure
@@ -5938,7 +5938,7 @@ if [ $host_os3 = hpux ] ; then
fi
-if [ $host_vendor = linux ] ; then
+if [ "$host_vendor" = linux ] ; then
LDFLAGS="$LDFLAGS -z"
fi
@@ -6221,7 +6221,7 @@ else
# 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 ${COMPILER_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
@@ -7281,7 +7281,7 @@ fi
# 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 ${COMPILER_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.
@@ -7738,6 +7738,8 @@ if test X$use_floppyd = Xyes; then
fi
FLOPPYD="floppyd floppyd_installtest"
BINFLOPPYD="\$(bindir)/floppyd \$(bindir)/floppyd_installtest"
+ MANFLOPPYD="floppyd.1"
+ MANFLOPPYD_INSTTEST="floppyd_installtest.1"
cat >>confdefs.h <<\_ACEOF
#define USE_FLOPPYD 1
@@ -7746,6 +7748,8 @@ _ACEOF
else
FLOPPYD=
BINFLOPPYD=
+ MANFLOPPYD=
+ MANFLOPPYD_INSTTEST=
fi
@@ -8401,6 +8405,8 @@ s,@X_LIBS@,$X_LIBS,;t t
s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
s,@FLOPPYD@,$FLOPPYD,;t t
s,@BINFLOPPYD@,$BINFLOPPYD,;t t
+s%@MANFLOPPYD@%$MANFLOPPYD%g
+s%@MANFLOPPYD_INSTTEST@%$MANFLOPPYD_INSTTEST%g
s,@extraincludedir@,$extraincludedir,;t t
s,@extralibdir@,$extralibdir,;t t
s,@MACHDEPLIBS@,$MACHDEPLIBS,;t t
|
