Changeset 18612

Timestamp:

04/13/06 19:48:40 (3 years ago)

Author:

patrick

Message:

Merge the Doozer++ 2.0.2 snapshot from April 13, 2006.

Files:

• juggler/trunk/Doozer++/config/pkgs/openal.m4 (modified) (5 diffs)

juggler/trunk/Doozer++/config/pkgs/openal.m4

@@ -41 +41 @@
-dnl     OALROOT     - The OpenAL installation directory.
-dnl     LIBOPENAL   - The list of libraries to link for OpenAL appliations.
+dnl     LIBALUT     - The list of libraries to link for ALUT appliations.
-dnl     AL_INCLUDES - Extra include path for the OpenAL header directory.
-dnl     AL_LDFLAGS  - Extra linker flags for the OpenAL library directory.
@@ -72 +73 @@
-   OPENAL='no'
-   LIBOPENAL=''
+   LIBALUT=''
-   AL_INCLUDES=''
-   AL_LDFLAGS=''
@@ -188 +190 @@
-            [$DYN_LOAD_LIB -lm])
-
+         AC_CHECK_LIB([alut], [alutInit],
+            [AC_CHECK_HEADER([AL/alut.h], [dpp_have_alut='yes'],
+               [dpp_have_alut='no'])],
+            [dpp_have_alut='no'],
+            [$DYN_LOAD_LIB -lm])
+
-         dnl This is necessary because AC_CHECK_LIB() adds -lopenal to
-         dnl $LIBS.  We want to do that ourselves later.
@@ -207 +215 @@
-      if test "x$dpp_have_openal" = "xyes" ; then
-         if test "x$OS_TYPE" = "xWin32" ;  then
-
+
+
-         elif test "x$PLATFORM" = "xDarwin" ; then
-            LIBOPENAL='-framework OpenAL'
-         else
-            LIBOPENAL="-lopenal -lm"
+            if test "x$dpp_have_alut" = "xyes" ; then
+               LIBALUT="-lalut"
+            fi
-         fi
-
@@ -244 +256 @@
-   AC_SUBST(OALROOT)
-   AC_SUBST(LIBOPENAL)
+   AC_SUBST(LIBALUT)
-   AC_SUBST(AL_INCLUDES)
-   AC_SUBST(AL_LDFLAGS)