Fix misc build problems due to new drivers

* autobuild.sh: Disable esx/phyp build on mingw32
* configure.in: Fix handling of --without-phyp so it actually works
* libvirt.spec.in: Add missing interface.rng
* mingw32-libvirt.spec.in: Disable phyp/esx drivers
* src/phyp/phyp_driver.c: Fix missing i18n of error messages

diff --git a/autobuild.sh b/autobuild.sh
index d090e7498c6461905965c1a587634295969a73f5..769b73061c67189b1498184684bc6c6783abd2f3 100755 (executable)
--- a/autobuild.sh
+++ b/autobuild.sh
@@ -77,6 +77,8 @@ if [ -x /usr/bin/i686-pc-mingw32-gcc ]; then
     --without-vbox \
     --without-openvz \
     --without-one \
+    --without-phyp \
+    --without-esx \
     --without-libvirtd
 
   make

diff --git a/configure.in b/configure.in
index a3d357aeb31782128941c41b746b949ccd151c75..b905b23b43aa49be425e9edfb54525a4e02dcc86 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -190,7 +190,7 @@ AC_ARG_WITH([openvz],
 AC_ARG_WITH([libssh],
 [  --with-libssh=[PFX]       libssh location],[],[with_libssh=yes])
 AC_ARG_WITH([phyp],
-[  --with-phyp=[PFX]         add PHYP support (on)],[with_phyp=yes],[with_phyp=check])
+[  --with-phyp=[PFX]         add PHYP support (on)],[],[with_phyp=check])
 AC_ARG_WITH([vbox],
 [  --with-vbox             add VirtualBox support (on)],[],[with_vbox=yes])
 AC_ARG_WITH([lxc],

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 8af64bd9b8b0ff4270b7e0ef69ead9dacd791f6c..a5b861d79cc82d3b77523376cfe0b04508632eaa 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -528,6 +528,7 @@ fi
 %{_datadir}/libvirt/schemas/storagevol.rng
 %{_datadir}/libvirt/schemas/nodedev.rng
 %{_datadir}/libvirt/schemas/capability.rng
+%{_datadir}/libvirt/schemas/interface.rng
 
 %if %{with_sasl}
 %config(noreplace) %{_sysconfdir}/sasl2/libvirt.conf

diff --git a/mingw32-libvirt.spec.in b/mingw32-libvirt.spec.in
index 951403232ebc220ce0f931d059169aea6e1e5d14..f38347573af38919ce15a57c30f02731342673a3 100644 (file)
--- a/mingw32-libvirt.spec.in
+++ b/mingw32-libvirt.spec.in
@@ -53,6 +53,8 @@ MinGW Windows libvirt virtualization library.
   --without-vbox \
   --without-openvz \
   --without-one \
+  --without-phyp \
+  --without-esx \
   --without-libvirtd
 make
 

diff --git a/src/phyp/phyp_driver.c b/src/phyp/phyp_driver.c
index cf3cd4b03f4aec167b82f7fca18139a4baaee12f..cbfd31b2487d422a8ef93c72682a959a07b358db 100644 (file)
--- a/src/phyp/phyp_driver.c
+++ b/src/phyp/phyp_driver.c
@@ -221,8 +221,8 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth)
             password = creds[0].result;
         else {
             virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP,
-                          VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s : %s",
-                          "Unable to get password certificate.",
+                          VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
+                          _("Unable to get password certificate: %s"),
                           ssh_get_error(session));
             ssh_disconnect(session);
             goto err;
@@ -235,8 +235,8 @@ openSSHSession(virConnectPtr conn, virConnectAuthPtr auth)
 
         if (auth_check != SSH_AUTH_SUCCESS) {
             virRaiseError(conn, NULL, NULL, 0, VIR_FROM_PHYP,
-                          VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0, "%s : %s",
-                          "Authentication failed.",
+                          VIR_ERR_ERROR, NULL, NULL, NULL, 0, 0,
+                          _("Authentication failed: %s"),
                           ssh_get_error(session));
             ssh_disconnect(session);
             goto err;