Changeset 19448

Timestamp:

11/10/06 13:20:05 (2 years ago)

Author:

patrick

Message:

Merge Doozer++ 2.1.7 from its vendor branch. This release incorporates
enhancements that are required for the upcoming commit to the Juggler build
that will finish off the switch to flagpoll.

Files:

• juggler/trunk/Doozer++/ChangeLog (modified) (1 diff)
• juggler/trunk/Doozer++/config/general.m4 (modified) (2 diffs)
• juggler/trunk/Doozer++/config/pkgs/alut.m4 (modified) (7 diffs)
• juggler/trunk/Doozer++/config/pkgs/audiere.m4 (modified) (7 diffs)
• juggler/trunk/Doozer++/config/pkgs/boost.m4 (modified) (4 diffs)
• juggler/trunk/Doozer++/config/pkgs/glut.m4 (modified) (4 diffs)
• juggler/trunk/Doozer++/config/pkgs/nspr.m4 (modified) (8 diffs)
• juggler/trunk/Doozer++/config/pkgs/openal.m4 (modified) (11 diffs)

juggler/trunk/Doozer++/ChangeLog

@@ -1 +1 @@
-DATE       AUTHOR       CHANGE
----------- ------------ -------------------------------------------------------
+2006-11-09 patrickh     Extended the tests for OpenAL, ALUT, GLUT, NSPR, and
+                        Audiere to be smarter about 64-bit installations and to
+                        report the directory containing the library (or
+                        libraries) for the package.
+                        NEW VERSION: 2.1.7
+2006-11-09 patrickh     Extended DPP_HAVE_GLUT to handle the Mac OS X GLUT
+                        framework.
+                        NEW VERSION: 2.1.6
+2006-11-09 patrickh     Store the Boost header directory path in
+                        $BOOST_INCLUDE_DIR.
+                        NEW VERSION: 2.1.5
-2006-11-02 patrickh     Separated the ALUT test from DPP_HAVE_OPENAL. The new
-                        way to test for ALUT is to use DPP_HAVE_ALUT.

juggler/trunk/Doozer++/config/general.m4

@@ -22 +22 @@
-dnl -----------------------------------------------------------------
-dnl File:          general.m4,v
-2 17:31:43
-87
+9 22:12:21
+90
-dnl -----------------------------------------------------------------
-dnl ************** <auto-copyright.pl END do not edit this line> **************
@@ -47 +47 @@
-dnl ===========================================================================
-
-87 2006/11/02 17:31:43
+90 2006/11/09 22:12:21
-
-dnl Set the version of Doozer++.
-4
+7
-
-dnl ---------------------------------------------------------------------------

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

@@ -22 +22 @@
-dnl -----------------------------------------------------------------
-dnl File:          alut.m4,v
-2 17:31:43
-1
+9 22:12:22
+2
-dnl -----------------------------------------------------------------
-dnl ************** <auto-copyright.pl END do not edit this line> **************
@@ -43 +43 @@
-dnl     ALUT_INCLUDES - Extra include path for the ALUT header directory.
-dnl     ALUT_LDFLAGS  - Extra linker flags for the ALUT library directory.
+dnl     ALUT_LIBDIR   - The directory containing the ALUT library. On Mac OS X,
+dnl                     this is the directory containing the OpenAL framework
+dnl                     (since OpenAL and ALUT are not separated).
-dnl ===========================================================================
-
-1 2006/11/02 17:31:43
+2 2006/11/09 22:12:22
-
-dnl ---------------------------------------------------------------------------
@@ -116 +119 @@
-         if test "x$PLATFORM" = "xDarwin" ; then
-            ALUT="$OPENAL"
+            ALUT_LIBDIR="$AL_LIBDIR"
-            dpp_have_alut="$dpp_have_openal"
-         dnl Other platforms.
@@ -125 +129 @@
-            fi
-
+            LIBS="-lalut $DYN_LOAD_LIB $LIBOPENAL $LIBS"
+
-            DPP_LANG_SAVE
-            DPP_LANG_C
-
-            for l in $libdirs ; do
+               cur_alut_libdir="$ALUT_ROOT/$l"
+
-               dnl The pthreads-related macros will set only one of
-               dnl $PTHREAD_ARG or $PTHREAD_LIB, so it's safe (and simpler)
-               dnl for us to use both here.
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-               if test "x$dpp_have_alut" = "xyes" ; then
+                  ALUT_LIBDIR="$cur_alut_libdir"
-                  break
-               fi
@@ -147 +155 @@
-            DPP_LANG_RESTORE
-         fi
+
+         dnl Restore all the variables now that we are done testing.
+         CFLAGS="$dpp_save_CFLAGS"
+         CPPFLAGS="$dpp_save_CPPFLAGS"
+         LDFLAGS="$dpp_save_LDFLAGS"
+         LIBS="$dpp_save_LIBS"
-
-         dnl Success.
@@ -174 +188 @@
-            ALUT='yes'
-         fi
-
-         dnl Restore all the variables now that we are done testing.
-         CFLAGS="$dpp_save_CFLAGS"
-         CPPFLAGS="$dpp_save_CPPFLAGS"
-         LDFLAGS="$dpp_save_LDFLAGS"
-         LIBS="$dpp_save_LIBS"
-      fi
-   fi
@@ -189 +197 @@
-   AC_SUBST(ALUT_INCLUDES)
-   AC_SUBST(ALUT_LDFLAGS)
+   AC_SUBST(ALUT_LIBDIR)
-])

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

@@ -22 +22 @@
-dnl -----------------------------------------------------------------
-dnl File:          audiere.m4,v
-5/01/08 22:44:41
-6
+6/11/09 22:12:22
+7
-dnl -----------------------------------------------------------------
-dnl ************** <auto-copyright.pl END do not edit this line> **************
@@ -44 +44 @@
-dnl                        appliations.
-dnl     AUDIERE_INCLUDES - Extra include path for the Audiere header directory.
-
+
+
+
-dnl ===========================================================================
-
-6 2005/01/08 22:44:41
+7 2006/11/09 22:12:22
-
-dnl ---------------------------------------------------------------------------
@@ -89 +91 @@
-      dpp_save_CPPFLAGS="$CPPFLAGS"
-      dpp_save_LDFLAGS="$LDFLAGS"
+      dpp_save_LIBS="$LIBS"
-
-      dnl Add the user-specified Audiere installation directory to these
@@ -95 +98 @@
-      if test "x$AUDIERE_ROOT" != "x/usr" ; then
-         CPPFLAGS="$CPPFLAGS -I$AUDIERE_ROOT/include"
-         LDFLAGS="-L$AUDIERE_ROOT/lib $LDFLAGS $ABI_FLAGS"
-      fi
-
-      CXXFLAGS="$CXXFLAGS $ABI_FLAGS"
-
-      dpp_save_LIBS="$LIBS"
-
-      if test "x$PLATFORM" = "xIRIX" ; then
@@ -106 +106 @@
-      fi
-
+      if test "lib$LIBBITSUF" != "lib" ; then
+         libdirs="lib$LIBBITSUF lib"
+      else
+         libdirs="lib"
+      fi
+
+      LIBS="-laudiere $LIB_AUDIO $LIBS"
+
-      DPP_LANG_SAVE
-      DPP_LANG_CPLUSPLUS
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-      DPP_LANG_RESTORE
-
-
-
+
+
+
-      LIBS="$dpp_save_LIBS"
-
@@ -134 +153 @@
-         AUDIERE='yes'
-      fi
-
-      CXXFLAGS="$dpp_save_CXXFLAGS"
-      CPPFLAGS="$dpp_save_CPPFLAGS"
-      LDFLAGS="$dpp_save_LDFLAGS"
-   fi
-
@@ -145 +160 @@
-   AC_SUBST(AUDIERE_INCLUDES)
-   AC_SUBST(AUDIERE_LDFLAGS)
+   AC_SUBST(AUDIERE_LIBDIR)
-])

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

@@ -22 +22 @@
-dnl -----------------------------------------------------------------
-dnl File:          boost.m4,v
-5/11/16 14:42:2
-7
+6/11/09 21:58:3
+8
-dnl -----------------------------------------------------------------
-dnl ************** <auto-copyright.pl END do not edit this line> **************
@@ -40 +40 @@
-dnl     BOOST             - do we have boost on the system?
-dnl     BOOST_ROOT        - The Boost installation directory.
+dnl     BOOST_INCLUDE_DIR - The directory containing the Boost header tree.
-dnl     BOOST_INCLUDES    - Extra include path for the Boost header directory.
-dnl     BOOST_LDFLAGS     - Extra library path for the Boost libraries.
+dnl                         Note that the value set in this variable is an
+dnl                         educated guess. No test is performed to validate
+dnl                         the setting!
-dnl     BOOST_VERSION     - The integer Boost version (see boost/version.hpp).
-dnl     BOOST_LIB_VERSION - The version substring in Boost library names.
-dnl ===========================================================================
-
-7 2005/11/16 14:42:2
+8 2006/11/09 21:58:3
-
-dnl ---------------------------------------------------------------------------
@@ -153 +157 @@
-      if test "x$dpp_have_boost" = "xyes" ; then
-         if test "x$dpp_boost_incdir" != "x" ; then
+            BOOST_INCLUDE_DIR="$dpp_boost_incdir"
-            BOOST_INCLUDES="-I$dpp_boost_incdir"
-         fi
@@ -180 +185 @@
-   dnl Export all of the output vars for use by makefiles and configure script.
-   AC_SUBST(BOOST_ROOT)
+   AC_SUBST(BOOST_INCLUDE_DIR)
-   AC_SUBST(BOOST_INCLUDES)
-   AC_SUBST(BOOST_LDFLAGS)

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

@@ -22 +22 @@
-dnl -----------------------------------------------------------------
-dnl File:          glut.m4,v
-5/01/08 22:44:41
-2
+6/11/09 22:12:22
+5
-dnl -----------------------------------------------------------------
-dnl ************** <auto-copyright.pl END do not edit this line> **************
@@ -41 +41 @@
-dnl     GLUT_INCLUDES - Extra include path for the GLUT header directory.
-dnl     GLUT_LDFLAGS  - Extra linker flags for the GLUT library directory.
+dnl     GLUT_LIBDIR   - The directory containing the GLUT library. On Mac OS X,
+dnl                     this is the directory containing the GLUT framework
+dnl                     directory.
-dnl ===========================================================================
-
-2 2005/01/08 22:44:41
+5 2006/11/09 22:12:22
-
-dnl ---------------------------------------------------------------------------
@@ -97 +100 @@
-         AC_MSG_WARN([Assuming that GLUT is available in a standard location])
-         dpp_have_glut='yes'
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      else
-         dpp_save_LIBS="$LIBS"
-         LIBS="$LIBS -lglut $LIBOPENGL -lm"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-         LIBS="$dpp_save_LIBS"
-
-         if test "x$dpp_cv_glutMainLoop_available" = "xyes" ; then
-            dpp_have_glut='yes'
+            ifelse([$2], , :, [$2])
+         else
-            ifelse([$3], , :, [$3])
-
-
-
-
-
+
-      fi
-
@@ -141 +194 @@
-         fi
-      fi
-
-      dnl Restore all the variables now that we are done testing.
-      CFLAGS="$dpp_save_CFLAGS"
-      CPPFLAGS="$dpp_save_CPPFLAGS"
-      LDFLAGS="$dpp_save_LDFLAGS"
-   fi
-
-   AC_SUBST(GLUT_ROOT)
+   AC_SUBST(GLUT_INCLUDES)
+   AC_SUBST(GLUT_LDFLAGS)
+   AC_SUBST(GLUT_LIBDIR)
-])

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

@@ -22 +22 @@
-dnl -----------------------------------------------------------------
-dnl File:          nspr.m4,v
-5/03/20 17:17:1
-0
+6/11/09 22:12:2
+1
-dnl -----------------------------------------------------------------
-dnl ************** <auto-copyright.pl END do not edit this line> **************
@@ -60 +60 @@
-dnl                             libraries (safe for use with the msvccc shell
-dnl                             script).
+dnl     NSPR_LIBDIR           - The directory containing the NSPR libraries.
-dnl     NSPR_LIB_MSVCCC       - The linker option for the basic NSPR library
-dnl                             for use with the msvccc shell script.
@@ -82 +83 @@
-dnl ===========================================================================
-
-0 2005/03/20 17:17:1
+1 2006/11/09 22:12:2
-
-dnl ---------------------------------------------------------------------------
@@ -149 +150 @@
-
-   if test "x$NSPR_ROOT" != "xno" ; then
-AC
-AC
+DPP
+DPP
-
-      dnl Add the user-specified NSPR installation directory to the
@@ -176 +177 @@
-         dnl No NSPR library directory, so append "/lib" to $NSPR_ROOT.
-         if test "x${_with_nspr_lib}" = "x/usr/lib" ; then
-
+
+
+
+
+
-         dnl We have a NSPR library directory, so we'll use it and hope for
-         dnl the best.
-         else
-dpp_nspr_libdir
+libdirs
-         fi
-      else
-
+
+
+
+
+
-      fi
-
@@ -198 +207 @@
-
-      CPPFLAGS="$CPPFLAGS -I$dpp_nspr_incdir"
-
+
+
-
-      if test "x$dpp_os_type" = "xWin32" ; then
-         NSPR_LIB_NAME_PREFIX='lib'
-      fi
+
+      LIBS="$PTHREAD_LIB $SEM_LIB"
+
+      libname="$NSPR_LIB_NAME_PREFIXnspr4"
+
+      for l in libdirs ; do
+         cur_nspr_libdir="$l"
+         LDFLAGS="$PTHREAD_ARG -L$cur_nspr_libdir $dpp_save_LDFLAGS"
+
+         AC_MSG_CHECKING([for PR_Initialized in $libname in $cur_nspr_libdir])
+         AC_TRY_LINK([
+#if defined(HAVE_NSPR_H)
+#include <nspr.h>
+#else
+#include <nspr/nspr.h>
+#endif
+],
+            [PR_Initialized();], [dpp_have_nspr='yes'], [dpp_have_nspr='no'])
+
+         if test "x$dpp_have_nspr" = "xyes" ; then
+            NSPR_LIBDIR="$cur_nspr_libdir"
+            break
+         fi
+      done
+
+      DPP_LANG_RESTORE
-
-      dpp_nspr_lib="${NSPR_LIB_NAME_PREFIX}nspr$NSPR_VER"
@@ -208 +244 @@
-      dpp_plds_lib="${NSPR_LIB_NAME_PREFIX}plds$NSPR_VER"
-
-      AC_CHECK_LIB([$dpp_nspr_lib], [PR_CreateThread],
-                   [AC_CHECK_HEADER([nspr.h],
-                      [dpp_nspr_inc="$dpp_nspr_incdir"],
-                      [AC_CHECK_HEADER([nspr/nspr.h],
-                         [dpp_nspr_inc="$dpp_nspr_incdir/nspr"], $3)])],
-                   $3, [$PTHREAD_LIB $SEM_LIB])
-
-      CPPFLAGS="$dpp_save_CPPFLAGS"
-      LDFLAGS="$dpp_save_LDFLAGS"
-      LIBS="$dpp_save_LIBS"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-   fi
-
@@ -249 +280 @@
-   AC_SUBST(PLC_LIB_STATIC)
-   AC_SUBST(PLDS_LIB_STATIC)
+   AC_SUBST(NSPR_LIBDIR)
-])
-

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

@@ -22 +22 @@
-dnl -----------------------------------------------------------------
-dnl File:          openal.m4,v
-2 17:31:43
-3
+9 22:12:22
+4
-dnl -----------------------------------------------------------------
-dnl ************** <auto-copyright.pl END do not edit this line> **************
@@ -43 +43 @@
-dnl     AL_INCLUDES - Extra include path for the OpenAL header directory.
-dnl     AL_LDFLAGS  - Extra linker flags for the OpenAL library directory.
+dnl     AL_LIBDIR   - The directory containing the OpenAL library. On Mac OS X,
+dnl                   this is the directory containing the OpenAL framework.
-dnl ===========================================================================
-
-3 2006/11/02 17:31:43
+4 2006/11/09 22:12:22
-
-dnl ---------------------------------------------------------------------------
@@ -131 +133 @@
-                           [dpp_cv_alEnable_openal_lib='no'])])
-
+         DPP_LANG_RESTORE
+
+         dnl Restore all the variables now that we are done testing.
+         CFLAGS="$dpp_save_CFLAGS"
+         CPPFLAGS="$dpp_save_CPPFLAGS"
+         LDFLAGS="$dpp_save_LDFLAGS"
-         LIBS="$dpp_save_LIBS"
-
@@ -136 +144 @@
-         if test "x$dpp_cv_alEnable_openal_lib" = "xyes" ; then
-            dpp_have_openal='yes'
+            AL_LIBDIR="$OALROOT/libs"
-            ifelse([$2], , :, [$2])
-         dnl Failure.
@@ -142 +151 @@
-            ifelse([$3], , :, [$3])
-         fi
-
-         DPP_LANG_RESTORE
-      elif test "x$PLATFORM" = "xDarwin" ; then
-         DPP_LANG_SAVE
@@ -158 +165 @@
-                           [dpp_cv_alEnable_openal_lib='no'])])
-
+         DPP_LANG_RESTORE
+
+         dnl Restore all the variables now that we are done testing.
+         CFLAGS="$dpp_save_CFLAGS"
+         CPPFLAGS="$dpp_save_CPPFLAGS"
+         LDFLAGS="$dpp_save_LDFLAGS"
-         LIBS="$dpp_save_LIBS"
-
@@ -163 +176 @@
-         if test "x$dpp_cv_alEnable_openal_lib" = "xyes" ; then
-            dpp_have_openal='yes'
+            AL_LIBDIR="$OALROOT"
-            ifelse([$2], , :, [$2])
-         dnl Failure.
@@ -169 +183 @@
-            ifelse([$3], , :, [$3])
-         fi
-
-         DPP_LANG_RESTORE
-      dnl Other platforms.
-      else
+         if test "lib$LIBBITSUF" != "lib" ; then
+            libdirs="lib$LIBBITSUF lib"
+         else
+            libdirs="lib"
+         fi
+
+         LIBS="-lopenal $LIBS $DYN_LOAD_LIB -lm"
+
-         DPP_LANG_SAVE
-         DPP_LANG_C
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-         dnl Success.
@@ -193 +230 @@
-            ifelse([$3], , :, [$3])
-         fi
-
-         DPP_LANG_RESTORE
-      fi
-
@@ -227 +262 @@
-         OPENAL='yes'
-      fi
-
-      dnl Restore all the variables now that we are done testing.
-      CFLAGS="$dpp_save_CFLAGS"
-      CPPFLAGS="$dpp_save_CPPFLAGS"
-      LDFLAGS="$dpp_save_LDFLAGS"
-      LIBS="$dpp_save_LIBS"
-   fi
-
@@ -241 +270 @@
-   AC_SUBST(AL_INCLUDES)
-   AC_SUBST(AL_LDFLAGS)
+   AC_SUBST(AL_LIBDIR)
-])