actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

attempt to fix bug #349

Browse Source
This commit is contained in:
AJ Kelly
2011-07-07 11:37:22 -05:00
parent fc19060491
commit f0b7ee4545
1 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
autoconf/m4/opengl.m4
+21 -21
View File
@@ -1,36 +1,36 @@
AC_DEFUN([SM_X_WITH_OPENGL], AC_DEFUN([SM_X_WITH_OPENGL],
[ [
AC_PATH_X AC_PATH_X
XCFLAGS=
XLIBS=
if test "$no_x" != "yes"; then XCFLAGS=
XLIBS=
if test "$no_x" != "yes"; then
if test -n "$x_includes"; then if test -n "$x_includes"; then
XCFLAGS="-I$x_includes" XCFLAGS="-I$x_includes"
fi fi
if test -n "$x_libraries"; then if test -n "$x_libraries"; then
XLIBS="-L$x_libraries" XLIBS="-L$x_libraries"
fi fi
XLIBS+="-lX11" XLIBS+="-lX11"
if test -n "$x_includes"; then if test -n "$x_includes"; then
# See if we can compile X applications without using $XCFLAGS. # See if we can compile X applications without using $XCFLAGS.
AC_MSG_CHECKING(if $XCFLAGS is really necessary) AC_MSG_CHECKING(if $XCFLAGS is really necessary)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xos.h>]], [[]])],[XCFLAGS= AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <X11/Xos.h>]], [[]])],[XCFLAGS=
AC_MSG_RESULT(no)],[AC_MSG_RESULT(yes)]) AC_MSG_RESULT(no)],[AC_MSG_RESULT(yes)])
fi fi
# Check for libXtst. # Check for libXtst.
AC_CHECK_LIB(Xtst, XTestQueryExtension, AC_CHECK_LIB(Xtst, XTestQueryExtension,
XLIBS="$XLIBS -lXtst" XLIBS="$XLIBS -lXtst"
[AC_DEFINE(HAVE_LIBXTST, 1, [libXtst available])], [AC_DEFINE(HAVE_LIBXTST, 1, [libXtst available])],
, ,
[$XLIBS]) [$XLIBS])
AC_DEFINE(HAVE_X11, 1, [X11 libraries present]) AC_DEFINE(HAVE_X11, 1, [X11 libraries present])
fi fi
# Check for Xrandr # Check for Xrandr
# Can someone fix this for me? This is producing bizarre warnings from # Can someone fix this for me? This is producing bizarre warnings from
@@ -55,15 +55,15 @@ AC_DEFUN([SM_X_WITH_OPENGL],
AM_CONDITIONAL(HAVE_X11, test "$no_x" != "yes") AM_CONDITIONAL(HAVE_X11, test "$no_x" != "yes")
AC_SUBST(XCFLAGS) AC_SUBST(XCFLAGS)
AC_SUBST(XLIBS) AC_SUBST(XLIBS)
# Check for libGL and libGLU. # Check for libGL and libGLU.
AC_CHECK_LIB(GL, glPushMatrix, XLIBS="$XLIBS -lGL", AC_CHECK_LIB(GL, glPushMatrix, XLIBS="$XLIBS -lGL",
AC_MSG_ERROR([No OpenGL library could be found.]), [$XLIBS]) AC_MSG_ERROR([No OpenGL library could be found.]), [$XLIBS])
AC_CHECK_LIB(GLU, gluGetString, XLIBS="$XLIBS -lGLU", AC_CHECK_LIB(GLU, gluGetString, XLIBS="$XLIBS -lGLU",
AC_MSG_ERROR([No GLU library could be found.]), [$XLIBS]) AC_MSG_ERROR([No GLU library could be found.]), [$XLIBS])
AC_SUBST(XLIBS) AC_SUBST(XLIBS)
]) ])