diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2010-12-02 11:53:39 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2010-12-02 11:53:39 +0000 |
| commit | 1dba8b0563993f347f315ae45b31ea3b056da3be (patch) | |
| tree | 8d54f5643cb6c9844fe4937d7650359072f32811 | |
| parent | 7056e4cc65141962ee67d7c0cd333ff39dc663b7 (diff) | |
default opengl to on, except on Windows & bin obsolste pam pieces
| -rw-r--r-- | configure.in | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/configure.in b/configure.in index 8652fa681..902365fda 100644 --- a/configure.in +++ b/configure.in @@ -285,9 +285,9 @@ AC_ARG_ENABLE(cairo, ,enable_cairo=yes) AC_ARG_ENABLE(opengl, - AS_HELP_STRING([--enable-opengl], + AS_HELP_STRING([--disable-opengl], [Determines whether to build the OpenGL 3D slide transitions component.]), -,enable_opengl=no) +,enable_opengl=yes) AC_ARG_ENABLE(dbus, AS_HELP_STRING([--enable-dbus], @@ -369,16 +369,6 @@ AC_ARG_ENABLE(rpath, [Disable the use of relative paths in shared libraries.]), ,) -AC_ARG_ENABLE(pam, - AS_HELP_STRING([--disable-pam], - [Disable pam support.]), -,) - -AC_ARG_ENABLE(pam-link, - AS_HELP_STRING([--enable-pam-link], - [Link with libpam instead of dynamically open it.]), -,) - AC_ARG_ENABLE(crypt-link, AS_HELP_STRING([--disable-crypt-link], [Disable linking with libcrypt instead of dynamically open it (needed for @@ -6501,17 +6491,21 @@ AC_MSG_CHECKING([whether to build the OpenGL Transitions component]) ENABLE_OPENGL= if test "x$enable_opengl" != "xno" ; then - save_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -lm" - AC_MSG_RESULT([yes]) - AC_CHECK_HEADER(GL/gl.h, [], - [AC_MSG_ERROR([OpenGL headers not found])], []) - AC_CHECK_LIB(GL, main, [], - [AC_MSG_ERROR(libGL not installed or functional)], []) - AC_CHECK_LIB(GLU, main, [], - [AC_MSG_ERROR(libGLU not installed or functional)], []) - ENABLE_OPENGL=TRUE - LDFLAGS=$save_LDFLAGS + if test "$_os" != "WNT"; then + save_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -lm" + AC_MSG_RESULT([yes]) + AC_CHECK_HEADER(GL/gl.h, [], + [AC_MSG_ERROR([OpenGL headers not found])], []) + AC_CHECK_LIB(GL, main, [], + [AC_MSG_ERROR(libGL not installed or functional)], []) + AC_CHECK_LIB(GLU, main, [], + [AC_MSG_ERROR(libGLU not installed or functional)], []) + ENABLE_OPENGL=TRUE + LDFLAGS=$save_LDFLAGS + else + AC_MSG_RESULT([not on windows]) + fi else AC_MSG_RESULT([no]) fi |