[Kde-imaging] kdeextragear-libs-1/kipi-plugins

[Renchi Raju]

CVS commit by pahlibar: 



"fixed" configure to allow slideshow to be compiled. added test to check
if qt has been compiled with opengl support if --enable-opengl is not
specified. testing requested.

CCMAIL: kde-imaging at kde.org


  M +4 -7      Makefile.am   1.19
  M +23 -10    configure.in.in   1.9


--- kdeextragear-libs-1/kipi-plugins/Makefile.am  #1.18:1.19
@@ -1,8 +1,5 @@
-SLIDESHOWDIR=
-if compile_SLIDESHOW
-        SLIDESHOWDIR=slideshow
-endif
+SUBDIRS = printwizard calendar mpegencoder cdarchiving imagesgallery \
+        commentseditor sendimages acquireimages \
+        jpeglossless batchprocessimages timeadjust diroperations wallpaper \
+        rawconverter findimages gammacalibration $(SLIDESHOWDIR)
 
-SUBDIRS = printwizard calendar mpegencoder cdarchiving imagesgallery commentseditor sendimages acquireimages \
-        jpeglossless batchprocessimages $(SLIDESHOWDIR) timeadjust diroperations wallpaper \
-        rawconverter findimages gammacalibration

--- kdeextragear-libs-1/kipi-plugins/configure.in.in  #1.8:1.9
@@ -207,5 +207,18 @@
 dnl
 [
-        AC_MSG_NOTICE([The slideshow plugin requires OpenGL support compiled into Qt!])
+
+dnl
+dnl configure didn't specify to use external opengl library
+dnl check if qt has been compiled with opengl
+dnl
+
+    AC_CHECK_LIB( $qtlib-mt, glAccum,  have_GL=yes,   have_GL=no)
+    if test $have_GL = "yes"; then
+        AC_MSG_RESULT(
+        [qt compiled with opengl support. using built in opengl])
+    else
+        AC_MSG_WARN(
+        [qt not compiled with opengl support. disabling slideshow plugin])
+    fi   
 ])
 
@@ -269,14 +282,14 @@
 dnl Check if Imlib2 is installed properly
 KDE_FIND_IMLIB2_CONFIG
-     
-if test -z "$ac_imlib2_config"; then
-  AC_MSG_WARN([Imlib2 not found.])
-  SLIDESHOWDIR=""
-else
-  SLIDESHOWDIR=slideshow
-fi
 
 dnl Check for Mesa (OpenGL) for slideshow plugin
 MDL_HAVE_OPENGL
 
-AM_CONDITIONAL(compile_SLIDESHOW, test -n "$ac_imlib2_config" -a -n "$have_gl" )
+
+AC_SUBST(SLIDESHOWDIR)
+if test -n "$ac_imlib2_config" -a "$have_GL" = yes; then
+        SLIDESHOWDIR='slideshow'
+else
+        SLIDESHOWDIR=''
+        AC_MSG_WARN([Slideshow plugin will not be compiled])
+fi