External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-08-26 18:41:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove duplicated error messages

Browse Source
This commit is contained in:
Daniel P. Berrange 2008-05-22 15:40:01 +00:00
parent 6a48a6a9e7
commit 3e1aeff4c5
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
Thu May 22 11:38:29 EST 2008 Daniel P. Berrange <berrange@redhat.com>
* configure.in: Remove some duplicated error messages
Thu May 22 11:35:29 EST 2008 Daniel P. Berrange <berrange@redhat.com> Thu May 22 11:35:29 EST 2008 Daniel P. Berrange <berrange@redhat.com>
* configure.in: Fix misleading comment about numactl * configure.in: Fix misleading comment about numactl

45
configure.in
View File

@ -355,16 +355,14 @@ if test -z "$PKG_CONFIG" ; then
[GNUTLS_FOUND=yes], [GNUTLS_FOUND=no]) [GNUTLS_FOUND=yes], [GNUTLS_FOUND=no])
fi fi
if test "$GNUTLS_FOUND" = "no"; then if test "$GNUTLS_FOUND" = "no"; then
AC_CHECK_HEADER([gnutls/gnutls.h], fail=0
[],
AC_MSG_ERROR(
[You must install the GnuTLS development package in order to compile libvirt]))
old_libs="$LIBS" old_libs="$LIBS"
AC_CHECK_LIB([gnutls], [gnutls_handshake], AC_CHECK_HEADER([gnutls/gnutls.h], [], [fail=1])
[], AC_CHECK_LIB([gnutls], [gnutls_handshake],[], [fail=1], [-lgcrypt])
[AC_MSG_ERROR(
[You must install the GnuTLS library in order to compile and run libvirt])], test $fail = 1 &&
[-lgcrypt]) AC_MSG_ERROR([You must install the GnuTLS library in order to compile and run libvirt])
GNUTLS_LIBS=$LIBS GNUTLS_LIBS=$LIBS
LIBS="$old_libs" LIBS="$old_libs"
fi fi
@ -400,6 +398,7 @@ if test "x$with_sasl" != "xno"; then
SASL_CFLAGS="-I$with_sasl" SASL_CFLAGS="-I$with_sasl"
SASL_LIBS="-L$with_sasl" SASL_LIBS="-L$with_sasl"
fi fi
fail=0
old_cflags="$CFLAGS" old_cflags="$CFLAGS"
old_libs="$LIBS" old_libs="$LIBS"
CFLAGS="$CFLAGS $SASL_CFLAGS" CFLAGS="$CFLAGS $SASL_CFLAGS"
@ -408,18 +407,18 @@ if test "x$with_sasl" != "xno"; then
if test "x$with_sasl" != "xcheck" ; then if test "x$with_sasl" != "xcheck" ; then
with_sasl=no with_sasl=no
else else
AC_MSG_ERROR( fail=1
[You must install the Cyrus SASL development package in order to compile libvirt])
fi]) fi])
if test "x$with_sasl" != "xno" ; then if test "x$with_sasl" != "xno" ; then
AC_CHECK_LIB([sasl2], [sasl_client_init],[with_sasl=yes],[ AC_CHECK_LIB([sasl2], [sasl_client_init],[with_sasl=yes],[
if test "x$with_sasl" = "xcheck" ; then if test "x$with_sasl" = "xcheck" ; then
with_sasl=no with_sasl=no
else else
AC_MSG_ERROR( fail=1
[You must install the Cyrus SASL library in order to compile and run libvirt])
fi]) fi])
fi fi
test $fail = 1 &&
AC_MSG_ERROR([You must install the Cyrus SASL development package in order to compile libvirt])
CFLAGS="$old_cflags" CFLAGS="$old_cflags"
LIBS="$old_libs" LIBS="$old_libs"
SASL_LIBS="$SASL_LIBS -lsasl2" SASL_LIBS="$SASL_LIBS -lsasl2"
@ -518,10 +517,11 @@ if test "$with_selinux" != "no"; then
with_selinux="yes" with_selinux="yes"
fi fi
else else
AC_CHECK_HEADER([selinux/selinux.h],[], fail=0
[AC_MSG_ERROR([You must install the SELinux development package in order to compile libvirt])]) AC_CHECK_HEADER([selinux/selinux.h],[],[fail=1])
AC_CHECK_LIB([selinux], [fgetfilecon],[], AC_CHECK_LIB([selinux], [fgetfilecon],[],[fail=1])
[AC_MSG_ERROR([You must install the SELinux development package in order to compile and run libvirt])]) test $fail = 1 &&
AC_MSG_ERROR([You must install the SELinux development package in order to compile libvirt])
fi fi
CFLAGS="$old_cflags" CFLAGS="$old_cflags"
LIBS="$old_libs" LIBS="$old_libs"
@ -552,10 +552,11 @@ if test "$with_qemu" = "yes" -a "$with_numactl" != "no"; then
with_numactl="yes" with_numactl="yes"
fi fi
else else
AC_CHECK_HEADER([numa.h],[], fail=0
[AC_MSG_ERROR([You must install the numactl development package in order to compile libvirt])]) AC_CHECK_HEADER([numa.h],[],[fail=1])
AC_CHECK_LIB([numa], [numa_available],[], AC_CHECK_LIB([numa], [numa_available],[],[fail=1])
[AC_MSG_ERROR([You must install the numactl development package in order to compile and run libvirt])]) test $fail = 1 &&
AC_MSG_ERROR([You must install the numactl development package in order to compile and run libvirt])
fi fi
CFLAGS="$old_cflags" CFLAGS="$old_cflags"
LIBS="$old_libs" LIBS="$old_libs"
@ -632,7 +633,7 @@ if test "$with_storage_fs" = "yes" -o "$with_storage_fs" = "check"; then
AC_PATH_PROG([UMOUNT], [umount], [], [$PATH:/sbin:/usr/sbin]) AC_PATH_PROG([UMOUNT], [umount], [], [$PATH:/sbin:/usr/sbin])
if test "$with_storage_fs" = "yes" ; then if test "$with_storage_fs" = "yes" ; then
if test -z "$MOUNT" ; then AC_MSG_ERROR([We need mount for FS storage driver]) ; fi if test -z "$MOUNT" ; then AC_MSG_ERROR([We need mount for FS storage driver]) ; fi
if test -z "$UMOUNT" ; then AC_MSG_ERROR([We need mount for FS storage driver]) ; fi if test -z "$UMOUNT" ; then AC_MSG_ERROR([We need umount for FS storage driver]) ; fi
else else
if test -z "$MOUNT" ; then with_storage_fs=no ; fi if test -z "$MOUNT" ; then with_storage_fs=no ; fi
if test -z "$UMOUNT" ; then with_storage_fs=no ; fi if test -z "$UMOUNT" ; then with_storage_fs=no ; fi