gnash-commit
[Top][All Lists]
Advanced

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

[Gnash-commit] gnash configure.ac backend/Makefile.am gui/Make...


From: Rob Savoye
Subject: [Gnash-commit] gnash configure.ac backend/Makefile.am gui/Make...
Date: Sat, 07 Oct 2006 02:54:24 +0000

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/10/07 02:54:24

Modified files:
        .              : configure.ac 
        backend        : Makefile.am 
        gui            : Makefile.am README 
        macros         : agg.m4 cairo.m4 ffmpeg.m4 gtkglext.m4 kde.m4 
                         opengl.m4 

Log message:
                * configure.ac: Make config tests for gui or rendered enabled or
                disabled based on the selected ones. Define all conditional
                variables here, since the tests may not get executed now. This
                makes configuring faster.
                * backend/Makefile.am: Add AGG support.
                * gui/Makefile.am: Add AGG support.
                * gui/README: Add Framebuffer and AGG notes.
                * macros/cairo.m4, ffmpeg.m4:, gtkglext.m4, kde.m4, opengl.m4:
                Don't define conditional variables here.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.35&r2=1.36
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/README?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/cairo.m4?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ffmpeg.m4?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/gtkglext.m4?cvsroot=gnash&r1=1.20&r2=1.21
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/kde.m4?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/opengl.m4?cvsroot=gnash&r1=1.21&r2=1.22

Patches:
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- configure.ac        5 Oct 2006 21:06:52 -0000       1.123
+++ configure.ac        7 Oct 2006 02:54:23 -0000       1.124
@@ -33,7 +33,7 @@
 dnl also makes it possible to release a modified version which carries
 dnl forward this exception.
 
-dnl $Id: configure.ac,v 1.123 2006/10/05 21:06:52 rsavoye Exp $
+dnl $Id: configure.ac,v 1.124 2006/10/07 02:54:23 rsavoye Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, 0.7.1-cvs)
@@ -65,15 +65,8 @@
   no)  klash=no ;;
   *)   AC_MSG_ERROR([bad value ${enableval} for --enable-klash option]) ;;
 esac],klash=no)
-
-KDE_SET_PREFIX
-AM_KDE_WITH_NLS
-AC_PATH_KDE
-KDE_USE_QT(3)
 AM_CONDITIONAL(KLASH, test x$klash = xyes)
-AM_CONDITIONAL(HAS_KDE, test x$kde = xyes)
 
-dnl Add KFLASH support, if specified.
 AC_ARG_ENABLE(fork, [  --disable-fork          Use a thread instead forking 
the standalone player.],
 [case "${enableval}" in
   yes) fork=yes ;;
@@ -167,6 +160,7 @@
    sdl|SDL) gui=sdl  ;;
    kde|KDE) gui=kde  ;;
    fltk|FLTK) gui=fltk  ;;
+   fb|FB) gui=fb  ;;
    *)      AC_MSG_ERROR([invalid gui ${enableval} given]) ;;
   esac],
  [gui=gtk]
@@ -176,6 +170,7 @@
        sdl)  AC_DEFINE([GUI_SDL],  [1], [Use SDL gui toolkit]) ;;
        kde)  AC_DEFINE([GUI_KDE],  [1], [Use KDE gui toolkit]) ;;
        fltk) AC_DEFINE([GUI_FLTK], [1], [Use FLTK gui toolkit]) ;;
+       fb) AC_DEFINE([GUI_FB], [1], [Use Framebuffer, no gui toolkit]) ;;
        *)
 esac
 
@@ -183,6 +178,7 @@
 AM_CONDITIONAL(USE_GUI_SDL, test x$gui = xsdl)
 AM_CONDITIONAL(USE_GUI_KDE, test x$gui = xkde)
 AM_CONDITIONAL(USE_GUI_FLTK, test x$gui = xfltk)
+AM_CONDITIONAL(USE_GUI_FB, test x$gui = xfb)
 
 if test x$renderer = xcairo; then
   AC_DEFINE([RENDERER_CAIRO], [1], [Use cairo renderer])
@@ -405,37 +401,77 @@
 
 GNASH_PATH_MP3
 GNASH_PATH_OGG
+if test x$gui = xsdl; then
 GNASH_PATH_SDL
-AM_CONDITIONAL(HAS_SDL, [ test x$has_sdl = xyes ])
+fi
 GNASH_PATH_SDL_MIXER
-GNASH_PATH_BOOST
+AM_CONDITIONAL(HAS_SDL, [ test x$has_sdl = xyes ])
 
+GNASH_PATH_BOOST
+AM_PATH_LIBXML2 
 dnl
 dnl NOTE: make sure to check for GLIB and LIBXML2 
 dnl before checking for gstreamer
 dnl
 
-GNASH_PATH_GLIB
-AM_PATH_LIBXML2 
-GNASH_PATH_GSTREAMER
-GNASH_PATH_FFMPEG
+if test x$renderer != xkde -o x$gui = xkde; then
+KDE_SET_PREFIX
+AM_KDE_WITH_NLS
+AC_PATH_KDE
+KDE_USE_QT(3)
+fi
+
+if test x$renderer != xopengl; then
 GNASH_PATH_OPENGL
+fi
+
+AM_CONDITIONAL(opengl, [test x$opengl = xyes])
+
+if test x$gui = xgtk; then
+GNASH_PATH_GLIB
 GNASH_PATH_GLEXT
 GNASH_PATH_GTK2
+GNASH_PATH_PANGO
+GNASH_PATH_ATK
+GNASH_PATH_XFT
+GNASH_PATH_GHELP
+fi
+AM_CONDITIONAL(GHELP, [test x$ghelp = xyes])
+AM_CONDITIONAL(HAVE_GLEXT, [test x$glext = xyes])
+AM_CONDITIONAL(HAVE_AGG, [test x${ac_cv_path_agg_lib} != x])
+
+dnl these conditionals were moved out of kde.m4
+AM_CONDITIONAL(HAS_KDE, test x$kde = xyes)
+# used to disable x11-specific stuff on special platforms
+AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test 
"$kde_use_qt_mac" = "no")
+AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
+AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test 
"$kde_gcc_supports_pch" = "yes")
+
 AM_CONDITIONAL(HAS_GTK2, [ test x$has_gtk2 = xyes ])
+
+GNASH_PATH_FFMPEG
+AM_CONDITIONAL(HAVE_FFMPEG, [test x"${FFMPEG_LIBS}" != x])
+
+GNASH_PATH_GSTREAMER
+
+if test x$gui = xfltk; then
 GNASH_PATH_FLTK
+fi
 AM_CONDITIONAL(HAS_FLTK, [ test x$has_fltk = xyes ])
-GNASH_PATH_XFT
 AM_CONDITIONAL(HAS_XFT, [ test x$has_xft = xyes ])
+
+if test x$renderer = xcairo -o x$gui = xgtk ; then
 GNASH_PATH_CAIRO
+fi
+AM_CONDITIONAL(CAIRO, [test x$cairo = xyes])
+
+if test x$renderer = xagg; then
 GNASH_PATH_AGG
-GNASH_PATH_PANGO
-GNASH_PATH_ATK
-GNASH_PATH_PTHREADS
-GNASH_PATH_GHELP
-AM_CONDITIONAL(GHELP, [test x$ghelp = xyes])
+fi
+
 GNASH_DOCBOOK
 AM_CONDITIONAL(DOCBOOK, test x$docbook = xyes)
+
 GNASH_PROG_LIBTOOL
 GNASH_PATH_CURL
 
@@ -471,6 +507,7 @@
 fi
 
 
+GNASH_PATH_PTHREADS
 if test x"$pthreads" = x"yes"; then
        if test x"$PTHREAD_CFLAGS" != x; then
              CXXFLAGS="$CXXFLAGS $PTHREAD_CFLAGS"
@@ -761,7 +798,7 @@
   fi
 fi
 
-dnl if test x"$glext" = x"yes"; then
+if test x"$gui" = x"gtk"; then
   if test x"$GLEXT_LIBS" != x; then
     if test x"$GLEXT_CFLAGS" != x; then
       echo "        GtkGLExt flags are: $GLEXT_CFLAGS"
@@ -781,51 +818,66 @@
       fi
     fi
   fi
-dnl fi
 
-if test x"$GTK2_LIBS" != x; then
+  if test x"$GTK2_LIBS" != x; then
   if test x"$GTK2_CFLAGS" != x; then
     echo "        GTK2 flags are: $GTK2_CFLAGS"
   else
     echo "        GTK2 flags are: default include path"
   fi
     echo "        GTK2 libs are: $GTK2_LIBS"
-else
+  else
   echo "ERROR: No GTK2 development package installed!\
 You need to have the GTK2 development package installed\
 to compile this project or install libgtk2.0-dev \
 (using apt-get) or gtk2-devel (using yum)."
 dnl    nogo=true
-fi
+  fi
 
-if test x"$PANGO_LIBS" != x; then
+  if test x"$PANGO_LIBS" != x; then
   if test x"$PANGO_CFLAGS" != x; then
     echo "        Pango flags are: $PANGO_CFLAGS"
   else
     echo "        Pango flags are: default include path"
     fi
     echo "        Pango libs are: $PANGO_LIBS"
-else
+  else
     echo "ERROR: No Pango development package installed!\
 You need to have the Pango development package installed\
 to compile this project or install libpango1.0-dev \
 (using apt-get) or pango-devel (using yum)."
 dnl    nogo=true
-fi
+  fi
 
-if test x"$GLIB_LIBS" != x; then
+  if test x"$GLIB_LIBS" != x; then
   if test x"$GLIB_CFLAGS" != x; then
     echo "        GLib flags are: $GLIB_CFLAGS"
   else
     echo "        GLib flags are: default include path"
   fi
     echo "        GLib libs are: $GLIB_LIBS"
-else
+  else
   echo "ERROR: No GLib development package installed!\
 You need to have the GLib development package installed\
 to compile this project or install libglib2.0-dev \
  (using apt-get) or glib2-devel (using yum)."
 dnl    nogo=true
+  fi
+
+  if test x"$ATK_LIBS" != x; then
+    if test x"$ATK_CFLAGS" != x; then
+      echo "        ATK flags are: $ATK_CFLAGS"
+    else
+      echo "        ATK flags are: default include path"
+    fi
+      echo "        ATK libs are: $ATK_LIBS"
+  else
+    echo "ERROR: No ATK development package installed!\
+ You need to have the ATK development package installed\
+ to compile this project or install libatk1.0-dev \
+ (using apt-get) or atk-devel (using yum)."
+dnl    nogo=true
+  fi
 fi
 
 if test "$sound_handler" = "gst"; then
@@ -875,22 +927,7 @@
   fi
 fi
 
-if test x"$ATK_LIBS" != x; then
-  if test x"$ATK_CFLAGS" != x; then
-    echo "        ATK flags are: $ATK_CFLAGS"
-  else
-    echo "        ATK flags are: default include path"
-  fi
-    echo "        ATK libs are: $ATK_LIBS"
-else
-    echo "ERROR: No ATK development package installed!\
- You need to have the ATK development package installed\
- to compile this project or install libatk1.0-dev \
- (using apt-get) or atk-devel (using yum)."
-dnl    nogo=true
-fi
-
-if test x"$fltk" = x"yes"; then
+if test x$gui = xfltk; then
   if test x"$FLTK_LIBS" != x; then
     if test x"$FLTK_CFLAGS" != x; then
       echo "        Fltk flags are: $FLTK_CFLAGS"
@@ -1001,6 +1038,7 @@
 fi
 
 if test x$renderer = xagg; then
+  if test x$agg24 = xyes; then
   if test x"$AGG_LIBS" != x; then
     if test x"$AGG_CFLAGS" != x; then
       echo "        AGG flags are: $AGG_CFLAGS"
@@ -1015,6 +1053,10 @@
  (using apt-get) or agg-devel (using yum)."
 dnl    nogo=true
   fi
+  else
+    echo "Your installtion of AGG appears to be a version older than 2.4.\
+Please upgrade to AGG 2.4 or greater."
+  fi
 fi
 
 if test x"$BOOST_LIBS" != x; then

Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- backend/Makefile.am 6 Oct 2006 09:22:08 -0000       1.35
+++ backend/Makefile.am 7 Oct 2006 02:54:23 -0000       1.36
@@ -48,6 +48,7 @@
 INCLUDES = -I.. \
         -I$(top_srcdir)        \
         -I$(top_srcdir)/server  \
+        -I$(top_srcdir)/server/parser \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/backend \
         -I$(top_srcdir)/libgeometry \
@@ -97,6 +98,12 @@
 endif
 endif
 
+if USE_RENDERER_AGG
+RENDER_SOURCES = render_handler_tri.cpp render_handler_agg.cpp
+AM_LDFLAGS += $(AGG_LIBS)
+INCLUDES += $(AGG_CFLAGS)
+endif
+
 libgnashbackend_la_LIBADD = \
        ../libbase/libgnashbase.la \
        ../server/libgnashserver.la 

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gui/Makefile.am     6 Oct 2006 15:15:49 -0000       1.23
+++ gui/Makefile.am     7 Oct 2006 02:54:24 -0000       1.24
@@ -113,6 +113,13 @@
  KDE_SRCS = 
 endif
 
+if USE_GUI_FB
+ AGG_SRCS = agg.cpp aggsup.h
+ INCLUDES += $(AGG_CFLAGS)
+else
+ AGG_SRCS = 
+endif
+
 #if USE_GUI_FLTK
 # FLTK_SRCS = fltk.cpp fltksup.h
 # INCLUDES += $(FLTK_INCLS) 

Index: gui/README
===================================================================
RCS file: /sources/gnash/gnash/gui/README,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- gui/README  12 May 2006 00:23:04 -0000      1.3
+++ gui/README  7 Oct 2006 02:54:24 -0000       1.4
@@ -21,9 +21,11 @@
 used. This will enable Gnash to have a GUI on platforms with no
 windowing system.
 
-At this time, OpenGL and (experimental) Cairo backends are available.
-It should be possible to use OpenGLES (the embedded version), but you
-may be able to run Cairo on a framebuffer device.
+At this time, OpenGL and (experimental) Cairo and AGG backends are available.
+It should be possible to use OpenGLES (the embedded version). As the
+AGG backend is the most functional for a framebuffer, that should be
+used for most embedded targets. Cairo also supports a framebuffer
+driver, but that renderer is less complete.
 
 STATUS
 
@@ -46,3 +48,6 @@
 
 FLTK:
 - Doesn't work just yet.
+
+Framebuffer:
+- Working as output device only, no input devices currently supported.
\ No newline at end of file

Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- macros/agg.m4       30 Sep 2006 15:56:30 -0000      1.1
+++ macros/agg.m4       7 Oct 2006 02:54:24 -0000       1.2
@@ -35,15 +35,17 @@
 dnl  
 dnl 
 
+dnl agg_rasterizer_compound_aa.h is a new file included in AGG 2.4,
+dnl but not in AGG 2.3. As we need AGG 2.4, we use this as 
 AC_DEFUN([GNASH_PATH_AGG],
 [
   dnl Lool for the header
   AC_ARG_WITH(agg_incl, [  --with-agg-incl        directory where AGG headers 
are], with_agg_incl=${withval})
   AC_CACHE_VAL(ac_cv_path_agg_incl,[
   if test x"${with_agg_incl}" != x ; then
-    if test -f ${with_agg_incl}/agg_math.h ; then
+    if test -f ${with_agg_incl}/agg_rasterizer_compound_aa.h.h ; then
       ac_cv_path_agg_incl=`(cd ${with_agg_incl}; pwd)`
-    elif test -f ${with_agg_incl}/agg_math.h ; then
+    elif test -f ${with_agg_incl}/agg_rasterizer_compound_aa.h ; then
       ac_cv_path_agg_incl=`(cd ${with_agg_incl}; pwd)`
     else
       AC_MSG_ERROR([${with_agg_incl} directory doesn't contain any headers])
@@ -51,16 +53,27 @@
   fi
   ])
 
+  agg24=no
   if test x"${ac_cv_path_agg_incl}" = x ; then
     AC_MSG_CHECKING([for AGG headers])
     incllist="${prefix}/include /sw/include /usr/local/include 
/home/latest/include /opt/include /usr/include .. ../.."
 
     for i in $incllist; do
-      if test -f $i/agg2/agg_math.h; then
+      if test -f $i/agg2/agg_rasterizer_compound_aa.h; then
         ac_cv_path_agg_incl="-I$i/agg2"
+       agg24=yes
         break
       fi
     done
+    if test x"${ac_cv_path_agg_incl}" = x ; then
+      for i in $incllist; do
+        if test -f $i/agg2/agg_math.h; then
+         AC_MSG_WARN([You appear to have AGG 2.3 installed, version 2.4 or 
greater is required])
+         agg24=no
+          break
+        fi
+      done
+    fi
   fi
 
   if test x"${ac_cv_path_agg_incl}" != x ; then
@@ -115,8 +128,6 @@
       AGG_LIBS="-lagg -laggplatformX11"
   fi
 
-  AM_CONDITIONAL(HAVE_AGG, [test x${ac_cv_path_agg_lib} != x])
-
   AC_SUBST(AGG_LIBS)
 
 ])

Index: macros/cairo.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/cairo.m4,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- macros/cairo.m4     27 Jul 2006 14:54:43 -0000      1.6
+++ macros/cairo.m4     7 Oct 2006 02:54:24 -0000       1.7
@@ -137,8 +137,6 @@
     CAIRO_LIBS=""
   fi
 
-  AM_CONDITIONAL(CAIRO, [test x$cairo = xyes])
-
   AC_SUBST(CAIRO_CFLAGS)
   AC_SUBST(CAIRO_LIBS)
 ])

Index: macros/ffmpeg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ffmpeg.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- macros/ffmpeg.m4    3 Oct 2006 12:14:17 -0000       1.2
+++ macros/ffmpeg.m4    7 Oct 2006 02:54:24 -0000       1.3
@@ -131,8 +131,6 @@
       FFMPEG_LIBS="${ac_cv_path_ffmpeg_lib} -lavcodec -lavutil"
   fi
 
-  AM_CONDITIONAL(HAVE_FFMPEG, [test x"${FFMPEG_LIBS}" != x])
-
   AC_SUBST(FFMPEG_LIBS)
 
 ])

Index: macros/gtkglext.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/gtkglext.m4,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- macros/gtkglext.m4  14 Aug 2006 16:49:39 -0000      1.20
+++ macros/gtkglext.m4  7 Oct 2006 02:54:24 -0000       1.21
@@ -196,8 +196,6 @@
     glext=no
   fi
 
-  AM_CONDITIONAL(HAVE_GLEXT, [test x$glext = xyes])
-
   AC_SUBST(GLEXT_CFLAGS)
   AC_SUBST(GLEXT_LIBS)
 ])

Index: macros/kde.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/kde.m4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- macros/kde.m4       22 Aug 2006 21:12:10 -0000      1.14
+++ macros/kde.m4       7 Oct 2006 02:54:24 -0000       1.15
@@ -560,7 +560,6 @@
         [build_arts=$withval],
         [build_arts=yes]
     )
-    AM_CONDITIONAL(include_ARTS, test "$build_arts" '!=' "no")
     if test "$build_arts" = "no"; then
         AC_DEFINE(WITHOUT_ARTS, 1, [Defined if compiling without arts])
     fi
@@ -884,9 +883,6 @@
   kde_use_qt_mac=no
 )
 
-# used to disable x11-specific stuff on special platforms
-AM_CONDITIONAL(include_x11, test "$kde_use_qt_emb" = "no" && test 
"$kde_use_qt_mac" = "no")
-
 if test "$kde_use_qt_emb" = "no" && test "$kde_use_qt_mac" = "no"; then
 
 AC_MSG_CHECKING(for X)
@@ -3116,7 +3112,6 @@
         rm -f conftest.h conftest.h.gch
     fi
   fi
-  AM_CONDITIONAL(unsermake_enable_pch, test "$kde_use_pch" = "yes" && test 
"$kde_gcc_supports_pch" = "yes")
   if test "$CXX" = "KCC"; then
     dnl unfortunately we currently cannot disable exception support in KCC
     dnl because doing so is binary incompatible and Qt by default links with 
exceptions :-(

Index: macros/opengl.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/opengl.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- macros/opengl.m4    17 Sep 2006 19:45:59 -0000      1.21
+++ macros/opengl.m4    7 Oct 2006 02:54:24 -0000       1.22
@@ -111,10 +111,10 @@
 
     if test x"${ac_cv_path_opengl_lib}" = x; then
       AC_CHECK_LIB(GL, glBegin, [ac_cv_path_opengl_lib="-lGL -lGLU"],[
-        AC_MSG_CHECKING([for OpenGL library])
+        AC_MSG_CHECKING([for OpenGL libraries])
         libslist="/usr/i586-mingw32msvc/lib ${prefix}/lib64 ${prefix}/lib 
/usr/X11R6/lib /usr/lib64 /usr/lib /usr/local/lib /opt/lib /usr/pkg/lib 
/usr/lib/opengl/xorg-x11/lib /usr/lib64/opengl/xorg-x11/lib 
/usr/lib64/opengl/xorg-x11/lib64  /opt/mesa/lib64 /opt/mesa/lib .. ../.."
         for i in $libslist; do
-          if test -f $i/libGL.a -o -f $i/libGL.so; then
+          if test -f $i/libGLU.a -o -f $i/libGLU.so; then
             if test x"$i" != x"/usr/lib"; then
               ac_cv_path_opengl_lib="-L$i -lGL -lGLU"
               break
@@ -134,7 +134,7 @@
          fi
         done])
     else
-      if test -f ${ac_cv_path_opengl_lib}/libGL.a -o -f 
${ac_cv_path_opengl_lib}/libGL.so; then
+      if test -f ${ac_cv_path_opengl_lib}/libGLU.a -o -f 
${ac_cv_path_opengl_lib}/libGLU.so; then
         if test x"${ac_cv_path_opengl_lib}" != x"/usr/lib"; then
           ac_cv_path_opengl_lib="-L${ac_cv_path_opengl_lib} -lGL -lGLU"
          else
@@ -154,8 +154,6 @@
       OPENGL_LIBS=""
   fi
 
-  AM_CONDITIONAL(opengl, [test x$opengl = xyes])
-
   AC_SUBST(OPENGL_CFLAGS)
   AC_SUBST(OPENGL_LIBS)
 ])




reply via email to

[Prev in Thread] Current Thread [Next in Thread]