[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[libvirt] [PATCH] let "configure --disable-shared" work once again



Per this thread:

  http://thread.gmane.org/gmane.comp.emulators.libvirt/19672

here's a patch that solves both problems:

>From 1b330b3070f904dfc1c380151afa3aaf2a121cd3 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim meyering net>
Date: Thu, 7 Jan 2010 21:07:42 +0100
Subject: [PATCH] let "configure --disable-shared" work once again

Without this change, ./autogen.sh --disable-shared && make would
evoke a "can not build a shared library" failure for libvirtmod.la.
However, without the -shared link option in python/Makefile.am,
it was possible to install non-functional python support.  Instead,
make --disable-shared also disable building python.

* configure.ac: Make --disable-shared imply --without-python and
silently override --with-python.
* python/Makefile.am (libvirtmod_la_LDFLAGS): Do not use -shared.
This reverts 8838ee39ab1c2bb7fffe93bfda220692664e8be6.
---
 configure.in       |    4 ++++
 python/Makefile.am |    2 +-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/configure.in b/configure.in
index 3f2f8ff..3e98035 100644
--- a/configure.in
+++ b/configure.in
@@ -1813,6 +1813,10 @@ AC_ARG_WITH([qemu-group],
 AC_DEFINE_UNQUOTED([QEMU_USER], ["$QEMU_USER"], [QEMU user account])
 AC_DEFINE_UNQUOTED([QEMU_GROUP], ["$QEMU_GROUP"], [QEMU group account])

+if test "$enable_shared:$with_python" = no:yes; then
+  AC_MSG_WARN([you've used --disable-shared; so disabling python support])
+  with_python=no
+fi

 # Only COPYING.LIB is under version control, yet COPYING
 # is included as part of the distribution tarball.
diff --git a/python/Makefile.am b/python/Makefile.am
index 58c6729..04342b7 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -39,7 +39,7 @@ libvirtmod_la_SOURCES = libvirt-override.c typewrappers.c libvirt.c libvirt.h
 # need extra flags here
 libvirtmod_la_CFLAGS = @WARN_PYTHON_CFLAGS@

-libvirtmod_la_LDFLAGS = -module -avoid-version -shared -L$(top_builddir)/src/.libs \
+libvirtmod_la_LDFLAGS = -module -avoid-version -L$(top_builddir)/src/.libs \
 	@CYGWIN_EXTRA_LDFLAGS@
 libvirtmod_la_LIBADD = $(mylibs) \
 	@CYGWIN_EXTRA_LIBADD@ @CYGWIN_EXTRA_PYTHON_LIBADD@
--
1.6.6.425.g4dc2d


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]