SF.net SVN: openvrml:[3767] trunk

[<br...@us...>]

Revision: 3767
          http://openvrml.svn.sourceforge.net/openvrml/?rev=3767&view=rev
Author:   braden
Date:     2008-11-10 05:27:27 +0000 (Mon, 10 Nov 2008)

Log Message:
-----------
Updated to 20081110 release of Autoconf GL Macros.  This addresses some quoting issues in the AX_CHECK_GL macro.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/m4/ax_check_gl.m4

Property Changed:
----------------
    trunk/
    trunk/src/libopenvrml/openvrml/bad_url.cpp
    trunk/src/libopenvrml/openvrml/scene.cpp
    trunk/src/libopenvrml/openvrml/scene.h
    trunk/src/libopenvrml/openvrml/script.cpp


Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688
   + /branches/0.17:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766
/branches/local:3677-3689
/branches/node-modules:3622-3623,3632-3635,3637-3638,3640-3641,3643-3644,3646-3647,3649-3650,3654-3655,3657-3658,3661-3662,3664-3665,3667-3668,3670-3671,3673-3674,3684-3685,3687-3688

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-11-10 05:21:20 UTC (rev 3766)
+++ trunk/ChangeLog	2008-11-10 05:27:27 UTC (rev 3767)
@@ -1,3 +1,10 @@
+2008-11-10 Braden McDaniel  <br...@en...>
+
+	Updated to 20081110 release of Autoconf GL Macros.  This addresses
+	some quoting issues in the AX_CHECK_GL macro.
+
+	* m4/ax_check_gl.m4
+
 2008-11-09 Braden McDaniel  <br...@en...>
 
 	Updated to 20081109 release of Autoconf GL Macros.  This addresses

Modified: trunk/m4/ax_check_gl.m4
===================================================================
--- trunk/m4/ax_check_gl.m4	2008-11-10 05:21:20 UTC (rev 3766)
+++ trunk/m4/ax_check_gl.m4	2008-11-10 05:27:27 UTC (rev 3767)
@@ -11,7 +11,7 @@
 # "OpenGL/gl.h" is found, HAVE_OPENGL_GL_H is defined.  These preprocessor
 # definitions may not be mutually exclusive.
 #
-# version: 2.3
+# version: 2.4
 # author: Braden McDaniel <br...@en...>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -50,9 +50,9 @@
 # AC_PATH_X).
 #
 AS_IF([test X$no_x != Xyes],
-      [AS_IF([test -n $x_includes],
+      [AS_IF([test -n "$x_includes"],
              [GL_CFLAGS="-I$x_includes $GL_CFLAGS"])]
-       AS_IF([test -n $x_libraries],
+       AS_IF([test -n "$x_libraries"],
              [GL_LIBS="-L$x_libraries -lX11 $GL_LIBS"]))
 
 ax_save_CPPFLAGS=$CPPFLAGS
@@ -87,7 +87,7 @@
 ax_save_LIBS=$LIBS
 LIBS=""
 ax_check_libs="-lopengl32 -lGL"
-for ax_lib in ${ax_check_libs}; do
+for ax_lib in $ax_check_libs; do
   AS_IF([test X$ax_compiler_ms = Xyes],
         [ax_try_lib=`echo $ax_lib | $SED -e 's/^-l//' -e 's/$/.lib/'`],
         [ax_try_lib=$ax_lib])


Property changes on: trunk/src/libopenvrml/openvrml/bad_url.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764
   + /branches/0.17/src/libopenvrml/openvrml/bad_url.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766


Property changes on: trunk/src/libopenvrml/openvrml/scene.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764
   + /branches/0.17/src/libopenvrml/openvrml/scene.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766


Property changes on: trunk/src/libopenvrml/openvrml/scene.h
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764
   + /branches/0.17/src/libopenvrml/openvrml/scene.h:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766


Property changes on: trunk/src/libopenvrml/openvrml/script.cpp
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764
   + /branches/0.17/src/libopenvrml/openvrml/script.cpp:3713,3717,3719,3721,3725,3730,3732,3743,3746,3748,3750,3752,3754,3757,3759-3760,3764,3766


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.