Commit 0b57c475 authored by Yang Tse's avatar Yang Tse
Browse files

egrep and ar are also mandatory

parent 02db4450
Loading
Loading
Loading
Loading
+41 −9
Original line number Diff line number Diff line
@@ -5,21 +5,53 @@ AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
AM_INIT_AUTOMAKE

dnl sed is mandatory for configure process
AC_PATH_PROG([SED], [sed], [not found],
dnl SED is mandatory for configure process and libtool.
dnl Set it now and prevent it from being changed later.
AC_PATH_PROG([SED], [sed], [not_found],
  [$PATH:/usr/bin:/usr/local/bin])
AC_SUBST([SED])
if test -z "$SED" || test "$SED" = "not found"; then
  AC_MSG_ERROR([Cannot continue without sed.])
if test -z "$SED" || test "$SED" = "not_found"; then
  AC_MSG_ERROR([sed not found in PATH. Cannot continue without sed.])
fi
ac_cv_prog_sed="$SED"
ac_cv_prog_SED="$SED"
AC_SUBST([SED])

dnl grep is mandatory for configure process
AC_PATH_PROG([GREP], [grep], [not found],
dnl GREP is mandatory for configure process and libtool.
dnl Set it now and prevent it from being changed later.
AC_PATH_PROG([GREP], [grep], [not_found],
  [$PATH:/usr/bin:/usr/local/bin])
if test -z "$GREP" || test "$GREP" = "not_found"; then
  AC_MSG_ERROR([grep not found in PATH. Cannot continue without grep.])
fi
ac_cv_prog_grep="$GREP"
ac_cv_prog_GREP="$GREP"
AC_SUBST([GREP])
if test -z "$GREP" || test "$GREP" = "not found"; then
  AC_MSG_ERROR([Cannot continue without grep.])

dnl EGREP is mandatory for configure process and libtool.
dnl Set it now and prevent it from being changed later.
if echo a | ($GREP -E '(a|b)') >/dev/null 2>&1; then
  AC_MSG_CHECKING([for egrep])
  EGREP="$GREP -E"
  AC_MSG_RESULT([$EGREP])
else
  AC_PATH_PROG([EGREP], [egrep], [not_found],
    [$PATH:/usr/bin:/usr/local/bin])
fi
if test -z "$EGREP" || test "$EGREP" = "not_found"; then
  AC_MSG_ERROR([egrep not found in PATH. Cannot continue without egrep.])
fi
ac_cv_prog_egrep="$EGREP"
ac_cv_prog_EGREP="$EGREP"
AC_SUBST([EGREP])

dnl AR is mandatory for configure process and libtool.
dnl This is target dependant, so check it as a tool.
AC_PATH_TOOL([AR], [ar], [not_found],
  [$PATH:/usr/bin:/usr/local/bin])
if test -z "$AR" || test "$AR" = "not_found"; then
  AC_MSG_ERROR([ar not found in PATH. Cannot continue without ar.])
fi
AC_SUBST([AR])

dnl
dnl Detect the canonical host and target build environment
+40 −18
Original line number Diff line number Diff line
@@ -36,32 +36,54 @@ AC_CONFIG_SRCDIR([lib/urldata.h])
AM_CONFIG_HEADER(lib/config.h src/config.h)
AM_MAINTAINER_MODE

dnl sed is mandatory for configure process
AC_PATH_PROG([SED], [sed], [not found],
dnl SED is mandatory for configure process and libtool.
dnl Set it now and prevent it from being changed later.
AC_PATH_PROG([SED], [sed], [not_found],
  [$PATH:/usr/bin:/usr/local/bin])
AC_SUBST([SED])
if test -z "$SED" || test "$SED" = "not found"; then
  AC_MSG_ERROR([Cannot continue without sed.])
if test -z "$SED" || test "$SED" = "not_found"; then
  AC_MSG_ERROR([sed not found in PATH. Cannot continue without sed.])
fi
ac_cv_prog_sed="$SED"
ac_cv_prog_SED="$SED"
AC_SUBST([SED])

dnl grep is mandatory for configure process
AC_PATH_PROG([GREP], [grep], [not found],
dnl GREP is mandatory for configure process and libtool.
dnl Set it now and prevent it from being changed later.
AC_PATH_PROG([GREP], [grep], [not_found],
  [$PATH:/usr/bin:/usr/local/bin])
if test -z "$GREP" || test "$GREP" = "not_found"; then
  AC_MSG_ERROR([grep not found in PATH. Cannot continue without grep.])
fi
ac_cv_prog_grep="$GREP"
ac_cv_prog_GREP="$GREP"
AC_SUBST([GREP])
if test -z "$GREP" || test "$GREP" = "not found"; then
  AC_MSG_ERROR([Cannot continue without grep.])

dnl EGREP is mandatory for configure process and libtool.
dnl Set it now and prevent it from being changed later.
if echo a | ($GREP -E '(a|b)') >/dev/null 2>&1; then
  AC_MSG_CHECKING([for egrep])
  EGREP="$GREP -E"
  AC_MSG_RESULT([$EGREP])
else
  AC_PATH_PROG([EGREP], [egrep], [not_found],
    [$PATH:/usr/bin:/usr/local/bin])
fi
if test -z "$EGREP" || test "$EGREP" = "not_found"; then
  AC_MSG_ERROR([egrep not found in PATH. Cannot continue without egrep.])
fi
ac_cv_prog_egrep="$EGREP"
ac_cv_prog_EGREP="$EGREP"
AC_SUBST([EGREP])

dnl AR is used by libtool, and try the odd Solaris path too
dnl we use AC_CHECK_TOOL since this should make a library for the target
dnl platform
AC_CHECK_TOOL(AR, ar,
              ar-was-not-found-by-configure,
              $PATH:/usr/bin:/usr/local/bin:/usr/ccs/bin)
AC_SUBST(AR)
if test "x$AR" = "xar-was-not-found-by-configure"; then
  AC_MSG_WARN([ar was not found, this may ruin your chances to build fine])
dnl AR is mandatory for configure process and libtool.
dnl This is target dependant, so check it as a tool.
AC_PATH_TOOL([AR], [ar], [not_found],
  [$PATH:/usr/bin:/usr/local/bin])
if test -z "$AR" || test "$AR" = "not_found"; then
  AC_MSG_ERROR([ar not found in PATH. Cannot continue without ar.])
fi
AC_SUBST([AR])

AC_SUBST(libext)

dnl figure out the libcurl version