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
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
|
--- configure.in
+++ configure.in
@@ -243,11 +243,9 @@
mandir=`var "$mandir" "$exec_prefix/man"`
dnl docdir is available in autoconf 2.60+, for older versions preseed
dnl with the same value that 2.60+ uses
-docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
-stdocdir="${docdir}/stonith"
-libdir=`var "$libdir" "$exec_prefix/lib"`
-libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
-noarchlibdir=`var "$noarchlibdir" "$prefix/lib"`
+dnl docdir=`var "$docdir" "${datadir}/doc/${PACKAGE_NAME}"`
+dnl stdocdir="${docdir}/stonith"
+dnl libexecdir=`var "$libexecdir" "$exec_prefix/libexec"`
@@ -285,60 +283,11 @@
LIBC=`${LDD} ${tmpOutfile} | grep libc | sed -e 's%.*=> *%%' -e 's% .*$%%'`
LibCdir=`dirname $LIBC`
dirlist=`echo $LibCdir | tr '/' ' '`
- LibDirSuffix=unknown
- for dir in $dirlist
- do
- case $dir in
- *lib*) LibDirSuffix=$dir; break;;
- *);;
- esac
- done
- case $LibDirSuffix in
- unknown) LibDirSuffix=`basename $LibCdir`;;
- esac
OutFileType=`file $tmpOutfile`
rm -f $tmpCfile $tmpOutfile
else
AC_MSG_ERROR([Cannot Compile trivial C program])
fi
-#
-# The code above doesn't work right everywhere
-# (like Fedora and OpenBSD)
-#
-case ${LibDirSuffix} in
- *lib*) : Cool;;
- *) : Sigh...
- case $OutFileType in
- *64-bit*)
- case $host_os in
- openbsd*) LibDirSuffix=lib;;
- *) LibDirSuffix=lib64;;
- esac;;
- *32-bit*) LibDirSuffix=lib;;
- *) LibDirSuffix=lib;;
- esac;;
-esac
-#
-# This may not yet be quite right for PPC where the default
-# is to produce 32-bit binaries, even though the OS is 64-bit
-# or for that matter for system Z, But, it's a lot better than
-# it used to be.
-#
-AC_MSG_RESULT($LibDirSuffix)
-
-case $libdir in
- */*${LibDirSuffix}) : Cool ;;
- *) : Uh Oh...
- libdir=`dirname $libdir`/$LibDirSuffix
- AC_MSG_WARN([Overriding libdir to: $libdir]);;
-esac
-case $libexecdir in
- */$LibDirSuffix) : Cool ;;
- *) : Uh Oh...
- libexecdir=`dirname $libexecdir`/$LibDirSuffix
- AC_MSG_WARN([Overriding libexecdir to: $libexecdir]);;
-esac
-
for j in exec_prefix bindir sbindir datadir sysconfdir localstatedir \
includedir oldincludedir mandir docdir stdocdir libdir noarchlibdir
do
@@ -387,7 +336,6 @@
fi
AC_CHECK_HEADERS(heartbeat/glue_config.h)
-GLUE_HEADER=none
if test "$ac_cv_header_heartbeat_glue_config_h" = "yes"; then
GLUE_HEADER=heartbeat/glue_config.h
else
@@ -454,15 +402,6 @@
dnl We use this in the RPM specfile...
AC_SUBST(ac_configure_args)
-cleaned_configure_args=""
-for j in ${ac_configure_args}
-do
- case $j in
- *--libdir=*|*--libexecdir=*) ;;
- *) cleaned_configure_args="$cleaned_configure_args $j";;
- esac
-done
-AC_SUBST(cleaned_configure_args)
dnl *************************************************************************
PATH="$PATH:/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin"
|
GitWeb