Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 525936
Collapse All | Expand All

(-)configure.ac.orig (-33 / +33 lines)
Lines 780-816 Link Here
780
  fi
780
  fi
781
fi
781
fi
782
782
783
dnl X, GLX and OpenGL
784
if test "x$HAVE_X" = "xno"; then
785
  if test "x$NEED_GLX" = "xyes"; then
786
    AC_MSG_ERROR([Building the GLX backend without X11 is unsupported])
787
  fi
788
  if test "x$NEED_X11" = "xyes"; then
789
    AC_MSG_ERROR([Could not find X11 development libraries])
790
  fi
791
else
792
  if test "x$NEED_GL" != "xno"; then
793
    if test "x$HAVE_GL" = "xno"; then
794
      if test "x$NEED_GLX" = "xyes"; then
795
        AC_MSG_ERROR([Building the GLX backend without the OpenGL backend is unsupported])
796
      fi
797
    else dnl HAVE_GL=yes
798
      if test "x$HAVE_GLU" = "xno"; then
799
        if test "x$NEED_GL" = "xyes"; then
800
          AC_MSG_ERROR([GLU is required with OpenGL support])
801
        else
802
          AC_MSG_WARN([GLU is required with OpenGL support])
803
        fi
804
      else dnl HAVE_GLU=yes
805
        USE_OPENGL=yes
806
        if test "x$NEED_GLX" != "xno"; then
807
          USE_GLX=yes
808
        fi
809
      fi
810
    fi
811
  fi
812
fi
813
814
dnl check if we can include both GL and GLES2 at the same time
783
dnl check if we can include both GL and GLES2 at the same time
815
if test "x$HAVE_GL" = "xyes" -a "x$HAVE_GLES2" = "xyes"; then
784
if test "x$HAVE_GL" = "xyes" -a "x$HAVE_GLES2" = "xyes"; then
816
  GL_INCLUDES="
785
  GL_INCLUDES="
Lines 850-856 Link Here
850
    ]])],[ AC_MSG_RESULT(yes)
819
    ]])],[ AC_MSG_RESULT(yes)
851
    ],[AC_MSG_RESULT(no)
820
    ],[AC_MSG_RESULT(no)
852
    if test "x$NEED_GLES2" = "xyes"; then
821
    if test "x$NEED_GLES2" = "xyes"; then
853
      if test "x$NEED_OPENGL" = "xyes"; then
822
      if test "x$NEED_GL" = "xyes"; then
854
        AC_MSG_ERROR([Cannot seem to include both GL and GLES2 headers. Try disabling one API])
823
        AC_MSG_ERROR([Cannot seem to include both GL and GLES2 headers. Try disabling one API])
855
      fi
824
      fi
856
      AC_MSG_WARN([Disabling Desktop GL support])
825
      AC_MSG_WARN([Disabling Desktop GL support])
Lines 863-868 Link Here
863
  CPPFLAGS="$save_CPPFLAGS"
832
  CPPFLAGS="$save_CPPFLAGS"
864
fi
833
fi
865
834
835
dnl X, GLX and OpenGL
836
if test "x$HAVE_X" = "xno"; then
837
  if test "x$NEED_GLX" = "xyes"; then
838
    AC_MSG_ERROR([Building the GLX backend without X11 is unsupported])
839
  fi
840
  if test "x$NEED_X11" = "xyes"; then
841
    AC_MSG_ERROR([Could not find X11 development libraries])
842
  fi
843
else
844
  if test "x$NEED_GL" != "xno"; then
845
    if test "x$HAVE_GL" = "xno"; then
846
      if test "x$NEED_GLX" = "xyes"; then
847
        AC_MSG_ERROR([Building the GLX backend without the OpenGL backend is unsupported])
848
      fi
849
    else dnl HAVE_GL=yes
850
      if test "x$HAVE_GLU" = "xno"; then
851
        if test "x$NEED_GL" = "xyes"; then
852
          AC_MSG_ERROR([GLU is required with OpenGL support])
853
        else
854
          AC_MSG_WARN([GLU is required with OpenGL support])
855
        fi
856
      else dnl HAVE_GLU=yes
857
        USE_OPENGL=yes
858
        if test "x$NEED_GLX" != "xno"; then
859
          USE_GLX=yes
860
        fi
861
      fi
862
    fi
863
  fi
864
fi
865
866
#dnl Check for OpenGL, GLU
866
#dnl Check for OpenGL, GLU
867
echo host is $host
867
echo host is $host
868
case $host in
868
case $host in
Lines 1060-1066 Link Here
1060
    fi
1060
    fi
1061
1061
1062
    if test "x$HAVE_GL" = "xyes"; then
1062
    if test "x$HAVE_GL" = "xyes"; then
1063
      if test "$NEED_GL" != "xno"; then
1063
      if test "x$NEED_GL" != "xno"; then
1064
        if test "x$HAVE_WGL" = "xyes"; then
1064
        if test "x$HAVE_WGL" = "xyes"; then
1065
          if test "$NEED_WGL" != "xno"; then
1065
          if test "$NEED_WGL" != "xno"; then
1066
            GL_LIBS="$GL_LIBS -lgdi32 -lopengl32 -lglu32"
1066
            GL_LIBS="$GL_LIBS -lgdi32 -lopengl32 -lglu32"

Return to bug 525936