|
|
@ -4054,7 +4054,7 @@ AC_DEFUN([AC_HAVE_GL],
|
|
|
|
ac_save_cxxflags=$CXXFLAGS
|
|
|
|
ac_save_cxxflags=$CXXFLAGS
|
|
|
|
ac_save_libs=$LIBS
|
|
|
|
ac_save_libs=$LIBS
|
|
|
|
LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
|
|
|
|
LDFLAGS="$LDFLAGS $GL_LDFLAGS $X_LDFLAGS $all_libraries"
|
|
|
|
LIBS="$LIBS -lGL -lGLU"
|
|
|
|
LIBS="$LIBS -L/usr/lib/mesa -lGL -lGLU"
|
|
|
|
test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
|
|
|
|
test "x$kde_use_qt_mac" != xyes && test "x$kde_use_qt_emb" != xyes && LIBS="$LIBS -lX11"
|
|
|
|
LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
|
|
|
|
LIBS="$LIBS $LIB_XEXT -lm $LIBSOCKET"
|
|
|
|
CXXFLAGS="$CFLAGS $X_INCLUDES"
|
|
|
|
CXXFLAGS="$CFLAGS $X_INCLUDES"
|
|
|
@ -4077,9 +4077,9 @@ AC_DEFUN([AC_HAVE_GL],
|
|
|
|
else
|
|
|
|
else
|
|
|
|
AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
|
|
|
|
AC_DEFINE(HAVE_GL, 1, [Defines if you have GL (Mesa, OpenGL, ...)])
|
|
|
|
if test "$GL_LDFLAGS" = ""; then
|
|
|
|
if test "$GL_LDFLAGS" = ""; then
|
|
|
|
GLLIB='-lGLU -lGL $(LIB_X11)'
|
|
|
|
GLLIB='-L/usr/lib/mesa -lGLU -lGL $(LIB_X11)'
|
|
|
|
else
|
|
|
|
else
|
|
|
|
GLLIB="$GL_LDFLAGS -lGLU -lGL "'$(LIB_X11)'
|
|
|
|
GLLIB="$GL_LDFLAGS -L/usr/lib/mesa -lGLU -lGL "'$(LIB_X11)'
|
|
|
|
fi
|
|
|
|
fi
|
|
|
|
if test "$GL_INCLUDE" = ""; then
|
|
|
|
if test "$GL_INCLUDE" = ""; then
|
|
|
|
GLINC=""
|
|
|
|
GLINC=""
|
|
|
|