generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The configure process will now halt when sed or grep are unavailable

Browse Source
This commit is contained in:
Yang Tse 2008-07-02 17:42:08 +00:00
parent 97333deb3f
commit bfaab6ed6b
3 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGES
View File

@ -13,6 +13,8 @@ Yang Tse (2 Jul 2008)
will fallback to gettimeofday when the monotonic clock is unavailable at will fallback to gettimeofday when the monotonic clock is unavailable at
run-time. run-time.
- The configure process will now halt when sed or grep are unavailable.
Daniel Stenberg (1 Jul 2008) Daniel Stenberg (1 Jul 2008)
- Rolland Dudemaine provided fixes to get libcurl to build for the INTEGRITY - Rolland Dudemaine provided fixes to get libcurl to build for the INTEGRITY
operating system. operating system.

16
ares/configure.ac
View File

@ -5,6 +5,22 @@ AM_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AM_INIT_AUTOMAKE AM_INIT_AUTOMAKE
dnl sed is mandatory for configure process
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.])
fi
dnl grep is mandatory for configure process
AC_PATH_PROG([GREP], [grep], [not found],
[$PATH:/usr/bin:/usr/local/bin])
AC_SUBST([GREP])
if test -z "$GREP" || test "$GREP" = "not found"; then
AC_MSG_ERROR([Cannot continue without grep.])
fi
dnl dnl
dnl Detect the canonical host and target build environment dnl Detect the canonical host and target build environment
dnl dnl

19
configure.ac
View File

@ -36,13 +36,20 @@ AC_CONFIG_SRCDIR([lib/urldata.h])
AM_CONFIG_HEADER(lib/config.h src/config.h) AM_CONFIG_HEADER(lib/config.h src/config.h)
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
dnl SED is needed by some of the tools dnl sed is mandatory for configure process
AC_PATH_PROG( SED, sed, sed-was-not-found-by-configure, AC_PATH_PROG([SED], [sed], [not found],
$PATH:/usr/bin:/usr/local/bin) [$PATH:/usr/bin:/usr/local/bin])
AC_SUBST(SED) AC_SUBST([SED])
if test -z "$SED" || test "$SED" = "not found"; then
AC_MSG_ERROR([Cannot continue without sed.])
fi
if test "x$SED" = "xsed-was-not-found-by-configure"; then dnl grep is mandatory for configure process
AC_MSG_WARN([sed was not found, this may ruin your chances to build fine]) AC_PATH_PROG([GREP], [grep], [not found],
[$PATH:/usr/bin:/usr/local/bin])
AC_SUBST([GREP])
if test -z "$GREP" || test "$GREP" = "not found"; then
AC_MSG_ERROR([Cannot continue without grep.])
fi fi
dnl AR is used by libtool, and try the odd Solaris path too dnl AR is used by libtool, and try the odd Solaris path too