SF.net SVN: openvrml:[4040] trunk

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

Revision: 4040
          http://openvrml.svn.sourceforge.net/openvrml/?rev=4040&view=rev
Author:   braden
Date:     2009-11-02 04:52:34 +0000 (Mon, 02 Nov 2009)

Log Message:
-----------
Use pkg-config to find SDL.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-11-01 22:29:16 UTC (rev 4039)
+++ trunk/ChangeLog	2009-11-02 04:52:34 UTC (rev 4040)
@@ -1,5 +1,9 @@
 2009-11-01 Braden McDaniel  <br...@en...>
 
+	* configure.ac: Use pkg-config to find SDL.
+
+2009-11-01 Braden McDaniel  <br...@en...>
+
 	* configure.ac: Don't fail on missing libpng if PNG_LIBS has been
 	set.
 

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac	2009-11-01 22:29:16 UTC (rev 4039)
+++ trunk/configure.ac	2009-11-02 04:52:34 UTC (rev 4040)
@@ -203,20 +203,7 @@
                   [OPENVRML_GL_HAVE_OPENGL_GLU_H=0])
 AC_SUBST([OPENVRML_GL_HAVE_OPENGL_GLU_H])
 
-AC_PATH_PROG([SDL_CONFIG], [sdl-config])
-have_sdl=no
-#
-# sdl-config sometimes emits an rpath flag pointing at its library
-# installation directory.  We don't want this, as it prevents users from
-# linking sdl-viewer against, for example, a locally compiled libGL when a
-# version of the library also exists in SDL's library installation
-# directory, typically /usr/lib.
-#
-AS_IF([test -n "${SDL_CONFIG}"],
-      [have_sdl=yes SDL_CFLAGS=`$SDL_CONFIG --cflags` SDL_LIBS=`$SDL_CONFIG --libs`
-       SDL_LIBS=`echo $SDL_LIBS | sed 's/-Wl,-rpath,[[^ ]]* //'`])
-AC_SUBST([SDL_CFLAGS])
-AC_SUBST([SDL_LIBS])
+PKG_CHECK_MODULES([SDL], [sdl], [have_sdl=yes], [have_sdl=no])
 
 #
 # Use exception specifications?
@@ -410,10 +397,10 @@
 AC_ARG_ENABLE([examples],
               [AC_HELP_STRING([--disable-examples],
                               [do not build the example programs])])
-AS_IF([test "X$enable_examples" != "Xno" -a "X$have_sdl" != "Xyes"],
+AS_IF([test X$enable_examples != Xno -a \( X$have_sdl != Xyes -o -z "${SDL_LIBS+x}" \)],
       [AC_MSG_FAILURE([SDL is required for the example programs])])
 AM_CONDITIONAL([ENABLE_EXAMPLES],
-               [test "X$enable_examples" != "Xno" -a "X$have_sdl" = "Xyes"])
+               [test X$enable_examples != Xno -a X$have_sdl = Xyes])
 
 #
 # Apply Rez to executables? (Only seem to need this if we're using the Apple


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