diff options
-rw-r--r-- | m4/ax_check_gl.m4 | 12 | ||||
-rw-r--r-- | m4/ax_check_glu.m4 | 14 | ||||
-rw-r--r-- | m4/ax_check_glut.m4 | 6 |
3 files changed, 16 insertions, 16 deletions
diff --git a/m4/ax_check_gl.m4 b/m4/ax_check_gl.m4 index c854c5a..e59b012 100644 --- a/m4/ax_check_gl.m4 +++ b/m4/ax_check_gl.m4 @@ -85,7 +85,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 18 +#serial 19 # example gl program m4_define([_AX_CHECK_GL_PROGRAM], @@ -131,7 +131,7 @@ AC_DEFUN([_AX_CHECK_GL_SAVE_FLAGS], [ ]) # _AX_CHECK_GL_RESTORE_FLAGS(LIST-OF-FLAGS) -# Use this marcro to restore the flags you saved using +# Use this marcro to restore the flags you saved using # _AX_CHECK_GL_SAVE_FLAGS # # Example: _AX_CHECK_GL_RESTORE_FLAGS([[CFLAGS],[LIBS]]) expands to @@ -209,7 +209,7 @@ AC_DEFUN([_AX_CHECK_GL_MANUAL_LIBS_GENERIC], [ AC_DEFUN_ONCE([_WITH_XQUARTZ_GL],[ AC_ARG_WITH([xquartz-gl], [AS_HELP_STRING([--with-xquartz-gl@<:@=DIR@:>@], - [On Mac OSX, use opengl provided by X11/XQuartz instead of the built-in framework. + [On Mac OSX, use opengl provided by X11/XQuartz instead of the built-in framework. If enabled, the default location is @<:@DIR=/opt/X11@:>@. This option is default to false.])], [AS_IF([test "X$with_xquartz_gl"="Xyes"], @@ -230,7 +230,7 @@ AC_DEFUN_ONCE([_WITH_XQUARTZ_GL],[ ]) # OSX specific setup for OpenGL check -AC_DEFUN([_AX_CHECK_DARWIN_GL], [ +AC_DEFUN([_AX_CHECK_DARWIN_GL], [ AC_REQUIRE([_WITH_XQUARTZ_GL]) AS_IF([test "x$with_xquartz_gl" != "xno"], [GL_LIBS="${GL_LIBS:--lGL}"], @@ -256,7 +256,7 @@ AC_DEFUN([AX_CHECK_GL], AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_ARG_VAR([GL_CFLAGS],[C compiler flags for GL, overriding configure script defaults]) AC_ARG_VAR([GL_LIBS],[Linker flags for GL, overriding configure script defaults]) - + dnl --with-gl or not can be implemented outside of check-gl AS_CASE([${host}], [*-darwin*],[_AX_CHECK_DARWIN_GL], @@ -286,7 +286,7 @@ AC_DEFUN([AX_CHECK_GL], [no_gl=yes]) AS_IF([test "X$no_gl" = "X"], [AC_DEFINE([HAVE_GL], [1], [Defined if a valid OpenGL implementation is found.]) - m4_ifval([$1], + m4_ifval([$1], [$1], [CFLAGS="$GL_CFLAGS $CFLAGS" LIBS="$GL_LIBS $LIBS"]) diff --git a/m4/ax_check_glu.m4 b/m4/ax_check_glu.m4 index be9e7fe..2727daf 100644 --- a/m4/ax_check_glu.m4 +++ b/m4/ax_check_glu.m4 @@ -85,7 +85,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 19 +#serial 20 # exemple program m4_define([_AX_CHECK_GLU_PROGRAM], @@ -153,7 +153,7 @@ AC_DEFUN([_AX_CHECK_GLU_SAVE_FLAGS], [ ]) # _AX_CHECK_GLU_RESTORE_FLAGS(LIST-OF-FLAGS) -# Use this marcro to restore the flags you saved using +# Use this marcro to restore the flags you saved using # _AX_CHECK_GLU_SAVE_FLAGS # # Example: _AX_CHECK_GLU_RESTORE_FLAGS([[CFLAGS],[LIBS]]) expands to @@ -207,7 +207,7 @@ AC_DEFUN([AX_CHECK_GLU],[ AC_REQUIRE([PKG_PROG_PKG_CONFIG]) AC_ARG_VAR([GLU_CFLAGS],[C compiler flags for GLU, overriding system check]) AC_ARG_VAR([GLU_LIBS],[Linker flags for GLU, overriding system check]) - + dnl Setup GLU_CFLAGS and GLU_LIBS AS_CASE([${host}], [*-darwin*],[_AX_CHECK_DARWIN_GLU], @@ -223,13 +223,13 @@ AC_DEFUN([AX_CHECK_GLU],[ ]) AS_CASE([$host], - [*-darwin*], + [*-darwin*], [AS_IF([test "X$with_xquartz_gl" = "Xno"], [_AX_CHECK_GLU_HEADERS([OpenGL/glu.h])], [_AX_CHECK_GLU_HEADERS([GL/glu.h])] )], [_AX_CHECK_GLU_HEADERS([GL/glu.h])]) - + dnl compile test AS_IF([test "X$ax_check_glu_have_headers" = "Xyes"], [AC_CACHE_CHECK([for compiling a minimal OpenGL Utility (GLU) program], @@ -251,7 +251,7 @@ AC_DEFUN([AX_CHECK_GLU],[ [ax_cv_check_glu_link="no"]) _AX_CHECK_GLU_RESTORE_FLAGS([[CFLAGS],[LIBS]])]) ]) - + # # Some versions of Mac OS X include a broken interpretation of the GLU # tesselation callback function signature. @@ -267,7 +267,7 @@ AC_DEFUN([AX_CHECK_GLU],[ [AC_DEFINE([HAVE_VARARGS_GLU_TESSCB], [1], [Use nonstandard varargs form for the GLU tesselator callback])]) ]) - + dnl hook AS_IF([test "X$ax_cv_check_glu_link" = "Xyes"], [AC_DEFINE([HAVE_GLU],[1],[Defined if a valid GLU implementation is found.]) diff --git a/m4/ax_check_glut.m4 b/m4/ax_check_glut.m4 index 75addb7..ed576a3 100644 --- a/m4/ax_check_glut.m4 +++ b/m4/ax_check_glut.m4 @@ -80,7 +80,7 @@ # modified version of the Autoconf Macro, you may extend this special # exception to the GPL to apply to your modified version as well. -#serial 15 +#serial 16 AC_DEFUN([_AX_CHECK_GLUT_SAVE_FLAGS], [ AX_SAVE_FLAGS_WITH_PREFIX([GLUT],[$1]) dnl defined in ax_check_gl @@ -149,7 +149,7 @@ AC_DEFUN([AX_CHECK_GLUT], AC_REQUIRE([_WITH_XQUARTZ_GL]) AC_ARG_VAR([GLUT_CFLAGS],[C compiler flags for GLUT, overriding configure script defaults]) AC_ARG_VAR([GLUT_LIBS],[Linker flags for GLUT, overriding configure script defaults]) - + AS_CASE([${host}], [*-darwin*],[AS_IF([test "x$with_xquartz_gl" != "xno"], [GLUT_LIBS="${GLUT_LIBS:--lGLUT}"], @@ -196,7 +196,7 @@ AC_DEFUN([AX_CHECK_GLUT], dnl hook AS_IF([test "X$ax_cv_check_glut_link" = "Xyes"], [AC_DEFINE([HAVE_GLUT], [1], [Defined if a valid GLUT implementation is found]) - m4_ifval([$1], + m4_ifval([$1], [$1], [CFLAGS="$GLUT_CFLAGS $CFLAGS" LIBS="$GLUT_LIBS $LIBS"]) |