* Makefile.in: Use CXX to build the DLL.
* configure.in: Find correct c++ compiler. * configure: Regenerate.
This commit is contained in:
parent
8494f61e7c
commit
92311ab5e5
|
@ -1,3 +1,9 @@
|
||||||
|
Sun Dec 3 00:40:47 2000 Christopher Faylor <cgf@cygnus.com>
|
||||||
|
|
||||||
|
* Makefile.in: Use CXX to build the DLL.
|
||||||
|
* configure.in: Find correct c++ compiler.
|
||||||
|
* configure: Regenerate.
|
||||||
|
|
||||||
Sat Nov 18 23:53:59 2000 Christopher Faylor <cgf@cygnus.com>
|
Sat Nov 18 23:53:59 2000 Christopher Faylor <cgf@cygnus.com>
|
||||||
|
|
||||||
* utils.sgml: Document new options for ps and strace.
|
* utils.sgml: Document new options for ps and strace.
|
||||||
|
|
|
@ -27,7 +27,7 @@ EXEEXT_FOR_BUILD:=@EXEEXT_FOR_BUILD@
|
||||||
|
|
||||||
CC:=@CC@
|
CC:=@CC@
|
||||||
CC_FOR_TARGET:=$(CC)
|
CC_FOR_TARGET:=$(CC)
|
||||||
CXX:=${subst gcc,g++,$(CC)}
|
CXX:=@CXX@
|
||||||
CXX_FOR_TARGET:=$(CXX)
|
CXX_FOR_TARGET:=$(CXX)
|
||||||
|
|
||||||
CFLAGS:=@CFLAGS@
|
CFLAGS:=@CFLAGS@
|
||||||
|
|
|
@ -536,138 +536,6 @@ fi
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Extract the first word of "gcc", so it can be a program name with args.
|
|
||||||
set dummy gcc; ac_word=$2
|
|
||||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
||||||
echo "configure:543: checking for $ac_word" >&5
|
|
||||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
|
||||||
else
|
|
||||||
if test -n "$CC"; then
|
|
||||||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
||||||
else
|
|
||||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
|
||||||
ac_dummy="$PATH"
|
|
||||||
for ac_dir in $ac_dummy; do
|
|
||||||
test -z "$ac_dir" && ac_dir=.
|
|
||||||
if test -f $ac_dir/$ac_word; then
|
|
||||||
ac_cv_prog_CC="gcc"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
IFS="$ac_save_ifs"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
CC="$ac_cv_prog_CC"
|
|
||||||
if test -n "$CC"; then
|
|
||||||
echo "$ac_t""$CC" 1>&6
|
|
||||||
else
|
|
||||||
echo "$ac_t""no" 1>&6
|
|
||||||
fi
|
|
||||||
|
|
||||||
if test -z "$CC"; then
|
|
||||||
# Extract the first word of "cc", so it can be a program name with args.
|
|
||||||
set dummy cc; ac_word=$2
|
|
||||||
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
|
||||||
echo "configure:573: checking for $ac_word" >&5
|
|
||||||
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
|
||||||
else
|
|
||||||
if test -n "$CC"; then
|
|
||||||
ac_cv_prog_CC="$CC" # Let the user override the test.
|
|
||||||
else
|
|
||||||
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
|
||||||
ac_prog_rejected=no
|
|
||||||
ac_dummy="$PATH"
|
|
||||||
for ac_dir in $ac_dummy; do
|
|
||||||
test -z "$ac_dir" && ac_dir=.
|
|
||||||
if test -f $ac_dir/$ac_word; then
|
|
||||||
if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
|
|
||||||
ac_prog_rejected=yes
|
|
||||||
continue
|
|
||||||
fi
|
|
||||||
ac_cv_prog_CC="cc"
|
|
||||||
break
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
IFS="$ac_save_ifs"
|
|
||||||
if test $ac_prog_rejected = yes; then
|
|
||||||
# We found a bogon in the path, so make sure we never use it.
|
|
||||||
set dummy $ac_cv_prog_CC
|
|
||||||
shift
|
|
||||||
if test $# -gt 0; then
|
|
||||||
# We chose a different compiler from the bogus one.
|
|
||||||
# However, it has the same basename, so the bogon will be chosen
|
|
||||||
# first if we set CC to just the basename; use the full file name.
|
|
||||||
shift
|
|
||||||
set dummy "$ac_dir/$ac_word" "$@"
|
|
||||||
shift
|
|
||||||
ac_cv_prog_CC="$@"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
CC="$ac_cv_prog_CC"
|
|
||||||
if test -n "$CC"; then
|
|
||||||
echo "$ac_t""$CC" 1>&6
|
|
||||||
else
|
|
||||||
echo "$ac_t""no" 1>&6
|
|
||||||
fi
|
|
||||||
|
|
||||||
test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
|
|
||||||
echo "configure:622: checking whether we are using GNU C" >&5
|
|
||||||
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
|
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
|
||||||
else
|
|
||||||
cat > conftest.c <<EOF
|
|
||||||
#ifdef __GNUC__
|
|
||||||
yes;
|
|
||||||
#endif
|
|
||||||
EOF
|
|
||||||
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
|
||||||
ac_cv_prog_gcc=yes
|
|
||||||
else
|
|
||||||
ac_cv_prog_gcc=no
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "$ac_t""$ac_cv_prog_gcc" 1>&6
|
|
||||||
|
|
||||||
if test $ac_cv_prog_gcc = yes; then
|
|
||||||
GCC=yes
|
|
||||||
ac_test_CFLAGS="${CFLAGS+set}"
|
|
||||||
ac_save_CFLAGS="$CFLAGS"
|
|
||||||
CFLAGS=
|
|
||||||
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
|
||||||
echo "configure:646: checking whether ${CC-cc} accepts -g" >&5
|
|
||||||
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
|
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
|
||||||
else
|
|
||||||
echo 'void f(){}' > conftest.c
|
|
||||||
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
|
|
||||||
ac_cv_prog_cc_g=yes
|
|
||||||
else
|
|
||||||
ac_cv_prog_cc_g=no
|
|
||||||
fi
|
|
||||||
rm -f conftest*
|
|
||||||
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
|
|
||||||
if test "$ac_test_CFLAGS" = set; then
|
|
||||||
CFLAGS="$ac_save_CFLAGS"
|
|
||||||
elif test $ac_cv_prog_cc_g = yes; then
|
|
||||||
CFLAGS="-g -O2"
|
|
||||||
else
|
|
||||||
CFLAGS="-O2"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
GCC=
|
|
||||||
test "${CFLAGS+set}" = set || CFLAGS="-g"
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
ac_aux_dir=
|
ac_aux_dir=
|
||||||
|
@ -717,7 +585,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo $ac_n "checking host system type""... $ac_c" 1>&6
|
echo $ac_n "checking host system type""... $ac_c" 1>&6
|
||||||
echo "configure:721: checking host system type" >&5
|
echo "configure:589: checking host system type" >&5
|
||||||
|
|
||||||
host_alias=$host
|
host_alias=$host
|
||||||
case "$host_alias" in
|
case "$host_alias" in
|
||||||
|
@ -738,7 +606,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||||
echo "$ac_t""$host" 1>&6
|
echo "$ac_t""$host" 1>&6
|
||||||
|
|
||||||
echo $ac_n "checking target system type""... $ac_c" 1>&6
|
echo $ac_n "checking target system type""... $ac_c" 1>&6
|
||||||
echo "configure:742: checking target system type" >&5
|
echo "configure:610: checking target system type" >&5
|
||||||
|
|
||||||
target_alias=$target
|
target_alias=$target
|
||||||
case "$target_alias" in
|
case "$target_alias" in
|
||||||
|
@ -756,7 +624,7 @@ target_os=`echo $target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
|
||||||
echo "$ac_t""$target" 1>&6
|
echo "$ac_t""$target" 1>&6
|
||||||
|
|
||||||
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
echo $ac_n "checking build system type""... $ac_c" 1>&6
|
||||||
echo "configure:760: checking build system type" >&5
|
echo "configure:628: checking build system type" >&5
|
||||||
|
|
||||||
build_alias=$build
|
build_alias=$build
|
||||||
case "$build_alias" in
|
case "$build_alias" in
|
||||||
|
@ -778,6 +646,249 @@ test "$host_alias" != "$target_alias" &&
|
||||||
NONENONEs,x,x, &&
|
NONENONEs,x,x, &&
|
||||||
program_prefix=${target_alias}-
|
program_prefix=${target_alias}-
|
||||||
|
|
||||||
|
|
||||||
|
# Extract the first word of "gcc", so it can be a program name with args.
|
||||||
|
set dummy gcc; ac_word=$2
|
||||||
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||||
|
echo "configure:654: checking for $ac_word" >&5
|
||||||
|
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||||
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
|
else
|
||||||
|
if test -n "$CC"; then
|
||||||
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||||||
|
else
|
||||||
|
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||||
|
ac_dummy="$PATH"
|
||||||
|
for ac_dir in $ac_dummy; do
|
||||||
|
test -z "$ac_dir" && ac_dir=.
|
||||||
|
if test -f $ac_dir/$ac_word; then
|
||||||
|
ac_cv_prog_CC="gcc"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
IFS="$ac_save_ifs"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
CC="$ac_cv_prog_CC"
|
||||||
|
if test -n "$CC"; then
|
||||||
|
echo "$ac_t""$CC" 1>&6
|
||||||
|
else
|
||||||
|
echo "$ac_t""no" 1>&6
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test -z "$CC"; then
|
||||||
|
# Extract the first word of "cc", so it can be a program name with args.
|
||||||
|
set dummy cc; ac_word=$2
|
||||||
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||||
|
echo "configure:684: checking for $ac_word" >&5
|
||||||
|
if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
|
||||||
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
|
else
|
||||||
|
if test -n "$CC"; then
|
||||||
|
ac_cv_prog_CC="$CC" # Let the user override the test.
|
||||||
|
else
|
||||||
|
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||||
|
ac_prog_rejected=no
|
||||||
|
ac_dummy="$PATH"
|
||||||
|
for ac_dir in $ac_dummy; do
|
||||||
|
test -z "$ac_dir" && ac_dir=.
|
||||||
|
if test -f $ac_dir/$ac_word; then
|
||||||
|
if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
|
||||||
|
ac_prog_rejected=yes
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
ac_cv_prog_CC="cc"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
IFS="$ac_save_ifs"
|
||||||
|
if test $ac_prog_rejected = yes; then
|
||||||
|
# We found a bogon in the path, so make sure we never use it.
|
||||||
|
set dummy $ac_cv_prog_CC
|
||||||
|
shift
|
||||||
|
if test $# -gt 0; then
|
||||||
|
# We chose a different compiler from the bogus one.
|
||||||
|
# However, it has the same basename, so the bogon will be chosen
|
||||||
|
# first if we set CC to just the basename; use the full file name.
|
||||||
|
shift
|
||||||
|
set dummy "$ac_dir/$ac_word" "$@"
|
||||||
|
shift
|
||||||
|
ac_cv_prog_CC="$@"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
CC="$ac_cv_prog_CC"
|
||||||
|
if test -n "$CC"; then
|
||||||
|
echo "$ac_t""$CC" 1>&6
|
||||||
|
else
|
||||||
|
echo "$ac_t""no" 1>&6
|
||||||
|
fi
|
||||||
|
|
||||||
|
test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
|
||||||
|
echo "configure:733: checking whether we are using GNU C" >&5
|
||||||
|
if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
|
||||||
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
|
else
|
||||||
|
cat > conftest.c <<EOF
|
||||||
|
#ifdef __GNUC__
|
||||||
|
yes;
|
||||||
|
#endif
|
||||||
|
EOF
|
||||||
|
if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:742: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
|
||||||
|
ac_cv_prog_gcc=yes
|
||||||
|
else
|
||||||
|
ac_cv_prog_gcc=no
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$ac_t""$ac_cv_prog_gcc" 1>&6
|
||||||
|
|
||||||
|
if test $ac_cv_prog_gcc = yes; then
|
||||||
|
GCC=yes
|
||||||
|
ac_test_CFLAGS="${CFLAGS+set}"
|
||||||
|
ac_save_CFLAGS="$CFLAGS"
|
||||||
|
CFLAGS=
|
||||||
|
echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
|
||||||
|
echo "configure:757: checking whether ${CC-cc} accepts -g" >&5
|
||||||
|
if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
|
||||||
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
|
else
|
||||||
|
echo 'void f(){}' > conftest.c
|
||||||
|
if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
|
||||||
|
ac_cv_prog_cc_g=yes
|
||||||
|
else
|
||||||
|
ac_cv_prog_cc_g=no
|
||||||
|
fi
|
||||||
|
rm -f conftest*
|
||||||
|
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
|
||||||
|
if test "$ac_test_CFLAGS" = set; then
|
||||||
|
CFLAGS="$ac_save_CFLAGS"
|
||||||
|
elif test $ac_cv_prog_cc_g = yes; then
|
||||||
|
CFLAGS="-g -O2"
|
||||||
|
else
|
||||||
|
CFLAGS="-O2"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
GCC=
|
||||||
|
test "${CFLAGS+set}" = set || CFLAGS="-g"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test $host != $build; then
|
||||||
|
ac_tool_prefix=${host_alias}-
|
||||||
|
else
|
||||||
|
ac_tool_prefix=
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Extract the first word of "${ac_tool_prefix}g++", so it can be a program name with args.
|
||||||
|
set dummy ${ac_tool_prefix}g++; ac_word=$2
|
||||||
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||||
|
echo "configure:793: checking for $ac_word" >&5
|
||||||
|
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
|
||||||
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
|
else
|
||||||
|
if test -n "$CXX"; then
|
||||||
|
ac_cv_prog_CXX="$CXX" # Let the user override the test.
|
||||||
|
else
|
||||||
|
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||||
|
ac_dummy="$PATH"
|
||||||
|
for ac_dir in $ac_dummy; do
|
||||||
|
test -z "$ac_dir" && ac_dir=.
|
||||||
|
if test -f $ac_dir/$ac_word; then
|
||||||
|
ac_cv_prog_CXX="${ac_tool_prefix}g++"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
IFS="$ac_save_ifs"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
CXX="$ac_cv_prog_CXX"
|
||||||
|
if test -n "$CXX"; then
|
||||||
|
echo "$ac_t""$CXX" 1>&6
|
||||||
|
else
|
||||||
|
echo "$ac_t""no" 1>&6
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
if test -z "$ac_cv_prog_CXX"; then
|
||||||
|
if test -n "$ac_tool_prefix"; then
|
||||||
|
# Extract the first word of "g++", so it can be a program name with args.
|
||||||
|
set dummy g++; ac_word=$2
|
||||||
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||||
|
echo "configure:825: checking for $ac_word" >&5
|
||||||
|
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
|
||||||
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
|
else
|
||||||
|
if test -n "$CXX"; then
|
||||||
|
ac_cv_prog_CXX="$CXX" # Let the user override the test.
|
||||||
|
else
|
||||||
|
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||||
|
ac_dummy="$PATH"
|
||||||
|
for ac_dir in $ac_dummy; do
|
||||||
|
test -z "$ac_dir" && ac_dir=.
|
||||||
|
if test -f $ac_dir/$ac_word; then
|
||||||
|
ac_cv_prog_CXX="g++"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
IFS="$ac_save_ifs"
|
||||||
|
test -z "$ac_cv_prog_CXX" && ac_cv_prog_CXX="g++"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
CXX="$ac_cv_prog_CXX"
|
||||||
|
if test -n "$CXX"; then
|
||||||
|
echo "$ac_t""$CXX" 1>&6
|
||||||
|
else
|
||||||
|
echo "$ac_t""no" 1>&6
|
||||||
|
fi
|
||||||
|
|
||||||
|
else
|
||||||
|
CXX="g++"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test -z "$CXX"; then
|
||||||
|
# Extract the first word of "c++", so it can be a program name with args.
|
||||||
|
set dummy c++; ac_word=$2
|
||||||
|
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
|
||||||
|
echo "configure:861: checking for $ac_word" >&5
|
||||||
|
if eval "test \"`echo '$''{'ac_cv_prog_CXX'+set}'`\" = set"; then
|
||||||
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
|
else
|
||||||
|
if test -n "$CXX"; then
|
||||||
|
ac_cv_prog_CXX="$CXX" # Let the user override the test.
|
||||||
|
else
|
||||||
|
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
|
||||||
|
ac_dummy="$PATH"
|
||||||
|
for ac_dir in $ac_dummy; do
|
||||||
|
test -z "$ac_dir" && ac_dir=.
|
||||||
|
if test -f $ac_dir/$ac_word; then
|
||||||
|
ac_cv_prog_CXX="c++"
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
IFS="$ac_save_ifs"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
CXX="$ac_cv_prog_CXX"
|
||||||
|
if test -n "$CXX"; then
|
||||||
|
echo "$ac_t""$CXX" 1>&6
|
||||||
|
else
|
||||||
|
echo "$ac_t""no" 1>&6
|
||||||
|
fi
|
||||||
|
|
||||||
|
test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
|
||||||
|
fi
|
||||||
|
|
||||||
|
CXXFLAGS='$(CFLAGS)'
|
||||||
|
|
||||||
|
|
||||||
if test "$program_transform_name" = s,x,x,; then
|
if test "$program_transform_name" = s,x,x,; then
|
||||||
program_transform_name=
|
program_transform_name=
|
||||||
else
|
else
|
||||||
|
@ -821,7 +932,7 @@ fi
|
||||||
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
|
||||||
# ./install, which can be erroneously created by make from ./install.sh.
|
# ./install, which can be erroneously created by make from ./install.sh.
|
||||||
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
|
echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
|
||||||
echo "configure:825: checking for a BSD compatible install" >&5
|
echo "configure:936: checking for a BSD compatible install" >&5
|
||||||
if test -z "$INSTALL"; then
|
if test -z "$INSTALL"; then
|
||||||
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
|
@ -875,19 +986,19 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
|
||||||
|
|
||||||
|
|
||||||
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
|
echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6
|
||||||
echo "configure:879: checking for Cygwin environment" >&5
|
echo "configure:990: checking for Cygwin environment" >&5
|
||||||
if eval "test \"`echo '$''{'am_cv_cygwin'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'am_cv_cygwin'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 884 "configure"
|
#line 995 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
return __CYGWIN32__;
|
return __CYGWIN32__;
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:891: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
if { (eval echo configure:1002: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
am_cv_cygwin=yes
|
am_cv_cygwin=yes
|
||||||
else
|
else
|
||||||
|
@ -904,19 +1015,19 @@ echo "$ac_t""$am_cv_cygwin" 1>&6
|
||||||
CYGWIN=
|
CYGWIN=
|
||||||
test "$am_cv_cygwin" = yes && CYGWIN=yes
|
test "$am_cv_cygwin" = yes && CYGWIN=yes
|
||||||
echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6
|
echo $ac_n "checking for Mingw32 environment""... $ac_c" 1>&6
|
||||||
echo "configure:908: checking for Mingw32 environment" >&5
|
echo "configure:1019: checking for Mingw32 environment" >&5
|
||||||
if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'am_cv_mingw32'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
cat > conftest.$ac_ext <<EOF
|
cat > conftest.$ac_ext <<EOF
|
||||||
#line 913 "configure"
|
#line 1024 "configure"
|
||||||
#include "confdefs.h"
|
#include "confdefs.h"
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
return __MINGW32__;
|
return __MINGW32__;
|
||||||
; return 0; }
|
; return 0; }
|
||||||
EOF
|
EOF
|
||||||
if { (eval echo configure:920: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
if { (eval echo configure:1031: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
|
||||||
rm -rf conftest*
|
rm -rf conftest*
|
||||||
am_cv_mingw32=yes
|
am_cv_mingw32=yes
|
||||||
else
|
else
|
||||||
|
@ -935,7 +1046,7 @@ test "$am_cv_mingw32" = yes && MINGW32=yes
|
||||||
|
|
||||||
|
|
||||||
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
|
echo $ac_n "checking for executable suffix""... $ac_c" 1>&6
|
||||||
echo "configure:939: checking for executable suffix" >&5
|
echo "configure:1050: checking for executable suffix" >&5
|
||||||
if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then
|
if eval "test \"`echo '$''{'am_cv_exeext'+set}'`\" = set"; then
|
||||||
echo $ac_n "(cached) $ac_c" 1>&6
|
echo $ac_n "(cached) $ac_c" 1>&6
|
||||||
else
|
else
|
||||||
|
@ -1111,7 +1222,6 @@ s%@includedir@%$includedir%g
|
||||||
s%@oldincludedir@%$oldincludedir%g
|
s%@oldincludedir@%$oldincludedir%g
|
||||||
s%@infodir@%$infodir%g
|
s%@infodir@%$infodir%g
|
||||||
s%@mandir@%$mandir%g
|
s%@mandir@%$mandir%g
|
||||||
s%@CC@%$CC%g
|
|
||||||
s%@host@%$host%g
|
s%@host@%$host%g
|
||||||
s%@host_alias@%$host_alias%g
|
s%@host_alias@%$host_alias%g
|
||||||
s%@host_cpu@%$host_cpu%g
|
s%@host_cpu@%$host_cpu%g
|
||||||
|
@ -1127,6 +1237,8 @@ s%@build_alias@%$build_alias%g
|
||||||
s%@build_cpu@%$build_cpu%g
|
s%@build_cpu@%$build_cpu%g
|
||||||
s%@build_vendor@%$build_vendor%g
|
s%@build_vendor@%$build_vendor%g
|
||||||
s%@build_os@%$build_os%g
|
s%@build_os@%$build_os%g
|
||||||
|
s%@CC@%$CC%g
|
||||||
|
s%@CXX@%$CXX%g
|
||||||
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
|
s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
|
||||||
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
|
s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
|
||||||
s%@INSTALL_DATA@%$INSTALL_DATA%g
|
s%@INSTALL_DATA@%$INSTALL_DATA%g
|
||||||
|
|
|
@ -51,9 +51,22 @@ else
|
||||||
fi
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
LIB_AC_PROG_CC
|
AC_DEFUN(LIB_AC_PROG_CXX,
|
||||||
|
[AC_BEFORE([$0], [AC_PROG_CPP])dnl
|
||||||
|
AC_CHECK_TOOL(CXX, g++, g++)
|
||||||
|
if test -z "$CXX"; then
|
||||||
|
AC_CHECK_PROG(CXX, c++, c++, , , )
|
||||||
|
test -z "$CC" && AC_MSG_ERROR([no acceptable cc found in \$PATH])
|
||||||
|
fi
|
||||||
|
|
||||||
|
CXXFLAGS='$(CFLAGS)'
|
||||||
|
])
|
||||||
|
|
||||||
AC_CANONICAL_SYSTEM
|
AC_CANONICAL_SYSTEM
|
||||||
|
|
||||||
|
LIB_AC_PROG_CC
|
||||||
|
LIB_AC_PROG_CXX
|
||||||
|
|
||||||
AC_ARG_PROGRAM
|
AC_ARG_PROGRAM
|
||||||
|
|
||||||
if test "x$cross_compiling" = "xyes"; then
|
if test "x$cross_compiling" = "xyes"; then
|
||||||
|
|
Loading…
Reference in New Issue