2006-05-30 Yoshinori K. Okuji <okuji@enbug.org>
* configure.ac (CMP): Check if cmp is available explicitly.
This commit is contained in:
okuji
parent
b977bf01b3
commit
6c82634884
|
|
@ -1,3 +1,7 @@
|
|||
2006-05-30 Yoshinori K. Okuji <okuji@enbug.org>
|
||||
|
||||
* configure.ac (CMP): Check if cmp is available explicitly.
|
||||
|
||||
2006-05-29 Yoshinori K. Okuji <okuji@enbug.org>
|
||||
|
||||
* util/powerpc/ieee1275/grub-install.in (host_cpu): Removed.
|
||||
|
|
|
|||
|
|
@ -311,7 +311,7 @@ ac_includes_default="\
|
|||
# include <unistd.h>
|
||||
#endif"
|
||||
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os platform YACC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK SET_MAKE RUBY CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LIBLZO LIBCURSES TARGET_CC ac_ct_TARGET_CC OBJCOPY ac_ct_OBJCOPY STRIP ac_ct_STRIP NM ac_ct_NM TARGET_CFLAGS TARGET_CPPFLAGS TARGET_LDFLAGS LIBOBJS LTLIBOBJS'
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os platform CMP YACC INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA AWK SET_MAKE RUBY CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP EGREP LIBLZO LIBCURSES TARGET_CC ac_ct_TARGET_CC OBJCOPY ac_ct_OBJCOPY STRIP ac_ct_STRIP NM ac_ct_NM TARGET_CFLAGS TARGET_CPPFLAGS TARGET_LDFLAGS LIBOBJS LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
# Initialize some variables set by options.
|
||||
|
|
@ -1487,6 +1487,54 @@ esac
|
|||
# Checks for build programs.
|
||||
#
|
||||
|
||||
# Although cmp is listed in the GNU Coding Standards as a command which
|
||||
# can used directly, OpenBSD lacks cmp in the default installation.
|
||||
for ac_prog in cmp
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
|
||||
if test "${ac_cv_prog_CMP+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
if test -n "$CMP"; then
|
||||
ac_cv_prog_CMP="$CMP" # Let the user override the test.
|
||||
else
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_prog_CMP="$ac_prog"
|
||||
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
|
||||
fi
|
||||
fi
|
||||
CMP=$ac_cv_prog_CMP
|
||||
if test -n "$CMP"; then
|
||||
echo "$as_me:$LINENO: result: $CMP" >&5
|
||||
echo "${ECHO_T}$CMP" >&6
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
fi
|
||||
|
||||
test -n "$CMP" && break
|
||||
done
|
||||
|
||||
if test "x$CMP" = x; then
|
||||
{ { echo "$as_me:$LINENO: error: cmp is not found" >&5
|
||||
echo "$as_me: error: cmp is not found" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
for ac_prog in bison
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
|
|
@ -1528,8 +1576,8 @@ fi
|
|||
done
|
||||
|
||||
if test "x$YACC" = x; then
|
||||
{ { echo "$as_me:$LINENO: error: Could not find bison." >&5
|
||||
echo "$as_me: error: Could not find bison." >&2;}
|
||||
{ { echo "$as_me:$LINENO: error: bison is not found" >&5
|
||||
echo "$as_me: error: bison is not found" >&2;}
|
||||
{ (exit 1); exit 1; }; }
|
||||
fi
|
||||
|
||||
|
|
@ -7542,6 +7590,7 @@ s,@target_cpu@,$target_cpu,;t t
|
|||
s,@target_vendor@,$target_vendor,;t t
|
||||
s,@target_os@,$target_os,;t t
|
||||
s,@platform@,$platform,;t t
|
||||
s,@CMP@,$CMP,;t t
|
||||
s,@YACC@,$YACC,;t t
|
||||
s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
|
||||
s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
|
||||
|
|
|
|||
|
|
@ -88,9 +88,16 @@ AC_SUBST(platform)
|
|||
# Checks for build programs.
|
||||
#
|
||||
|
||||
# Although cmp is listed in the GNU Coding Standards as a command which
|
||||
# can used directly, OpenBSD lacks cmp in the default installation.
|
||||
AC_CHECK_PROGS([CMP], [cmp])
|
||||
if test "x$CMP" = x; then
|
||||
AC_MSG_ERROR([cmp is not found])
|
||||
fi
|
||||
|
||||
AC_CHECK_PROGS([YACC], [bison])
|
||||
if test "x$YACC" = x; then
|
||||
AC_MSG_ERROR([Could not find bison.])
|
||||
AC_MSG_ERROR([bison is not found])
|
||||
fi
|
||||
|
||||
AC_PROG_INSTALL
|
||||
|
|
|
|||
Loading…
Reference in New Issue