On Tue, Jan 13, 2015 at 04:53:58PM +0800, Fam Zheng wrote: > We have module build support around for a while, but also had it bitrot > several times. It probably makes sense to enable it by default so that > people can notice and use it. > > Counterpart to --enable-modules, which is turned as default, > --disable-modules is added to suppress it. If both are omitted, the > support is guesses as usual.
"Add --disable-modules as a counterpart to --enable-modules, which is now turned on by default. If both are omitted, support is guessed as usual." > > Signed-off-by: Fam Zheng <f...@redhat.com> > --- > configure | 95 > ++++++++++++++++++++++++++++++++++++++++++++------------------- > 1 file changed, 66 insertions(+), 29 deletions(-) > > diff --git a/configure b/configure > index 7539645..8280e8a 100755 > --- a/configure > +++ b/configure > @@ -271,7 +271,7 @@ gcov_tool="gcov" > EXESUF="" > DSOSUF=".so" > LDFLAGS_SHARED="-shared" > -modules="no" > +modules="" > prefix="/usr/local" > mandir="\${prefix}/share/man" > datadir="\${prefix}/share" > @@ -768,6 +768,9 @@ for opt do > --enable-modules) > modules="yes" > ;; > + --disable-modules) > + modules="no" > + ;; > --cpu=*) > ;; > --target-list=*) target_list="$optarg" > @@ -1259,7 +1262,8 @@ Advanced options (experts only): > --sysconfdir=PATH install config in PATH$confsuffix > --localstatedir=PATH install local state in PATH (set at runtime on > win32) > --with-confsuffix=SUFFIX suffix for QEMU data inside > datadir/libdir/sysconfdir [$confsuffix] > - --enable-modules enable modules support > + --enable-modules enable modules support (default) > + --disable-modules enable modules support > --enable-debug-tcg enable TCG debugging > --disable-debug-tcg disable TCG debugging (default) > --enable-debug-info enable debugging information (default) > @@ -2699,22 +2703,25 @@ if test "$mingw32" = yes; then > else > glib_req_ver=2.12 > fi > -glib_modules=gthread-2.0 > -if test "$modules" = yes; then > - glib_modules="$glib_modules gmodule-2.0" > -fi > > -for i in $glib_modules; do > - if $pkg_config --atleast-version=$glib_req_ver $i; then > - glib_cflags=`$pkg_config --cflags $i` > - glib_libs=`$pkg_config --libs $i` > - CFLAGS="$glib_cflags $CFLAGS" > - LIBS="$glib_libs $LIBS" > - libs_qga="$glib_libs $libs_qga" > - else > - error_exit "glib-$glib_req_ver $i is required to compile QEMU" > - fi > -done > +glib_module_try_config() I guess "module" here means glib package or component? It's a little confusing since gmodule-2.0 is needed for QEMU modular build support :). How about just glib_pkg_config()? > + if ! glib_module_try_config gmodule-2.0; then > + if $force; then > + error_exit "glib-$glib_req_ver gthread-2.0 is required to compile QEMU" s/gthread-2.0/gmodule-2.0/
pgpB2BG_285kI.pgp
Description: PGP signature