blob: 0d89b4d04eb5a62bb755cf5fcaa6b9faea366719 (
plain)
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
|
--- configure.sh
+++ configure.sh
@@ -423,44 +423,12 @@ EOF
TLOGN " ($AC_CC)"
if [ $status -eq 0 ]; then
TLOG " ok"
-
- # check that the CFLAGS and LDFLAGS aren't bogus
-
- unset AC_CFLAGS AC_LDFLAGS
-
- if [ "$CFLAGS" ]; then
- test "$CFLAGS" && echo "validating CFLAGS=${CFLAGS}"
- if $AC_CC $CFLAGS -o /tmp/ngc$$.o /tmp/ngc$$.c ; then
- AC_CFLAGS=${CFLAGS:-"-g"}
- test "$CFLAGS" && echo "CFLAGS=\"${CFLAGS}\" are okay"
- elif [ "$CFLAGS" ]; then
- echo "ignoring bogus CFLAGS=\"${CFLAGS}\""
- fi
- else
- AC_CFLAGS=-g
- fi
- if [ "$LDFLAGS" ]; then
- test "$LDFLAGS" && echo "validating LDFLAGS=${LDFLAGS}"
- if $AC_CC $LDFLAGS -o /tmp/ngc$$ /tmp/ngc$$.o; then
- AC_LDFLAGS=${LDFLAGS:-"-g"}
- test "$LDFLAGS" && TLOG "LDFLAGS=\"${LDFLAGS}\" are okay"
- elif [ "$LDFLAGS" ]; then
- TLOG "ignoring bogus LDFLAGS=\"${LDFLAGS}\""
- fi
- else
- AC_LDFLAGS=${CFLAGS:-"-g"}
- fi
- AC_SUB 'CFLAGS' "$AC_CFLAGS"
- AC_SUB 'LDFLAGS' "$AC_LDFLAGS"
- else
- AC_SUB 'CFLAGS' ''
- AC_SUB 'LDFLAGS' ''
- AC_FAIL " does not compile code properly"
fi
- AC_SUB 'CC' "$AC_CC"
+ AC_SUB 'CFLAGS' "$CFLAGS"
+ AC_SUB 'LDFLAGS' "$LDFLAGS"
- rm -f /tmp/ngc$$ /tmp/ngc$$.c /tmp/ngc$$.o
+ AC_SUB 'CC' "$AC_CC"
return $status
}
@@ -896,7 +864,7 @@ AC_PROG_INSTALL () {
fi
AC_SUB 'INSTALL' "$PROG_INSTALL"
- AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL -s -m 755"
+ AC_SUB 'INSTALL_PROGRAM' "$PROG_INSTALL -m 755"
AC_SUB 'INSTALL_DATA' "$PROG_INSTALL -m 444"
# finally build a little directory installer
|
GitWeb
