summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
f91afa8)
specified, but TIRPC libs or headers aren't present then just throw a
warning and disable it. If it was explicitly specified, then throw an
error and exit if they aren't present.
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
dnl TI-RPC required for IPv6
if test "$enable_tirpc" = no; then
dnl TI-RPC required for IPv6
if test "$enable_tirpc" = no; then
- AC_MSG_ERROR(['--enable-ipv6' requires '--enable-tirpc'.])
+ AC_MSG_ERROR(['--enable-ipv6' requires TIRPC support.])
fi
dnl IPv6-enabled networking functions required for IPv6
fi
dnl IPv6-enabled networking functions required for IPv6
dnl if --enable-tirpc was specifed, the following components
dnl must be present, and we set up HAVE_ macros for them.
dnl if --enable-tirpc was specifed, the following components
dnl must be present, and we set up HAVE_ macros for them.
- if test "$enable_tirpc" = yes; then
+ if test "$enable_tirpc" != "no"; then
dnl look for the library; add to LIBS if found
AC_CHECK_LIB([tirpc], [clnt_tli_create], ,
dnl look for the library; add to LIBS if found
AC_CHECK_LIB([tirpc], [clnt_tli_create], ,
- [AC_MSG_ERROR([libtirpc not found.])])
+ [if test "$enable_tirpc" = "yes"; then
+ AC_MSG_ERROR([libtirpc not found.])
+ else
+ AC_MSG_WARN([libtirpc not found. TIRPC disabled!])
+ enable_tirpc="no"
+ fi])
+ fi
+ if test "$enable_tirpc" != "no"; then
dnl also must have the headers installed where we expect
dnl look for headers; add -I compiler option if found
dnl also must have the headers installed where we expect
dnl look for headers; add -I compiler option if found
- AC_CHECK_HEADERS([${tirpc_header_dir}/netconfig.h], ,
- [AC_MSG_ERROR([libtirpc headers not found.])])
- AC_SUBST([AM_CPPFLAGS], ["-I${tirpc_header_dir}"])
+ AC_CHECK_HEADERS([${tirpc_header_dir}/netconfig.h],
+ AC_SUBST([AM_CPPFLAGS], ["-I${tirpc_header_dir}"]),
+ [if test "$enable_tirpc" = "yes"; then
+ AC_MSG_ERROR([libtirpc headers not found.])
+ else
+ AC_MSG_WARN([libtirpc headers not found. TIRPC disabled!])
+ enable_tirpc="no"
+ fi])
AM_CONDITIONAL(CONFIG_MOUNT, [test "$enable_mount" = "yes"])
AC_ARG_ENABLE(tirpc,
[AC_HELP_STRING([--enable-tirpc],
AM_CONDITIONAL(CONFIG_MOUNT, [test "$enable_mount" = "yes"])
AC_ARG_ENABLE(tirpc,
[AC_HELP_STRING([--enable-tirpc],
- [enable use of TI-RPC @<:@default=no@:>@])],
+ [enable use of TI-RPC @<:@default=yes@:>@])],
AC_ARG_ENABLE(ipv6,
[AC_HELP_STRING([--enable-ipv6],
[enable support for IPv6 @<:@default=no@:>@])],
AC_ARG_ENABLE(ipv6,
[AC_HELP_STRING([--enable-ipv6],
[enable support for IPv6 @<:@default=no@:>@])],