[Wxlua-commit] wxLua configure,1.47,1.48

[Francesco M. <fr...@us...>]

Update of /cvsroot/wxlua/wxLua
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7944

Modified Files:
	configure 
Log Message:
added check for OpenGL libraries

Index: configure
===================================================================
RCS file: /cvsroot/wxlua/wxLua/configure,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** configure	24 Dec 2006 13:30:55 -0000	1.47
--- configure	3 Jan 2007 23:10:00 -0000	1.48
***************
*** 7153,7157 ****
  # NOTE: autopackage HACK: do an "export NO_WXLUAEDIT_CHECK=1" symbol
  #       to get rid of this check which fails for some reason when building the AP
! if [ "$USE_WXLUAEDITAPP" = "1" && -z "$NO_WXLUAEDIT_CHECK" ]; then
  
      minversion="1.2.4"
--- 7153,7157 ----
  # NOTE: autopackage HACK: do an "export NO_WXLUAEDIT_CHECK=1" symbol
  #       to get rid of this check which fails for some reason when building the AP
! if [[ "$USE_WXLUAEDITAPP" = "1" && -z "$NO_WXLUAEDIT_CHECK" ]]; then
  
      minversion="1.2.4"
***************
*** 7351,7354 ****
--- 7351,7464 ----
  
  
+ 
+ 
+         SAVED_CPPFLAGS="$CPPFLAGS"
+         SAVED_CXXFLAGS="$CXXFLAGS"
+         SAVED_CFLAGS="$CFLAGS"
+         SAVED_LIBS="$LIBS"
+ 
+ 
+                                                                                                                                                                                     CPPFLAGS="$CPPFLAGS $WX_CPPFLAGS"
+             CFLAGS="$CFLAGS $WX_CFLAGS_ONLY"
+ 
+                         OLD_WXLIBS=$WX_LIBS
+ 
+                 WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS gl,$WX_ADDITIONAL_LIBS --libs)"
+ 
+             LIBS="$LIBS $WX_LIBS"
+ 
+                         { echo "$as_me:$LINENO: checking if wxWidgets OpenGL bindings are available" >&5
+ echo $ECHO_N "checking if wxWidgets OpenGL bindings are available... $ECHO_C" >&6; }
+             cat >conftest.$ac_ext <<_ACEOF
+ 
+                             /* confdefs.h.  */
+ _ACEOF
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+ #include <wx/glcanvas.h>
+ int
+ main ()
+ {
+ wxGLContext dummy(NULL);
+   ;
+   return 0;
+ }
+ 
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+ if { (ac_try="$ac_link"
+ case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_link") 2>conftest.er1
+   ac_status=$?
+   grep -v '^ *+' conftest.er1 >conftest.err
+   rm -f conftest.er1
+   cat conftest.err >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); } &&
+ 	 { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; } &&
+ 	 { ac_try='test -s conftest$ac_exeext'
+   { (case "(($ac_try" in
+   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+   *) ac_try_echo=$ac_try;;
+ esac
+ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+   (eval "$ac_try") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; }; then
+   WXGL_PRESENCE=1
+ else
+   echo "$as_me: failed program was:" >&5
+ sed 's/^/| /' conftest.$ac_ext >&5
+ 
+ 	WXGL_PRESENCE=0
+ fi
+ 
+ rm -f core conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
+ 
+             if test "$WXGL_PRESENCE" = "1"; then
+                 { echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6; }
+ 
+             else
+                 { echo "$as_me:$LINENO: result: no" >&5
+ echo "${ECHO_T}no" >&6; }
+ 
+             fi
+ 
+                         WX_LIBS=$OLD_WXLIBS
+ 
+         CPPFLAGS="$SAVED_CPPFLAGS"
+         CXXFLAGS="$SAVED_CXXFLAGS"
+         CFLAGS="$SAVED_CFLAGS"
+         LIBS="$SAVED_LIBS"
+ 
+ 
+ if test "$WXGL_PRESENCE" = "1"; then
+     # let's add OpenGL binding library to the libraries to link
+     # so that if the user wants to use wxLua bindings to wxOpenGL he
+     # won't have linking errors
+ 
+                 WX_LIBS="$($WX_CONFIG_PATH $wx_config_args $WXCFG_FLAGS gl,$WX_ADDITIONAL_LIBS --libs)"
+ 
+ fi
+ 
+ 
+ 
  # Produce some useful info for pkg-config: