diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-03-29 18:23:36 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-03-29 18:23:36 +0000 |
| commit | 170641f69a86cdd740df4c1ec74194ef84dab6a0 (patch) | |
| tree | 06fe02512fdee953cce1c56d73257a4c714c64ac /m4/opengl.m4 | |
| parent | 6afd42f5c2fc8272cd1308584c6f794f91a07c40 (diff) | |
| download | xine-lib-170641f69a86cdd740df4c1ec74194ef84dab6a0.tar.gz xine-lib-170641f69a86cdd740df4c1ec74194ef84dab6a0.tar.bz2 | |
Replace obsolete macros (processing done by autoupdate).
Some tests were rearranged (AC_TRY_LINK moved out of AC_TRY_RUN
cross-compilation case, with arrangements to maintain the semantics) to
avoid autoupdate errors.
Factored out common (duplicate) code in aa.m4.
Tested with autoconf 2.61; needs testing with 2.60.
CVS patchset: 8767
CVS date: 2007/03/29 18:23:36
Diffstat (limited to 'm4/opengl.m4')
| -rw-r--r-- | m4/opengl.m4 | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/m4/opengl.m4 b/m4/opengl.m4 index 5e79c1e8a..2c12949d9 100644 --- a/m4/opengl.m4 +++ b/m4/opengl.m4 @@ -32,9 +32,8 @@ AC_DEFUN([AM_PATH_OPENGL], [ [AC_MSG_CHECKING([if GLU is sane]) ac_save_LIBS="$LIBS" LIBS="$X_LIBS $XPRE_LIBS $OPENGL_LIBS -lGLU $X_EXTRA_LIBS" - AC_TRY_LINK([#include <GL/gl.h> -#include <GL/glu.h>], - [ gluPerspective(45.0f,1.33f,1.0f,1000.0f); glBegin(GL_POINTS); glEnd(); return 0 ], + AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <GL/gl.h> +#include <GL/glu.h>]], [[ gluPerspective(45.0f,1.33f,1.0f,1000.0f); glBegin(GL_POINTS); glEnd(); return 0 ]])], [ ac_have_glu="yes" GLU_LIBS="-lGLU" AC_DEFINE(HAVE_GLU,1,[Define this if you have GLU support available]) |