search for: 00246f29

Borrow this feature from libguestfs, so it is possible to "watermark" the virt-v2v executable with a extra string to the version string. --- configure.ac | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 00246f29..e2418564 100644 --- a/configure.ac +++ b/configure.ac @@ -15,7 +15,14 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -AC_INIT([virt-v2v],1.41.8) +# The major, minor, and release fields MUST be num...

...akefile.am @@ -41,7 +41,7 @@ SUBDIRS += common/mlxml SUBDIRS += common/mltools SUBDIRS += common/mlcustomize SUBDIRS += common/mlv2v -SUBDIRS += common/mllibvirt +SUBDIRS += 3rdparty/libvirt-ocaml SUBDIRS += v2v SUBDIRS += test-harness diff --git a/configure.ac b/configure.ac index 065c6289..00246f29 100644 --- a/configure.ac +++ b/configure.ac @@ -100,11 +100,11 @@ AC_CONFIG_FILES([run], dnl NB: Remove common/mlstdutils/guestfs_config.ml in future XXX AC_CONFIG_FILES([Makefile + 3rdparty/libvirt-ocaml/Makefile bash/Makefile common/options...

...s, so it is possible to "watermark" > the virt-v2v executable with a extra string to the version string. > --- > configure.ac | 30 +++++++++++++++++++++++++++--- > 1 file changed, 27 insertions(+), 3 deletions(-) > > diff --git a/configure.ac b/configure.ac > index 00246f29..e2418564 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -15,7 +15,14 @@ > # along with this program; if not, write to the Free Software > # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. > > -AC_INIT([virt-v2v],1.41.8) > +# The majo...

...+SUBDIRS += 3rdparty/libvirt-ocaml It's bikeshedding but how about calling it "bundled"? Anyway, ACK series, and also the patch to remove from common. Rich. > SUBDIRS += v2v > SUBDIRS += test-harness > > diff --git a/configure.ac b/configure.ac > index 065c6289..00246f29 100644 > --- a/configure.ac > +++ b/configure.ac > @@ -100,11 +100,11 @@ AC_CONFIG_FILES([run], > > dnl NB: Remove common/mlstdutils/guestfs_config.ml in future XXX > AC_CONFIG_FILES([Makefile > + 3rdparty/libvirt-ocaml/Makefile > bash/M...

libvirt-ocaml is used only by virt-v2v, so move it to this repository, instead of having it around in the common submodule. The removal from common will happen later. Pino Toscano (2): common: Bundle the libvirt-ocaml library for use by virt-v2v build: switch embedded copy of libvirt-ocaml .gitignore | 2 + 3rdparty/libvirt-ocaml/Makefile.am |