Message ID | 2510f7c260bd2cbdf1b6089c2a021e6434cb0d38.1538652143.git.tgolembi@redhat.com |
---|---|
State | New |
Headers | show |
Series | qga: report serial number and disk node | expand |
On Thu, Oct 4, 2018 at 3:22 PM Tomáš Golembiovský <tgolembi@redhat.com> wrote: > > Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > configure | 22 ++++++++++++++++++++++ > 1 file changed, 22 insertions(+) > > diff --git a/configure b/configure > index 0f168607e8..ac24cb3975 100755 > --- a/configure > +++ b/configure > @@ -477,6 +477,7 @@ libxml2="" > docker="no" > debug_mutex="no" > libpmem="" > +libudev="no" > > # cross compilers defaults, can be overridden with --cross-cc-ARCH > cross_cc_aarch64="aarch64-linux-gnu-gcc" > @@ -873,6 +874,7 @@ Linux) > vhost_vsock="yes" > QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$(pwd)/linux-headers $QEMU_INCLUDES" > supported_os="yes" > + libudev="yes" > ;; > esac > > @@ -5676,6 +5678,20 @@ if test "$libnfs" != "no" ; then > fi > fi > > +########################################## > +# Do we have libudev > +if test "$libudev" != "no" ; then > + if $pkg_config libudev; then > + libudev="yes" > + libudev_libs=$($pkg_config --libs libudev) > + else > + if test "$libudev" = "yes" ; then > + feature_not_found "libudev" "Install systemd development files" > + fi > + libudev="no" > + fi > +fi > + > # Now we've finished running tests it's OK to add -Werror to the compiler flags > if test "$werror" = "yes"; then > QEMU_CFLAGS="-Werror $QEMU_CFLAGS" > @@ -6100,6 +6116,7 @@ echo "VxHS block device $vxhs" > echo "capstone $capstone" > echo "docker $docker" > echo "libpmem support $libpmem" > +echo "libudev $libudev" > > if test "$sdl_too_old" = "yes"; then > echo "-> Your SDL version is too old - please upgrade to have SDL support" > @@ -6944,6 +6961,11 @@ if test "$docker" != "no"; then > echo "HAVE_USER_DOCKER=y" >> $config_host_mak > fi > > +if test "$libudev" != "no"; then > + echo "CONFIG_LIBUDEV=y" >> $config_host_mak > + echo "LIBUDEV_LIBS=$libudev_libs" >> $config_host_mak > +fi > + > # use included Linux headers > if test "$linux" = "yes" ; then > mkdir -p linux-headers > -- > 2.19.0 >
diff --git a/configure b/configure index 0f168607e8..ac24cb3975 100755 --- a/configure +++ b/configure @@ -477,6 +477,7 @@ libxml2="" docker="no" debug_mutex="no" libpmem="" +libudev="no" # cross compilers defaults, can be overridden with --cross-cc-ARCH cross_cc_aarch64="aarch64-linux-gnu-gcc" @@ -873,6 +874,7 @@ Linux) vhost_vsock="yes" QEMU_INCLUDES="-I\$(SRC_PATH)/linux-headers -I$(pwd)/linux-headers $QEMU_INCLUDES" supported_os="yes" + libudev="yes" ;; esac @@ -5676,6 +5678,20 @@ if test "$libnfs" != "no" ; then fi fi +########################################## +# Do we have libudev +if test "$libudev" != "no" ; then + if $pkg_config libudev; then + libudev="yes" + libudev_libs=$($pkg_config --libs libudev) + else + if test "$libudev" = "yes" ; then + feature_not_found "libudev" "Install systemd development files" + fi + libudev="no" + fi +fi + # Now we've finished running tests it's OK to add -Werror to the compiler flags if test "$werror" = "yes"; then QEMU_CFLAGS="-Werror $QEMU_CFLAGS" @@ -6100,6 +6116,7 @@ echo "VxHS block device $vxhs" echo "capstone $capstone" echo "docker $docker" echo "libpmem support $libpmem" +echo "libudev $libudev" if test "$sdl_too_old" = "yes"; then echo "-> Your SDL version is too old - please upgrade to have SDL support" @@ -6944,6 +6961,11 @@ if test "$docker" != "no"; then echo "HAVE_USER_DOCKER=y" >> $config_host_mak fi +if test "$libudev" != "no"; then + echo "CONFIG_LIBUDEV=y" >> $config_host_mak + echo "LIBUDEV_LIBS=$libudev_libs" >> $config_host_mak +fi + # use included Linux headers if test "$linux" = "yes" ; then mkdir -p linux-headers
Signed-off-by: Tomáš Golembiovský <tgolembi@redhat.com> --- configure | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)