You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
60 lines
1.6 KiB
60 lines
1.6 KiB
13 years ago
|
--- 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
|