* configure.in: Don't check if "file" can use stdin - it's

unused now.
This commit is contained in:
Pavel Roskin 2003-10-29 01:25:42 +00:00
parent 87206cfeb5
commit af86cebacd
2 changed files with 17 additions and 47 deletions

View File

@ -1,3 +1,8 @@
2003-10-28 Pavel Roskin <proski@gnu.org>
* configure.in: Don't check if "file" can use stdin - it's
unused now.
2003-10-25 Pavel Roskin <proski@gnu.org> 2003-10-25 Pavel Roskin <proski@gnu.org>
* extraconf.h: Don't define HAVE_GRANTPT forcedly if grantpt() * extraconf.h: Don't define HAVE_GRANTPT forcedly if grantpt()

View File

@ -418,60 +418,25 @@ AC_SUBST(MAN_FLAGS)
dnl dnl
dnl Check for - option to file dnl Check for -L option to file
dnl dnl
AC_CHECK_PROG(HAVE_FILECMD, file, true, false) AC_CHECK_PROG(HAVE_FILECMD, file, true, false)
if $HAVE_FILECMD; then if $HAVE_FILECMD; then
AC_MSG_CHECKING([for - option to file command]) AC_MSG_CHECKING([for -L option to file command])
AC_CACHE_VAL(ac_cv_filestdin, [[ AC_CACHE_VAL(ac_cv_filel, [
cat > conftest.c <<\EOF file -L . > /dev/null 2>&1
/* A comment */ if test $? = 0; then
#if 0 ac_cv_filel=yes
#endif
void main(void)
{ return; }
EOF
cat > conftest.sed <<\EOF
s/^[^:]*:[ ]*//
s/[ ]*$//
EOF
filehyphen_1=`file conftest.c 2>/dev/null | sed -f conftest.sed`
filehyphen_2=`cat conftest.c | file - 2>/dev/null | sed -f conftest.sed`
if test "x$filehyphen_1" = "x$filehyphen_2"; then
ac_cv_filestdin=yes
else else
ac_cv_filestdin=no ac_cv_filel=no
fi fi
rm conftest.c conftest.sed ])
]]) if test x$ac_cv_filel = xyes; then
AC_DEFINE(FILE_L, 1, [Define if the file command accepts the -L option])
if test x$ac_cv_filestdin = xyes; then
AC_DEFINE(FILE_STDIN, 1,
[Define if the file command accepts - for stdin])
fi fi
filestdin=$ac_cv_filestdin filel=$ac_cv_filel
AC_MSG_RESULT([$filestdin]) AC_MSG_RESULT([$filel])
dnl
dnl Check for -L option to file
dnl
AC_MSG_CHECKING([for -L option to file command])
AC_CACHE_VAL(ac_cv_filel, [
file -L . > /dev/null 2>&1
if test $? = 0
then
ac_cv_filel=yes
else
ac_cv_filel=no
fi fi
])
if test x$ac_cv_filel = xyes; then
AC_DEFINE(FILE_L, 1, [Define if the file command accepts the -L option])
fi
filel=$ac_cv_filel
AC_MSG_RESULT([$filel])
fi
AC_MSG_CHECKING([for subshell support]) AC_MSG_CHECKING([for subshell support])