From e40b2a1b07368bd49235ad7ea07175652c3bcd56 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Thu, 8 Nov 2012 00:14:44 +0100 Subject: [PATCH] configure: Remove checks for OpenGL headers that are no longer used. --- configure | 139 +++++++++++--------------------------------- configure.ac | 86 +++++++++------------------ include/config.h.in | 18 ------ 3 files changed, 61 insertions(+), 182 deletions(-) diff --git a/configure b/configure index 4f020cf5ff0..991026dc9f2 100755 --- a/configure +++ b/configure @@ -2613,7 +2613,7 @@ fi # Check whether --with-glu was given. if test "${with_glu+set}" = set; then : - withval=$with_glu; if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi + withval=$with_glu; fi @@ -2685,7 +2685,7 @@ fi # Check whether --with-osmesa was given. if test "${with_osmesa+set}" = set; then : - withval=$with_osmesa; if test "x$withval" = "xno"; then ac_cv_header_GL_osmesa_h=no; fi + withval=$with_osmesa; fi @@ -8879,53 +8879,7 @@ fi opengl_msg="" if test "x$with_opengl" != "xno" then - for ac_header in GL/gl.h GL/glx.h GL/glu.h GL/osmesa.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "#ifdef HAVE_GL_GLX_H -# include -#endif -" -if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : - cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 -_ACEOF - -fi - -done - - if test "$ac_cv_header_GL_gl_h" = "yes" -a "$ac_cv_header_GL_glx_h" = "yes" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for up-to-date OpenGL version" >&5 -$as_echo_n "checking for up-to-date OpenGL version... " >&6; } -if ${wine_cv_opengl_header_version_OK+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -GLenum test = GL_UNSIGNED_SHORT_5_6_5; return (test == GL_UNSIGNED_SHORT_5_6_5); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - wine_cv_opengl_header_version_OK="yes" -else - wine_cv_opengl_header_version_OK="no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $wine_cv_opengl_header_version_OK" >&5 -$as_echo "$wine_cv_opengl_header_version_OK" >&6; } - - if test "$wine_cv_opengl_header_version_OK" = "yes" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lGL" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lGL" >&5 $as_echo_n "checking for -lGL... " >&6; } if ${ac_cv_lib_soname_GL+:} false; then : $as_echo_n "(cached) " >&6 @@ -9004,12 +8958,12 @@ if test "x$ac_cv_lib_soname_GL" = "x"; then : { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 $as_echo "not found" >&6; } if test -f /usr/X11R6/lib/libGL.a - then - opengl_msg="/usr/X11R6/lib/libGL.a is present on your system. + then + opengl_msg="/usr/X11R6/lib/libGL.a is present on your system. This probably prevents linking to OpenGL. Try deleting the file and restarting configure." - else - opengl_msg="No OpenGL library found on this system." - fi + else + opengl_msg="No OpenGL library found on this system." + fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_GL" >&5 $as_echo "$ac_cv_lib_soname_GL" >&6; } @@ -9019,9 +8973,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lGL" - -$as_echo "#define HAVE_OPENGL 1" >>confdefs.h - fi else { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_GL" >&5 @@ -9032,20 +8983,17 @@ cat >>confdefs.h <<_ACEOF _ACEOF OPENGL_LIBS="-lGL" - -$as_echo "#define HAVE_OPENGL 1" >>confdefs.h - fi - if test "$ac_cv_header_GL_glu_h" = "yes" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lGLU" >&5 -$as_echo_n "checking for -lGLU... " >&6; } -if ${ac_cv_lib_soname_GLU+:} false; then : + if test "x$with_glu" != "xno" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gluLookAt in -lGLU" >&5 +$as_echo_n "checking for gluLookAt in -lGLU... " >&6; } +if ${ac_cv_lib_GLU_gluLookAt+:} false; then : $as_echo_n "(cached) " >&6 else - ac_check_soname_save_LIBS=$LIBS + ac_check_lib_save_LIBS=$LIBS LIBS="-lGLU $OPENGL_LIBS $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ /* Override any GCC internal prototype to avoid an error. @@ -9064,32 +9012,21 @@ return gluLookAt (); } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - case "$LIBEXT" in - dll) ac_cv_lib_soname_GLU=`$ac_cv_path_LDD conftest.exe | grep "GLU" | sed -e "s/dll.*/dll/"';2,$d'` ;; - dylib) ac_cv_lib_soname_GLU=`otool -L conftest$ac_exeext | grep "libGLU\\.[0-9A-Za-z.]*dylib" | sed -e "s/^.*\/\(libGLU\.[0-9A-Za-z.]*dylib\).*$/\1/"';2,$d'` ;; - *) ac_cv_lib_soname_GLU=`$ac_cv_path_LDD conftest$ac_exeext | grep "libGLU\\.$LIBEXT" | sed -e "s/^.*\(libGLU\.$LIBEXT[^ ]*\).*$/\1/"';2,$d'` ;; - esac + ac_cv_lib_GLU_gluLookAt=yes +else + ac_cv_lib_GLU_gluLookAt=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LIBS=$ac_check_soname_save_LIBS +LIBS=$ac_check_lib_save_LIBS fi -if test "x$ac_cv_lib_soname_GLU" = "x"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_soname_GLU" >&5 -$as_echo "$ac_cv_lib_soname_GLU" >&6; } - -cat >>confdefs.h <<_ACEOF -#define SONAME_LIBGLU "$ac_cv_lib_soname_GLU" -_ACEOF - - +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_gluLookAt" >&5 +$as_echo "$ac_cv_lib_GLU_gluLookAt" >&6; } +if test "x$ac_cv_lib_GLU_gluLookAt" = xyes; then : + : fi - fi - if test "x$ac_cv_lib_soname_GLU" = "x"; then : + + if test "x$ac_cv_lib_GLU_gluLookAt" != xyes; then : case "x$with_glu" in x) as_fn_append wine_notices "|libGLU ${notice_platform}development files not found, GLU won't be supported." ;; xno) ;; @@ -9097,10 +9034,11 @@ fi This is an error since --with-glu was requested." "$LINENO" 5 ;; esac fi + fi - if test "$ac_cv_header_GL_osmesa_h" = "yes" - then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lOSMesa" >&5 + if test "x$with_osmesa" != "xno" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -lOSMesa" >&5 $as_echo_n "checking for -lOSMesa... " >&6; } if ${ac_cv_lib_soname_OSMesa+:} false; then : $as_echo_n "(cached) " >&6 @@ -9150,8 +9088,7 @@ _ACEOF fi - fi - if test "x$ac_cv_lib_soname_OSMesa" = "x"; then : + if test "x$ac_cv_lib_soname_OSMesa" = "x"; then : case "x$with_osmesa" in x) as_fn_append wine_notices "|libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported." ;; xno) ;; @@ -9159,17 +9096,7 @@ fi This is an error since --with-osmesa was requested." "$LINENO" 5 ;; esac fi - else - opengl_msg="Old Mesa headers detected. Consider upgrading your Mesa libraries." - fi - else - opengl_msg="OpenGL development headers not found." - fi - test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no} - test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no} - else - enable_opengl32=${enable_opengl32:-no} - enable_glu32=${enable_glu32:-no} + fi fi if test -n "$opengl_msg"; then : case "x$with_opengl" in @@ -9188,8 +9115,6 @@ else X_CFLAGS="" X_LIBS="" enable_winex11_drv=${enable_winex11_drv:-no} - enable_opengl32=${enable_opengl32:-no} - enable_glu32=${enable_glu32:-no} fi if test "x$XLIB" = "x"; then : case "x$with_x" in @@ -9201,6 +9126,8 @@ Use the --without-x option if you really want this." "$LINENO" 5 ;; esac fi +test "x$ac_cv_lib_GLU_gluLookAt" != xyes && enable_glu32=${enable_glu32:-no} + if test "$ac_cv_header_CL_cl_h" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clGetPlatformInfo in -lOpenCL" >&5 diff --git a/configure.ac b/configure.ac index b1e479d222e..6a63e6eef82 100644 --- a/configure.ac +++ b/configure.ac @@ -49,8 +49,7 @@ AC_ARG_WITH(gettext, AS_HELP_STRING([--without-gettext],[do not use gettext])) AC_ARG_WITH(gettextpo, AS_HELP_STRING([--with-gettextpo],[use the GetTextPO library to rebuild po files]), [if test "x$withval" = "xno"; then ac_cv_header_gettext_po_h=no; fi]) AC_ARG_WITH(gphoto, AS_HELP_STRING([--without-gphoto],[do not use gphoto (Digital Camera support)])) -AC_ARG_WITH(glu, AS_HELP_STRING([--without-glu],[do not use the GLU library]), - [if test "x$withval" = "xno"; then ac_cv_header_GL_glu_h=no; fi]) +AC_ARG_WITH(glu, AS_HELP_STRING([--without-glu],[do not use the GLU library])) AC_ARG_WITH(gnutls, AS_HELP_STRING([--without-gnutls],[do not use GnuTLS (schannel support)])) AC_ARG_WITH(gsm, AS_HELP_STRING([--without-gsm],[do not use libgsm (GSM 06.10 codec support)]), [if test "x$withval" = "xno"; then ac_cv_header_gsm_h=no; ac_cv_header_gsm_gsm_h=no; fi]) @@ -69,8 +68,7 @@ AC_ARG_WITH(opencl, AS_HELP_STRING([--without-opencl],[do not use OpenCL]), AC_ARG_WITH(opengl, AS_HELP_STRING([--without-opengl],[do not use OpenGL])) AC_ARG_WITH(openssl, AS_HELP_STRING([--without-openssl],[do not use OpenSSL]), [if test "x$withval" = "xno"; then ac_cv_header_openssl_err_h=no; ac_cv_header_openssl_ssl_h=no; fi]) -AC_ARG_WITH(osmesa, AS_HELP_STRING([--without-osmesa],[do not use the OSMesa library]), - [if test "x$withval" = "xno"; then ac_cv_header_GL_osmesa_h=no; fi]) +AC_ARG_WITH(osmesa, AS_HELP_STRING([--without-osmesa],[do not use the OSMesa library])) AC_ARG_WITH(oss, AS_HELP_STRING([--without-oss],[do not use the OSS sound support])) AC_ARG_WITH(png, AS_HELP_STRING([--without-png],[do not use PNG]), [if test "x$withval" = "xno"; then ac_cv_header_png_h=no; fi]) @@ -1108,60 +1106,32 @@ then opengl_msg="" if test "x$with_opengl" != "xno" then - AC_CHECK_HEADERS(GL/gl.h GL/glx.h GL/glu.h GL/osmesa.h,,, -[#ifdef HAVE_GL_GLX_H -# include -#endif]) - if test "$ac_cv_header_GL_gl_h" = "yes" -a "$ac_cv_header_GL_glx_h" = "yes" - then - dnl Check for some problems due to old Mesa versions - AC_CACHE_CHECK([for up-to-date OpenGL version], wine_cv_opengl_header_version_OK, - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[GLenum test = GL_UNSIGNED_SHORT_5_6_5; return (test == GL_UNSIGNED_SHORT_5_6_5);]])], - [wine_cv_opengl_header_version_OK="yes"], - [wine_cv_opengl_header_version_OK="no"])) - - if test "$wine_cv_opengl_header_version_OK" = "yes" - then - dnl Check for the presence of the library - WINE_CHECK_SONAME(GL,glXCreateContext, - [OPENGL_LIBS="-lGL" - AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])], - [WINE_CHECK_SONAME(GL,glXCreateContext, - [OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lGL" - AC_DEFINE(HAVE_OPENGL, 1, [Define if OpenGL is present on the system])], - [if test -f /usr/X11R6/lib/libGL.a - then - opengl_msg="/usr/X11R6/lib/libGL.a is present on your system. + WINE_CHECK_SONAME(GL,glXCreateContext, + [OPENGL_LIBS="-lGL"], + [WINE_CHECK_SONAME(GL,glXCreateContext, + [OPENGL_LIBS="-Xlinker -dylib_file -Xlinker /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -lGL"], + [if test -f /usr/X11R6/lib/libGL.a + then + opengl_msg="/usr/X11R6/lib/libGL.a is present on your system. This probably prevents linking to OpenGL. Try deleting the file and restarting configure." - else - opengl_msg="No OpenGL library found on this system." - fi], - $X_LIBS $XLIB -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib)], - $X_LIBS $XLIB -lm $X_EXTRA_LIBS) - if test "$ac_cv_header_GL_glu_h" = "yes" - then - WINE_CHECK_SONAME(GLU,gluLookAt,,,[$OPENGL_LIBS $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS]) - fi - WINE_NOTICE_WITH(glu,[test "x$ac_cv_lib_soname_GLU" = "x"], - [libGLU ${notice_platform}development files not found, GLU won't be supported.]) + else + opengl_msg="No OpenGL library found on this system." + fi], + $X_LIBS $XLIB -lm $X_EXTRA_LIBS -dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib)], + $X_LIBS $XLIB -lm $X_EXTRA_LIBS) + if test "x$with_glu" != "xno" + then + AC_CHECK_LIB(GLU,gluLookAt,[:],,[$OPENGL_LIBS $X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS]) + WINE_NOTICE_WITH(glu,[test "x$ac_cv_lib_GLU_gluLookAt" != xyes], + [libGLU ${notice_platform}development files not found, GLU won't be supported.]) + fi - if test "$ac_cv_header_GL_osmesa_h" = "yes" - then - WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS]) - fi - WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"], - [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.]) - else - opengl_msg="Old Mesa headers detected. Consider upgrading your Mesa libraries." - fi - else - opengl_msg="OpenGL development headers not found." - fi - test -n "$opengl_msg" && enable_opengl32=${enable_opengl32:-no} - test "x$ac_cv_lib_soname_GLU" = "x" && enable_glu32=${enable_glu32:-no} - else - enable_opengl32=${enable_opengl32:-no} - enable_glu32=${enable_glu32:-no} + if test "x$with_osmesa" != "xno" + then + WINE_CHECK_SONAME(OSMesa,glAccum,,,[$X_LIBS $X_PRE_LIBS $XLIB -lm $X_EXTRA_LIBS]) + WINE_NOTICE_WITH(osmesa,[test "x$ac_cv_lib_soname_OSMesa" = "x"], + [libOSMesa ${notice_platform}development files not found (or too old), OpenGL rendering in bitmaps won't be supported.]) + fi fi WINE_WARNING_WITH(opengl,[test -n "$opengl_msg"],[$opengl_msg OpenGL and Direct3D won't be supported.]) @@ -1172,13 +1142,13 @@ else X_CFLAGS="" X_LIBS="" enable_winex11_drv=${enable_winex11_drv:-no} - enable_opengl32=${enable_opengl32:-no} - enable_glu32=${enable_glu32:-no} fi WINE_ERROR_WITH(x,[test "x$XLIB" = "x"],[X ${notice_platform}development files not found. Wine will be built without X support, which probably isn't what you want. You will need to install ${notice_platform}development packages of Xlib/Xfree86 at the very least.]) +test "x$ac_cv_lib_GLU_gluLookAt" != xyes && enable_glu32=${enable_glu32:-no} + dnl **** Check for OpenCL **** if test "$ac_cv_header_CL_cl_h" = "yes" then diff --git a/include/config.h.in b/include/config.h.in index 68220527e8c..4b3a5d22930 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -233,18 +233,6 @@ /* Define to 1 if you have the `getuid' function. */ #undef HAVE_GETUID -/* Define to 1 if you have the header file. */ -#undef HAVE_GL_GLU_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_GL_GLX_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_GL_GL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_GL_OSMESA_H - /* Define if we have libgphoto2 development environment */ #undef HAVE_GPHOTO2 @@ -584,9 +572,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_OPENCL_OPENCL_H -/* Define if OpenGL is present on the system */ -#undef HAVE_OPENGL - /* Define to 1 if you have the header file. */ #undef HAVE_OPENSSL_ERR_H @@ -1247,9 +1232,6 @@ /* Define to the soname of the libGL library. */ #undef SONAME_LIBGL -/* Define to the soname of the libGLU library. */ -#undef SONAME_LIBGLU - /* Define to the soname of the libgnutls library. */ #undef SONAME_LIBGNUTLS