kc3-lang/ftgl

diff --git a/unix/acinclude.m4 b/unix/acinclude.m4
index 6d3a67c..fd6f2ed 100644
--- a/unix/acinclude.m4
+++ b/unix/acinclude.m4
@@ -144,14 +144,63 @@ dnl Check for OpenGL development environment and GLU >= 1.2
 dnl
 AC_DEFUN([FTGL_CHECK_GL],
 [dnl
-AC_CHECK_HEADER([GL/gl.h])
-AC_CHECK_LIB(GL, [glBegin], [],
-    [AC_MSG_NOTICE([GL not found in the compiler's path, looking in the X11 tree])
-     unset ac_cv_lib_GL_glBegin
-     LDFLAGS="-L${x_libraries} $LDFLAGS"
-     AC_CHECK_LIB(GL, [glBegin], [],
-         [AC_MSG_ERROR([libGL is required to compile this library])])
-    ])
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PATH_X])
+AC_REQUIRE([AC_PATH_XTRA])
+
+AC_ARG_WITH([--with-gl-inc],
+    AC_HELP_STRING([--with-gl-inc=DIR],[Directory where GL/gl.h is installed]))
+AC_ARG_WITH([--with-gl-lib],
+    AC_HELP_STRING([--with-gl-lib=DIR],[Directory where OpenGL libraries are installed]))
+
+AC_LANG_SAVE
+AC_LANG_C
+
+GL_SAVE_CPPFLAGS="$CPPFLAGS"
+GL_SAVE_LIBS="$LIBS"
+
+if test "x$no_x" != xyes ; then
+    GL_CFLAGS="$X_CFLAGS"
+    GL_X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu $X_EXTRA_LIBS"
+fi
+
+if test "x$with_gl_inc" != "xnone" ; then
+    if test -d "$with_gl_inc" ; then
+        GL_CFLAGS="-I$with_gl_inc"
+    else
+        GL_CFLAGS="$with_gl_inc"
+    fi
+else
+    GL_CFLAGS=
+fi
+
+CPPFLAGS="$GL_CFLAGS"
+AC_CHECK_HEADER([GL/gl.h], [], [AC_MSG_ERROR(GL/gl.h is needed, please specify its location with --with-gl-inc.  If this still fails, please contact mmagallo@debian.org, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind.)])
+
+AC_MSG_CHECKING([for GL library])
+if test "x$with_gl_lib" != "x" ; then
+    if test -d "$with_gl_lib" ; then
+        LIBS="-L$with_gl_lib -lGL"
+    else
+        LIBS="$with_gl_lib"
+    fi
+else
+    LIBS="-lGL"
+fi
+AC_LINK_IFELSE([AC_LANG_CALL([],[glBegin])],[HAVE_GL=yes], [HAVE_GL=no])
+if test "x$HAVE_GL" = xno ; then
+    if test "x$GL_X_LIBS" != x ; then
+        LIBS="-lGL $GL_X_LIBS"
+        AC_LINK_IFELSE([AC_LANG_CALL([],[glBegin])],[HAVE_GL=yes], [HAVE_GL=no])
+    fi
+fi
+if test "x$HAVE_GL" = xyes ; then
+    AC_MSG_RESULT([yes])
+    GL_LIBS=$LIBS
+else
+    AC_MSG_RESULT([no])
+    AC_MSG_ERROR([GL library could not be found, please specify its location with --with-gl-lib.  If this still fails, please contact mmagallo@debian.org, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind.])
+fi
 
 AC_CHECK_HEADER([GL/glu.h])
 AC_MSG_CHECKING([for GLU version >= 1.2])
@@ -164,31 +213,129 @@ AC_TRY_COMPILE([#include <GL/glu.h>], [
                [AC_MSG_RESULT([no])
                 AC_MSG_ERROR([GLU >= 1.2 is needed to compile this library])
                ])
-AC_CHECK_LIB(GLU, [gluNewTess],
-             [], [AC_MSG_ERROR([libGLU is required to compile this library])])
+
+AC_MSG_CHECKING([for GLU library])
+LIBS="-lGLU $GL_LIBS"
+AC_LINK_IFELSE([AC_LANG_CALL([],[gluNewTess])],[HAVE_GLU=yes], [HAVE_GLU=no])
+if test "x$HAVE_GLU" = xno ; then
+    if test "x$GL_X_LIBS" != x ; then
+        LIBS="-lGLU $GL_LIBS $GL_X_LIBS"
+        AC_LINK_IFELSE([AC_LANG_CALL([],[gluNewTess])],[HAVE_GLU=yes], [HAVE_GLU=no])
+    fi
+fi
+if test "x$HAVE_GLU" = xyes ; then
+    AC_MSG_RESULT([yes])
+    GL_LIBS="$LIBS"
+else
+    AC_MSG_RESULT([no])
+    AC_MSG_ERROR([GLU library could not be found, please specify its location with --with-gl-lib.  If this still fails, please contact mmagallo@debian.org, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind.])
+fi
+
+AC_SUBST(GL_CFLAGS)
+AC_SUBST(GL_LIBS)
+
+CPPFLAGS="$GL_SAVE_CPPFLAGS"
+LIBS="$GL_SAVE_LIBS"
+AC_LANG_RESTORE
+GL_X_LIBS=""
 ])
 dnl FTGL_CHECK_GLUT()
 dnl Check for GLUT development environment
 dnl
 AC_DEFUN([FTGL_CHECK_GLUT],
 [dnl
-AC_CHECK_HEADER([GL/glut.h])
-AC_CHECK_LIB(glut, [glutInit],
-             [LIBGLUT=-lglut],
-             [])
-
-# Work-arround for broken dynamic linkers and/or systems with non-broken
-# linkers but suffering from PEBKAC.  The list of libraries is a bit
-# over-generous, AFAIK -lXi is needed only on (some versions of?) SuSE
-
-if test -z "${LIBGLUT}" ; then
-    echo "Couldn't find GLUT, trying again with extra linker flags"
-    unset ac_cv_lib_glut_glutInit
-    AC_CHECK_LIB(glut, [glutInit],
-                [LIBGLUT=-lglut],
-                AC_MSG_ERROR([libglut is required to compile this library]),
-                [-lX11 -lXmu -lXi -lm])
-    LIBGLUT="$LIBGLUT -lX11 -lXmu -lXi -lm"
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PATH_X])dnl
+AC_REQUIRE([AC_PATH_XTRA])dnl
+AC_REQUIRE([FTGL_CHECK_GL])dnl
+
+AC_ARG_WITH([--with-glut-inc],
+    AC_HELP_STRING([--with-glut-inc=DIR],[Directory where GL/glut.h is installed (optional)]))
+AC_ARG_WITH([--with-glut-lib],
+    AC_HELP_STRING([--with-glut-lib=DIR],[Directory where GLUT libraries are installed (optional)]))
+
+AC_LANG_SAVE
+AC_LANG_C
+
+GLUT_SAVE_CPPFLAGS="$CPPFLAGS"
+GLUT_SAVE_LIBS="$LIBS"
+
+if test "x$no_x" != xyes ; then
+    GLUT_CFLAGS="$X_CFLAGS"
+    GLUT_X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu $X_EXTRA_LIBS"
+fi
+
+if test "x$with_glut_inc" != "xnone" ; then
+    if test -d "$with_glut_inc" ; then
+        GLUT_CFLAGS="-I$with_glut_inc"
+    else
+        GLUT_CFLAGS="$with_glut_inc"
+    fi
+else
+    GLUT_CFLAGS=
 fi
-AC_SUBST(LIBGLUT)
+
+CPPFLAGS="$GLUT_CFLAGS"
+AC_CHECK_HEADER([GL/glut.h], [HAVE_GLUT=yes], [HAVE_GLUT=no])
+
+if test "x$HAVE_GLUT" = xno ; then
+    AC_MSG_WARN([GLUT headers not availabe, example program won't be compiled.])
+else
+
+# Check for GLUT libraries
+
+    AC_MSG_CHECKING([for GLUT library])
+    if test "x$with_glut_lib" != "x" ; then
+        if test -d "$with_glut_lib" ; then
+            LIBS="-L$with_glut_lib -lglut"
+        else
+            LIBS="$with_glut_lib"
+        fi
+    else
+        LIBS="-lglut"
+    fi
+    AC_LINK_IFELSE(
+        [AC_LANG_CALL([],[glutInit])],
+        [HAVE_GLUT=yes],
+        [HAVE_GLUT=no])
+
+    if test "x$HAVE_GLUT" = xno ; then
+        # Try again with the GL libs
+        LIBS="-lglut $GL_LIBS"
+        AC_LINK_IFELSE(
+            [AC_LANG_CALL([],[glutInit])],
+            [HAVE_GLUT=yes],
+            [HAVE_GLUT=no])
+    fi
+
+    if test "x$HAVE_GLUT" = xno && test "x$GLUT_X_LIBS" != x ; then
+        # Try again with the GL and X11 libs
+        LIBS="-lglut $GL_LIBS $GLUT_X_LIBS"
+        AC_LINK_IFELSE(
+            [AC_LANG_CALL([],[glutInit])],
+            [HAVE_GLUT=yes],
+            [HAVE_GLUT=no])
+    fi
+
+    if test "x$HAVE_GLUT" = xyes ; then
+        AC_MSG_RESULT([yes])
+        GLUT_LIBS=$LIBS
+    else
+        AC_MSG_RESULT([no])
+        AC_MSG_WARN([GLUT libraries not availabe, example program won't be compiled.])
+    fi
+
+# End check for GLUT libraries
+
+fi
+
+AC_SUBST(HAVE_GLUT)
+AC_SUBST(GLUT_CFLAGS)
+AC_SUBST(GLUT_LIBS)
+AC_LANG_RESTORE
+
+CPPFLAGS="$GLUT_SAVE_CPPFLAGS"
+LIBS="$GLUT_SAVE_LIBS"
+GLUT_X_CFLAGS=
+GLUT_X_LIBS=
 ])
diff --git a/unix/aclocal.m4 b/unix/aclocal.m4
index 5be7bff..8a66b64 100644
--- a/unix/aclocal.m4
+++ b/unix/aclocal.m4
@@ -156,14 +156,63 @@ dnl Check for OpenGL development environment and GLU >= 1.2
 dnl
 AC_DEFUN([FTGL_CHECK_GL],
 [dnl
-AC_CHECK_HEADER([GL/gl.h])
-AC_CHECK_LIB(GL, [glBegin], [],
-    [AC_MSG_NOTICE([GL not found in the compiler's path, looking in the X11 tree])
-     unset ac_cv_lib_GL_glBegin
-     LDFLAGS="-L${x_libraries} $LDFLAGS"
-     AC_CHECK_LIB(GL, [glBegin], [],
-         [AC_MSG_ERROR([libGL is required to compile this library])])
-    ])
+AC_REQUIRE([AC_PROG_CC])
+AC_REQUIRE([AC_PATH_X])
+AC_REQUIRE([AC_PATH_XTRA])
+
+AC_ARG_WITH([--with-gl-inc],
+    AC_HELP_STRING([--with-gl-inc=DIR],[Directory where GL/gl.h is installed]))
+AC_ARG_WITH([--with-gl-lib],
+    AC_HELP_STRING([--with-gl-lib=DIR],[Directory where OpenGL libraries are installed]))
+
+AC_LANG_SAVE
+AC_LANG_C
+
+GL_SAVE_CPPFLAGS="$CPPFLAGS"
+GL_SAVE_LIBS="$LIBS"
+
+if test "x$no_x" != xyes ; then
+    GL_CFLAGS="$X_CFLAGS"
+    GL_X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu $X_EXTRA_LIBS"
+fi
+
+if test "x$with_gl_inc" != "xnone" ; then
+    if test -d "$with_gl_inc" ; then
+        GL_CFLAGS="-I$with_gl_inc"
+    else
+        GL_CFLAGS="$with_gl_inc"
+    fi
+else
+    GL_CFLAGS=
+fi
+
+CPPFLAGS="$GL_CFLAGS"
+AC_CHECK_HEADER([GL/gl.h], [], [AC_MSG_ERROR(GL/gl.h is needed, please specify its location with --with-gl-inc.  If this still fails, please contact mmagallo@debian.org, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind.)])
+
+AC_MSG_CHECKING([for GL library])
+if test "x$with_gl_lib" != "x" ; then
+    if test -d "$with_gl_lib" ; then
+        LIBS="-L$with_gl_lib -lGL"
+    else
+        LIBS="$with_gl_lib"
+    fi
+else
+    LIBS="-lGL"
+fi
+AC_LINK_IFELSE([AC_LANG_CALL([],[glBegin])],[HAVE_GL=yes], [HAVE_GL=no])
+if test "x$HAVE_GL" = xno ; then
+    if test "x$GL_X_LIBS" != x ; then
+        LIBS="-lGL $GL_X_LIBS"
+        AC_LINK_IFELSE([AC_LANG_CALL([],[glBegin])],[HAVE_GL=yes], [HAVE_GL=no])
+    fi
+fi
+if test "x$HAVE_GL" = xyes ; then
+    AC_MSG_RESULT([yes])
+    GL_LIBS=$LIBS
+else
+    AC_MSG_RESULT([no])
+    AC_MSG_ERROR([GL library could not be found, please specify its location with --with-gl-lib.  If this still fails, please contact mmagallo@debian.org, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind.])
+fi
 
 AC_CHECK_HEADER([GL/glu.h])
 AC_MSG_CHECKING([for GLU version >= 1.2])
@@ -176,33 +225,131 @@ AC_TRY_COMPILE([#include <GL/glu.h>], [
                [AC_MSG_RESULT([no])
                 AC_MSG_ERROR([GLU >= 1.2 is needed to compile this library])
                ])
-AC_CHECK_LIB(GLU, [gluNewTess],
-             [], [AC_MSG_ERROR([libGLU is required to compile this library])])
+
+AC_MSG_CHECKING([for GLU library])
+LIBS="-lGLU $GL_LIBS"
+AC_LINK_IFELSE([AC_LANG_CALL([],[gluNewTess])],[HAVE_GLU=yes], [HAVE_GLU=no])
+if test "x$HAVE_GLU" = xno ; then
+    if test "x$GL_X_LIBS" != x ; then
+        LIBS="-lGLU $GL_LIBS $GL_X_LIBS"
+        AC_LINK_IFELSE([AC_LANG_CALL([],[gluNewTess])],[HAVE_GLU=yes], [HAVE_GLU=no])
+    fi
+fi
+if test "x$HAVE_GLU" = xyes ; then
+    AC_MSG_RESULT([yes])
+    GL_LIBS="$LIBS"
+else
+    AC_MSG_RESULT([no])
+    AC_MSG_ERROR([GLU library could not be found, please specify its location with --with-gl-lib.  If this still fails, please contact mmagallo@debian.org, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind.])
+fi
+
+AC_SUBST(GL_CFLAGS)
+AC_SUBST(GL_LIBS)
+
+CPPFLAGS="$GL_SAVE_CPPFLAGS"
+LIBS="$GL_SAVE_LIBS"
+AC_LANG_RESTORE
+GL_X_LIBS=""
 ])
 dnl FTGL_CHECK_GLUT()
 dnl Check for GLUT development environment
 dnl
 AC_DEFUN([FTGL_CHECK_GLUT],
 [dnl
-AC_CHECK_HEADER([GL/glut.h])
-AC_CHECK_LIB(glut, [glutInit],
-             [LIBGLUT=-lglut],
-             [])
-
-# Work-arround for broken dynamic linkers and/or systems with non-broken
-# linkers but suffering from PEBKAC.  The list of libraries is a bit
-# over-generous, AFAIK -lXi is needed only on (some versions of?) SuSE
-
-if test -z "${LIBGLUT}" ; then
-    echo "Couldn't find GLUT, trying again with extra linker flags"
-    unset ac_cv_lib_glut_glutInit
-    AC_CHECK_LIB(glut, [glutInit],
-                [LIBGLUT=-lglut],
-                AC_MSG_ERROR([libglut is required to compile this library]),
-                [-lX11 -lXmu -lXi -lm])
-    LIBGLUT="$LIBGLUT -lX11 -lXmu -lXi -lm"
+AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PATH_X])dnl
+AC_REQUIRE([AC_PATH_XTRA])dnl
+AC_REQUIRE([FTGL_CHECK_GL])dnl
+
+AC_ARG_WITH([--with-glut-inc],
+    AC_HELP_STRING([--with-glut-inc=DIR],[Directory where GL/glut.h is installed (optional)]))
+AC_ARG_WITH([--with-glut-lib],
+    AC_HELP_STRING([--with-glut-lib=DIR],[Directory where GLUT libraries are installed (optional)]))
+
+AC_LANG_SAVE
+AC_LANG_C
+
+GLUT_SAVE_CPPFLAGS="$CPPFLAGS"
+GLUT_SAVE_LIBS="$LIBS"
+
+if test "x$no_x" != xyes ; then
+    GLUT_CFLAGS="$X_CFLAGS"
+    GLUT_X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu $X_EXTRA_LIBS"
+fi
+
+if test "x$with_glut_inc" != "xnone" ; then
+    if test -d "$with_glut_inc" ; then
+        GLUT_CFLAGS="-I$with_glut_inc"
+    else
+        GLUT_CFLAGS="$with_glut_inc"
+    fi
+else
+    GLUT_CFLAGS=
+fi
+
+CPPFLAGS="$GLUT_CFLAGS"
+AC_CHECK_HEADER([GL/glut.h], [HAVE_GLUT=yes], [HAVE_GLUT=no])
+
+if test "x$HAVE_GLUT" = xno ; then
+    AC_MSG_WARN([GLUT headers not availabe, example program won't be compiled.])
+else
+
+# Check for GLUT libraries
+
+    AC_MSG_CHECKING([for GLUT library])
+    if test "x$with_glut_lib" != "x" ; then
+        if test -d "$with_glut_lib" ; then
+            LIBS="-L$with_glut_lib -lglut"
+        else
+            LIBS="$with_glut_lib"
+        fi
+    else
+        LIBS="-lglut"
+    fi
+    AC_LINK_IFELSE(
+        [AC_LANG_CALL([],[glutInit])],
+        [HAVE_GLUT=yes],
+        [HAVE_GLUT=no])
+
+    if test "x$HAVE_GLUT" = xno ; then
+        # Try again with the GL libs
+        LIBS="-lglut $GL_LIBS"
+        AC_LINK_IFELSE(
+            [AC_LANG_CALL([],[glutInit])],
+            [HAVE_GLUT=yes],
+            [HAVE_GLUT=no])
+    fi
+
+    if test "x$HAVE_GLUT" = xno && test "x$GLUT_X_LIBS" != x ; then
+        # Try again with the GL and X11 libs
+        LIBS="-lglut $GL_LIBS $GLUT_X_LIBS"
+        AC_LINK_IFELSE(
+            [AC_LANG_CALL([],[glutInit])],
+            [HAVE_GLUT=yes],
+            [HAVE_GLUT=no])
+    fi
+
+    if test "x$HAVE_GLUT" = xyes ; then
+        AC_MSG_RESULT([yes])
+        GLUT_LIBS=$LIBS
+    else
+        AC_MSG_RESULT([no])
+        AC_MSG_WARN([GLUT libraries not availabe, example program won't be compiled.])
+    fi
+
+# End check for GLUT libraries
+
 fi
-AC_SUBST(LIBGLUT)
+
+AC_SUBST(HAVE_GLUT)
+AC_SUBST(GLUT_CFLAGS)
+AC_SUBST(GLUT_LIBS)
+AC_LANG_RESTORE
+
+CPPFLAGS="$GLUT_SAVE_CPPFLAGS"
+LIBS="$GLUT_SAVE_LIBS"
+GLUT_X_CFLAGS=
+GLUT_X_LIBS=
 ])
 
 # libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
diff --git a/unix/configure b/unix/configure
index 1d8fc6a..6802112 100755
--- a/unix/configure
+++ b/unix/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.57 for ftgl 1.4.
+# Generated by GNU Autoconf 2.57 for ftgl 2.0.5.
 #
 # Report bugs to <henryj@paradise.net.nz>.
 #
@@ -427,8 +427,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
 # Identity of this package.
 PACKAGE_NAME='ftgl'
 PACKAGE_TARNAME='ftgl'
-PACKAGE_VERSION='1.4'
-PACKAGE_STRING='ftgl 1.4'
+PACKAGE_VERSION='2.0.5'
+PACKAGE_STRING='ftgl 2.0.5'
 PACKAGE_BUGREPORT='henryj@paradise.net.nz'
 
 ac_unique_file="Make.conf.in"
@@ -469,7 +469,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL FT2_CONFIG FT2_CFLAGS FT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBGLUT INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA DOXYGEN LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os CXX CXXFLAGS LDFLAGS CPPFLAGS ac_ct_CXX EXEEXT OBJEXT CC CFLAGS ac_ct_CC LN_S ECHO RANLIB ac_ct_RANLIB STRIP ac_ct_STRIP CPP EGREP LIBTOOL FT2_CONFIG FT2_CFLAGS FT2_LIBS X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GL_CFLAGS GL_LIBS HAVE_GLUT GLUT_CFLAGS GLUT_LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA DOXYGEN LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -946,7 +946,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ftgl 1.4 to adapt to many kinds of systems.
+\`configure' configures ftgl 2.0.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1011,7 +1011,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ftgl 1.4:";;
+     short | recursive ) echo "Configuration of ftgl 2.0.5:";;
    esac
   cat <<\_ACEOF
 
@@ -1032,6 +1032,11 @@ Optional Packages:
   --with-x                use the X Window System
   --with-ft-prefix=PFX      Prefix where FreeType is installed (optional)
   --with-ft-exec-prefix=PFX Exec prefix where FreeType is installed (optional)
+  --with-gl-inc=DIR       Directory where GL/gl.h is installed
+  --with-gl-lib=DIR       Directory where OpenGL libraries are installed
+  --with-glut-inc=DIR     Directory where GL/glut.h is installed (optional)
+  --with-glut-lib=DIR     Directory where GLUT libraries are installed
+                          (optional)
 
 Some influential environment variables:
   CXX         C++ compiler command
@@ -1110,7 +1115,7 @@ fi
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-ftgl configure 1.4
+ftgl configure 2.0.5
 generated by GNU Autoconf 2.57
 
 Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -1125,7 +1130,7 @@ cat >&5 <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ftgl $as_me 1.4, which was
+It was created by ftgl $as_me 2.0.5, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   $ $0 $@
@@ -4401,7 +4406,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4404 "configure"' > conftest.$ac_ext
+  echo '#line 4409 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4930,7 +4935,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4933: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4938: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -6775,7 +6780,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6778 "configure"
+#line 6783 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6873,7 +6878,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6876 "configure"
+#line 6881 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -9291,6 +9296,51 @@ fi
 fi
 
 
+
+
+
+
+
+# Check whether --with---with-gl-inc or --without---with-gl-inc was given.
+if test "${with___with_gl_inc+set}" = set; then
+  withval="$with___with_gl_inc"
+
+fi;
+
+# Check whether --with---with-gl-lib or --without---with-gl-lib was given.
+if test "${with___with_gl_lib+set}" = set; then
+  withval="$with___with_gl_lib"
+
+fi;
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+GL_SAVE_CPPFLAGS="$CPPFLAGS"
+GL_SAVE_LIBS="$LIBS"
+
+if test "x$no_x" != xyes ; then
+    GL_CFLAGS="$X_CFLAGS"
+    GL_X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu $X_EXTRA_LIBS"
+fi
+
+if test "x$with_gl_inc" != "xnone" ; then
+    if test -d "$with_gl_inc" ; then
+        GL_CFLAGS="-I$with_gl_inc"
+    else
+        GL_CFLAGS="$with_gl_inc"
+    fi
+else
+    GL_CFLAGS=
+fi
+
+CPPFLAGS="$GL_CFLAGS"
 if test "${ac_cv_header_GL_gl_h+set}" = set; then
   echo "$as_me:$LINENO: checking for GL/gl.h" >&5
 echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6
@@ -9420,16 +9470,27 @@ echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5
 echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6
 
 fi
+if test $ac_cv_header_GL_gl_h = yes; then
+  :
+else
+  { { echo "$as_me:$LINENO: error: GL/gl.h is needed" >&5
+echo "$as_me: error: GL/gl.h is needed" >&2;}
+   { (exit please specify its location with --with-gl-inc.  If this still fails); exit please specify its location with --with-gl-inc.  If this still fails; }; }
+fi
 
 
 
-echo "$as_me:$LINENO: checking for glBegin in -lGL" >&5
-echo $ECHO_N "checking for glBegin in -lGL... $ECHO_C" >&6
-if test "${ac_cv_lib_GL_glBegin+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for GL library" >&5
+echo $ECHO_N "checking for GL library... $ECHO_C" >&6
+if test "x$with_gl_lib" != "x" ; then
+    if test -d "$with_gl_lib" ; then
+        LIBS="-L$with_gl_lib -lGL"
+    else
+        LIBS="$with_gl_lib"
+    fi
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGL  $LIBS"
+    LIBS="-lGL"
+fi
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -9465,39 +9526,18 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_GL_glBegin=yes
+  HAVE_GL=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_GL_glBegin=no
+HAVE_GL=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glBegin" >&5
-echo "${ECHO_T}$ac_cv_lib_GL_glBegin" >&6
-if test $ac_cv_lib_GL_glBegin = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGL 1
-_ACEOF
-
-  LIBS="-lGL $LIBS"
-
-else
-  { echo "$as_me:$LINENO: GL not found in the compiler's path, looking in the X11 tree" >&5
-echo "$as_me: GL not found in the compiler's path, looking in the X11 tree" >&6;}
-     unset ac_cv_lib_GL_glBegin
-     LDFLAGS="-L${x_libraries} $LDFLAGS"
-
-echo "$as_me:$LINENO: checking for glBegin in -lGL" >&5
-echo $ECHO_N "checking for glBegin in -lGL... $ECHO_C" >&6
-if test "${ac_cv_lib_GL_glBegin+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGL  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+if test "x$HAVE_GL" = xno ; then
+    if test "x$GL_X_LIBS" != x ; then
+        LIBS="-lGL $GL_X_LIBS"
+        cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
@@ -9532,35 +9572,28 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_GL_glBegin=yes
+  HAVE_GL=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_GL_glBegin=no
+HAVE_GL=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
+    fi
 fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_GL_glBegin" >&5
-echo "${ECHO_T}$ac_cv_lib_GL_glBegin" >&6
-if test $ac_cv_lib_GL_glBegin = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGL 1
-_ACEOF
-
-  LIBS="-lGL $LIBS"
-
+if test "x$HAVE_GL" = xyes ; then
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+    GL_LIBS=$LIBS
 else
-  { { echo "$as_me:$LINENO: error: libGL is required to compile this library" >&5
-echo "$as_me: error: libGL is required to compile this library" >&2;}
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    { { echo "$as_me:$LINENO: error: GL library could not be found, please specify its location with --with-gl-lib.  If this still fails, please contact mmagallo@debian.org, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind." >&5
+echo "$as_me: error: GL library could not be found, please specify its location with --with-gl-lib.  If this still fails, please contact mmagallo@debian.org, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-
-fi
-
-
 if test "${ac_cv_header_GL_glu_h+set}" = set; then
   echo "$as_me:$LINENO: checking for GL/glu.h" >&5
 echo $ECHO_N "checking for GL/glu.h... $ECHO_C" >&6
@@ -9741,13 +9774,9 @@ echo "$as_me: error: GLU >= 1.2 is needed to compile this library" >&2;}
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
-echo "$as_me:$LINENO: checking for gluNewTess in -lGLU" >&5
-echo $ECHO_N "checking for gluNewTess in -lGLU... $ECHO_C" >&6
-if test "${ac_cv_lib_GLU_gluNewTess+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lGLU  $LIBS"
+echo "$as_me:$LINENO: checking for GLU library" >&5
+echo $ECHO_N "checking for GLU library... $ECHO_C" >&6
+LIBS="-lGLU $GL_LIBS"
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
@@ -9783,32 +9812,129 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_GLU_gluNewTess=yes
+  HAVE_GLU=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_GLU_gluNewTess=no
+HAVE_GLU=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_gluNewTess" >&5
-echo "${ECHO_T}$ac_cv_lib_GLU_gluNewTess" >&6
-if test $ac_cv_lib_GLU_gluNewTess = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBGLU 1
+if test "x$HAVE_GLU" = xno ; then
+    if test "x$GL_X_LIBS" != x ; then
+        LIBS="-lGLU $GL_LIBS $GL_X_LIBS"
+        cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
 _ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
 
-  LIBS="-lGLU $LIBS"
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char gluNewTess ();
+int
+main ()
+{
+gluNewTess ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  HAVE_GLU=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
 
+HAVE_GLU=no
+fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+    fi
+fi
+if test "x$HAVE_GLU" = xyes ; then
+    echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+    GL_LIBS="$LIBS"
 else
-  { { echo "$as_me:$LINENO: error: libGLU is required to compile this library" >&5
-echo "$as_me: error: libGLU is required to compile this library" >&2;}
+    echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+    { { echo "$as_me:$LINENO: error: GLU library could not be found, please specify its location with --with-gl-lib.  If this still fails, please contact mmagallo@debian.org, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind." >&5
+echo "$as_me: error: GLU library could not be found, please specify its location with --with-gl-lib.  If this still fails, please contact mmagallo@debian.org, include the string FTGL somewhere in the subject line and provide a copy of the config.log file that was left behind." >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 
+
+
+CPPFLAGS="$GL_SAVE_CPPFLAGS"
+LIBS="$GL_SAVE_LIBS"
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+GL_X_LIBS=""
+
+
+
+# Check whether --with---with-glut-inc or --without---with-glut-inc was given.
+if test "${with___with_glut_inc+set}" = set; then
+  withval="$with___with_glut_inc"
+
+fi;
+
+# Check whether --with---with-glut-lib or --without---with-glut-lib was given.
+if test "${with___with_glut_lib+set}" = set; then
+  withval="$with___with_glut_lib"
+
+fi;
+
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+GLUT_SAVE_CPPFLAGS="$CPPFLAGS"
+GLUT_SAVE_LIBS="$LIBS"
+
+if test "x$no_x" != xyes ; then
+    GLUT_CFLAGS="$X_CFLAGS"
+    GLUT_X_LIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu $X_EXTRA_LIBS"
+fi
+
+if test "x$with_glut_inc" != "xnone" ; then
+    if test -d "$with_glut_inc" ; then
+        GLUT_CFLAGS="-I$with_glut_inc"
+    else
+        GLUT_CFLAGS="$with_glut_inc"
+    fi
+else
+    GLUT_CFLAGS=
+fi
+
+CPPFLAGS="$GLUT_CFLAGS"
 if test "${ac_cv_header_GL_glut_h+set}" = set; then
   echo "$as_me:$LINENO: checking for GL/glut.h" >&5
 echo $ECHO_N "checking for GL/glut.h... $ECHO_C" >&6
@@ -9938,16 +10064,33 @@ echo "$as_me:$LINENO: result: $ac_cv_header_GL_glut_h" >&5
 echo "${ECHO_T}$ac_cv_header_GL_glut_h" >&6
 
 fi
+if test $ac_cv_header_GL_glut_h = yes; then
+  HAVE_GLUT=yes
+else
+  HAVE_GLUT=no
+fi
 
 
-echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
-echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
-if test "${ac_cv_lib_glut_glutInit+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
+
+if test "x$HAVE_GLUT" = xno ; then
+    { echo "$as_me:$LINENO: WARNING: GLUT headers not availabe, example program won't be compiled." >&5
+echo "$as_me: WARNING: GLUT headers not availabe, example program won't be compiled." >&2;}
 else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lglut  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+
+# Check for GLUT libraries
+
+    echo "$as_me:$LINENO: checking for GLUT library" >&5
+echo $ECHO_N "checking for GLUT library... $ECHO_C" >&6
+    if test "x$with_glut_lib" != "x" ; then
+        if test -d "$with_glut_lib" ; then
+            LIBS="-L$with_glut_lib -lglut"
+        else
+            LIBS="$with_glut_lib"
+        fi
+    else
+        LIBS="-lglut"
+    fi
+    cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
@@ -9982,38 +10125,19 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_glut_glutInit=yes
+  HAVE_GLUT=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_glut_glutInit=no
+HAVE_GLUT=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_glut_glutInit" >&5
-echo "${ECHO_T}$ac_cv_lib_glut_glutInit" >&6
-if test $ac_cv_lib_glut_glutInit = yes; then
-  LIBGLUT=-lglut
-fi
-
 
-# Work-arround for broken dynamic linkers and/or systems with non-broken
-# linkers but suffering from PEBKAC.  The list of libraries is a bit
-# over-generous, AFAIK -lXi is needed only on (some versions of?) SuSE
-
-if test -z "${LIBGLUT}" ; then
-    echo "Couldn't find GLUT, trying again with extra linker flags"
-    unset ac_cv_lib_glut_glutInit
-    echo "$as_me:$LINENO: checking for glutInit in -lglut" >&5
-echo $ECHO_N "checking for glutInit in -lglut... $ECHO_C" >&6
-if test "${ac_cv_lib_glut_glutInit+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lglut -lX11 -lXmu -lXi -lm $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
+    if test "x$HAVE_GLUT" = xno ; then
+        # Try again with the GL libs
+        LIBS="-lglut $GL_LIBS"
+        cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 /* confdefs.h.  */
 _ACEOF
@@ -10048,31 +10172,95 @@ if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
   ac_status=$?
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  ac_cv_lib_glut_glutInit=yes
+  HAVE_GLUT=yes
 else
   echo "$as_me: failed program was:" >&5
 sed 's/^/| /' conftest.$ac_ext >&5
 
-ac_cv_lib_glut_glutInit=no
+HAVE_GLUT=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_glut_glutInit" >&5
-echo "${ECHO_T}$ac_cv_lib_glut_glutInit" >&6
-if test $ac_cv_lib_glut_glutInit = yes; then
-  LIBGLUT=-lglut
+    fi
+
+    if test "x$HAVE_GLUT" = xno && test "x$GLUT_X_LIBS" != x ; then
+        # Try again with the GL and X11 libs
+        LIBS="-lglut $GL_LIBS $GLUT_X_LIBS"
+        cat >conftest.$ac_ext <<_ACEOF
+#line $LINENO "configure"
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char glutInit ();
+int
+main ()
+{
+glutInit ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  HAVE_GLUT=yes
 else
-  { { echo "$as_me:$LINENO: error: libglut is required to compile this library" >&5
-echo "$as_me: error: libglut is required to compile this library" >&2;}
-   { (exit 1); exit 1; }; }
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+HAVE_GLUT=no
 fi
+rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+    fi
+
+    if test "x$HAVE_GLUT" = xyes ; then
+        echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+        GLUT_LIBS=$LIBS
+    else
+        echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+        { echo "$as_me:$LINENO: WARNING: GLUT libraries not availabe, example program won't be compiled." >&5
+echo "$as_me: WARNING: GLUT libraries not availabe, example program won't be compiled." >&2;}
+    fi
+
+# End check for GLUT libraries
 
-    LIBGLUT="$LIBGLUT -lX11 -lXmu -lXi -lm"
 fi
 
 
 
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+CPPFLAGS="$GLUT_SAVE_CPPFLAGS"
+LIBS="$GLUT_SAVE_LIBS"
+GLUT_X_CFLAGS=
+GLUT_X_LIBS=
+
+
 # Checks for library functions
 
 
@@ -10672,7 +10860,7 @@ _ASBOX
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by ftgl $as_me 1.4, which was
+This file was extended by ftgl $as_me 2.0.5, which was
 generated by GNU Autoconf 2.57.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -10727,7 +10915,7 @@ _ACEOF
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-ftgl config.status 1.4
+ftgl config.status 2.0.5
 configured by $0, generated by GNU Autoconf 2.57,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -10950,7 +11138,11 @@ s,@X_CFLAGS@,$X_CFLAGS,;t t
 s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
 s,@X_LIBS@,$X_LIBS,;t t
 s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
-s,@LIBGLUT@,$LIBGLUT,;t t
+s,@GL_CFLAGS@,$GL_CFLAGS,;t t
+s,@GL_LIBS@,$GL_LIBS,;t t
+s,@HAVE_GLUT@,$HAVE_GLUT,;t t
+s,@GLUT_CFLAGS@,$GLUT_CFLAGS,;t t
+s,@GLUT_LIBS@,$GLUT_LIBS,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t