diff --git a/gb.qt4/configure.ac b/gb.qt4/configure.ac index 90d71e6c8..288b5e556 100644 --- a/gb.qt4/configure.ac +++ b/gb.qt4/configure.ac @@ -42,15 +42,6 @@ GB_COMPONENT_PKG_CONFIG( QtCore ">= 4.3.4" QtGui QtNetwork QtDBus QtXml QtWebKit ">= 4.5.0" ) -GB_COMPONENT( - opengl, - OPENGL, - [OpenGL libraries], - [], - [GB_FIND(gl.h glu.h, /usr /usr/X11R6 /usr/local, include/GL)], - [GB_FIND(libGL.$SHLIBEXT libGLU.$SHLIBEXT, /usr /usr/X11R6 /usr/local, lib)], - [-lGL -lGLU]) - GB_COMPONENT_PKG_CONFIG( qtopengl, QTOPENGL, diff --git a/gb.qt4/src/opengl/Makefile.am b/gb.qt4/src/opengl/Makefile.am index 38d5dd911..5aa2b1a88 100644 --- a/gb.qt4/src/opengl/Makefile.am +++ b/gb.qt4/src/opengl/Makefile.am @@ -2,12 +2,12 @@ COMPONENT = gb.qt4.opengl include $(top_srcdir)/component.am include $(top_srcdir)/gb.qt.am -INCLUDES = -DQT3_SUPPORT @QT_INC@ @OPENGL_INC@ @QTOPENGL_INC@ +INCLUDES = -DQT3_SUPPORT @QT_INC@ @QTOPENGL_INC@ gblib_LTLIBRARIES = gb.qt4.opengl.la -gb_qt4_opengl_la_LIBADD = @QT_LIB@ @OPENGL_LIB@ @QTOPENGL_LIB@ -gb_qt4_opengl_la_LDFLAGS = -module @LD_FLAGS@ @QT_LDFLAGS@ @OPENGL_LDFLAGS@ @QTOPENGL_LDFLAGS@ +gb_qt4_opengl_la_LIBADD = @QT_LIB@ @QTOPENGL_LIB@ +gb_qt4_opengl_la_LDFLAGS = -module @LD_FLAGS@ @QT_LDFLAGS@ @QTOPENGL_LDFLAGS@ gb_qt4_opengl_la_SOURCES = \ main.h main.cpp \