Re: [Gnash] Missing library checks in configure

[strk]

The GLUT test should probably go into the macros/firefox.m4
file (where --enable-plugin is handled).

PNG checks go to macros/png.m4
JPEG checks go to macros/jpeg.m4

Xmu is probably good in toplevel configure.ac

--strk;

On Tue, Jan 10, 2006 at 10:02:00PM +0100, J.H.M. Dassen (Ray) wrote:

> On Tue, Jan 10, 2006 at 21:30:51 +0100, strk wrote:
> > I'm applying these, but I found them to be too strict. I successfully
> > compiled gnash (no plugin) w/out linking glut in.
> 
> Good point. 
> 
> > See if you can find if and how the plugin build is disabled, so you can
> > make libglut unavailability just disable plugin build rather then aborting
> > all builds.
> 
> As a long-time package maintainer, I'm not a big fan of configure scripts
> trying to be too smart. I'd prefer it if the user needs to explicitly
> specify that that the plugin must not be built when not all of its
> dependencies are available. The attached updated patch tries to do that
> (although I'm a bit confused about the interaction between "--enable-reader"
> and the browser plugin).
> 
> HTH,
> Ray
> -- 
> POPULATION EXPLOSION  Unique in human experience, an event which happened
> yesterday but which everyone swears won't happen until tomorrow.
>     - The Hipcrime Vocab by Chad C. Mulligan

> Index: configure.ac
> ===================================================================
> RCS file: /sources/gnash/gnash/configure.ac,v
> retrieving revision 1.11
> diff -u -I'$Id.*$' -p -r1.11 configure.ac
> --- configure.ac      8 Jan 2006 18:56:27 -0000       1.11
> +++ configure.ac      10 Jan 2006 20:56:04 -0000
> @@ -28,6 +28,20 @@ AM_INIT_AUTOMAKE(gnash, 0.7)
>  AM_MAINTAINER_MODE
>  AC_PROG_MAKE_SET
>  
> +AC_CHECK_HEADER(jpeglib.h)
> +AC_CHECK_LIB(jpeg, jpeg_destroy_decompress, [],
> +  AC_MSG_ERROR([
> +Failed to link test code against the jpeg library. Maybe you need to
> +install the development files for libjpeg?
> +]))
> +
> +AC_CHECK_HEADER(png.h)
> +AC_CHECK_LIB(png, png_write_info, [],
> +  AC_MSG_ERROR([
> +Failed to link test code against the PNG library. Maybe you need to
> +install the development files for libpng?
> +]))
> +
>  dnl Use the POSIX Threads library, if specified.
>  AC_ARG_ENABLE(pthreads, [  --enable-pthreads       Enable support for 
> pthreads],
>  [case "${enableval}" in
> @@ -145,6 +159,15 @@ esac], mp3=no)
>  
>  AC_PATH_FIREFOX
>  
> +if test x"$plugin" = x"yes"; then
> +AC_CHECK_HEADER(glut.h)
> +AC_CHECK_LIB(glut, glutInit, [],
> +  AC_MSG_ERROR([
> +Failed to link test code against the GLUT library which is needed for the
> +browser plugin. Maybe you need to install the development files for libglut?
> +]))
> +fi
> +
>  AC_PROG_CC
>  AC_PROG_CXX
>  AC_EXEEXT
> @@ -157,6 +180,17 @@ AM_PATH_JPEG
>  AM_PATH_PNG
>  
>  AC_PATH_XTRA
> +
> +AC_CHECK_HEADER(X11/Xmu/Xmu.h)
> +LIBS_SAVE="$LIBS"
> +LIBS="$LIBS $X_LIBS"
> +AC_CHECK_LIB(Xmu, XmuCvtStringToOrientation, [],
> +  AC_MSG_ERROR([
> +Failed to link test code against the Xmu library. Maybe you need to
> +install the development files for libxmu?
> +]))
> +LIBS="$LIBS_SAVE"
> +
>  AM_PATH_SDL
>  AM_PATH_SDL_MIXER
>  AM_PATH_OPENGL
> @@ -302,4 +336,4 @@ fi
>  if test x"$nogo" = x"true"; then
>  echo ""
>    AC_MSG_ERROR([Please install required packages])
> -fi
> \ No newline at end of file
> +fi
> Index: plugin/plugin.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/plugin/plugin.cpp,v
> retrieving revision 1.6
> diff -u -I'$Id.*$' -p -r1.6 plugin.cpp
> --- plugin/plugin.cpp 7 Jan 2006 18:14:56 -0000       1.6
> +++ plugin/plugin.cpp 10 Jan 2006 20:56:05 -0000
> @@ -29,7 +29,6 @@
>  #include <unistd.h>
>  #include <stdio.h>
>  #include <stdlib.h>
> -#include <Xm/XmAll.h>
>  #include <X11/XKBlib.h>
>  #include <X11/keysym.h>
>  #include <X11/Sunkeysym.h>

> _______________________________________________
> Gnash mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/gnash


-- 

 /"\    ASCII Ribbon Campaign
 \ /    Respect for low technology.
  X     Keep e-mail messages readable by any computer system.
 / \    Keep it ASCII.