From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:38169) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeZ0U-0003Hg-Kf for qemu-devel@nongnu.org; Fri, 30 Nov 2012 17:24:27 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TeZ0T-0002bj-FT for qemu-devel@nongnu.org; Fri, 30 Nov 2012 17:24:26 -0500 Received: from mail.serverraum.org ([78.47.150.89]:38618) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TeZ0T-0002bO-5d for qemu-devel@nongnu.org; Fri, 30 Nov 2012 17:24:25 -0500 From: Michael Walle Date: Fri, 30 Nov 2012 23:24:12 +0100 Message-Id: <1354314252-9016-2-git-send-email-michael@walle.cc> In-Reply-To: <1354314252-9016-1-git-send-email-michael@walle.cc> References: <1354314252-9016-1-git-send-email-michael@walle.cc> Subject: [Qemu-devel] [PATCH 2/2] configure: rename OpenGL feature to GLX List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Michael Walle As the probe now actually checks for the availability of GLX, rename it accordingly. The only user of this feature is the milkymist-tmu2 model. Signed-off-by: Michael Walle --- configure | 30 +++++++++++++++--------------- hw/lm32/Makefile.objs | 2 +- hw/milkymist-hw.h | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/configure b/configure index fedde51..57fd70f 100755 --- a/configure +++ b/configure @@ -215,7 +215,7 @@ rbd="" smartcard="" smartcard_nss="" usb_redir="" -opengl="" +glx="" zlib="yes" guest_agent="yes" want_tools="yes" @@ -829,9 +829,9 @@ for opt do ;; --enable-vhost-net) vhost_net="yes" ;; - --disable-opengl) opengl="no" + --disable-glx) glx="no" ;; - --enable-opengl) opengl="yes" + --enable-glx) glx="yes" ;; --disable-rbd) rbd="no" ;; @@ -2321,9 +2321,9 @@ EOF fi ########################################## -# opengl probe, used by milkymist-tmu2 -if test "$opengl" != "no" ; then - opengl_libs="-lGL -lX11" +# GLX probe, used by milkymist-tmu2 +if test "$glx" != "no" ; then + glx_libs="-lGL -lX11" cat > $TMPC << EOF #include #include @@ -2331,13 +2331,13 @@ if test "$opengl" != "no" ; then int main(void) { glBegin(0); glXQueryVersion(0,0,0); return 0; } EOF if compile_prog "" "-lGL -lX11" ; then - opengl=yes + glx=yes else - if test "$opengl" = "yes" ; then - feature_not_found "opengl" + if test "$glx" = "yes" ; then + feature_not_found "glx" fi - opengl_libs= - opengl=no + glx_libs= + glx=no fi fi @@ -3244,7 +3244,7 @@ echo "rbd support $rbd" echo "xfsctl support $xfs" echo "nss used $smartcard_nss" echo "usb net redir $usb_redir" -echo "OpenGL support $opengl" +echo "GLX support $glx" echo "libiscsi support $libiscsi" echo "build guest agent $guest_agent" echo "seccomp support $seccomp" @@ -3540,8 +3540,8 @@ if test "$usb_redir" = "yes" ; then echo "CONFIG_USB_REDIR=y" >> $config_host_mak fi -if test "$opengl" = "yes" ; then - echo "CONFIG_OPENGL=y" >> $config_host_mak +if test "$glx" = "yes" ; then + echo "CONFIG_GLX=y" >> $config_host_mak fi if test "$libiscsi" = "yes" ; then @@ -3801,7 +3801,7 @@ case "$target_arch2" in target_nptl="yes" ;; lm32) - target_libs_softmmu="$opengl_libs" + target_libs_softmmu="$glx_libs" ;; m68k) bflt="yes" diff --git a/hw/lm32/Makefile.objs b/hw/lm32/Makefile.objs index 4e1843c..c813eb2 100644 --- a/hw/lm32/Makefile.objs +++ b/hw/lm32/Makefile.objs @@ -15,7 +15,7 @@ obj-y += milkymist-minimac2.o obj-y += milkymist-pfpu.o obj-y += milkymist-softusb.o obj-y += milkymist-sysctl.o -obj-$(CONFIG_OPENGL) += milkymist-tmu2.o +obj-$(CONFIG_GLX) += milkymist-tmu2.o obj-y += milkymist-uart.o obj-y += milkymist-vgafb.o obj-y += framebuffer.o diff --git a/hw/milkymist-hw.h b/hw/milkymist-hw.h index 96b2a7f..19dc7f8 100644 --- a/hw/milkymist-hw.h +++ b/hw/milkymist-hw.h @@ -86,7 +86,7 @@ static inline DeviceState *milkymist_pfpu_create(hwaddr base, return dev; } -#ifdef CONFIG_OPENGL +#ifdef CONFIG_GLX #include #include static const int glx_fbconfig_attr[] = { @@ -100,7 +100,7 @@ static const int glx_fbconfig_attr[] = { static inline DeviceState *milkymist_tmu2_create(hwaddr base, qemu_irq irq) { -#ifdef CONFIG_OPENGL +#ifdef CONFIG_GLX DeviceState *dev; Display *d; GLXFBConfig *configs; -- 1.7.2.5