Changeset 19561

Show
Ignore:
Timestamp:
11/20/06 13:37:27 (2 years ago)
Author:
patrick
Message:

Merge Doozer++ 2.1.8 from its vendor branch. This fixes the NSPR detection
macros so that NSPR can once again be used for the VPR backend on
non-Windows platforms.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • juggler/trunk/Doozer++/ChangeLog

    r19448 r19561  
    11DATE       AUTHOR       CHANGE 
    22---------- ------------ ------------------------------------------------------- 
     32006-11-20 patrickh     Fixed NSPR detection tests. 
     4                        NEW VERSION: 2.1.8 
    352006-11-09 patrickh     Extended the tests for OpenAL, ALUT, GLUT, NSPR, and 
    46                        Audiere to be smarter about 64-bit installations and to 

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

    r19448 r19561  
    2222dnl ----------------------------------------------------------------- 
    2323dnl File:          general.m4,v 
    24 dnl Date modified: 2006/11/09 22:12:21 
    25 dnl Version:       1.90 
     24dnl Date modified: 2006/11/20 19:32:57 
     25dnl Version:       1.91 
    2626dnl ----------------------------------------------------------------- 
    2727dnl ************** <auto-copyright.pl END do not edit this line> ************** 
    …… 
    4747dnl =========================================================================== 
    4848 
    49 dnl general.m4,v 1.90 2006/11/09 22:12:21 patrickh Exp 
     49dnl general.m4,v 1.91 2006/11/20 19:32:57 patrickh Exp 
    5050 
    5151dnl Set the version of Doozer++. 
    52 define(DPP_DPPVERSION, 2.1.7) 
     52define(DPP_DPPVERSION, 2.1.8) 
    5353 
    5454dnl --------------------------------------------------------------------------- 

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

    r19448 r19561  
    2222dnl ----------------------------------------------------------------- 
    2323dnl File:          nspr.m4,v 
    24 dnl Date modified: 2006/11/09 22:12:22 
    25 dnl Version:       1.41 
     24dnl Date modified: 2006/11/20 19:32:57 
     25dnl Version:       1.42 
    2626dnl ----------------------------------------------------------------- 
    2727dnl ************** <auto-copyright.pl END do not edit this line> ************** 
    …… 
    8383dnl =========================================================================== 
    8484 
    85 dnl nspr.m4,v 1.41 2006/11/09 22:12:22 patrickh Exp 
     85dnl nspr.m4,v 1.42 2006/11/20 19:32:57 patrickh Exp 
    8686 
    8787dnl --------------------------------------------------------------------------- 
    …… 
    214214      fi 
    215215 
    216       LIBS="$PTHREAD_LIB $SEM_LIB" 
    217  
    218       libname="$NSPR_LIB_NAME_PREFIXnspr4" 
    219  
    220       for l in libdirs ; do 
     216      libname="${NSPR_LIB_NAME_PREFIX}nspr4" 
     217      LIBS="-l$libname $PTHREAD_LIB $SEM_LIB" 
     218 
     219      for l in $libdirs ; do 
    221220         cur_nspr_libdir="$l" 
    222221         LDFLAGS="$PTHREAD_ARG -L$cur_nspr_libdir $dpp_save_LDFLAGS" 
    …… 
    231230], 
    232231            [PR_Initialized();], [dpp_have_nspr='yes'], [dpp_have_nspr='no']) 
     232         AC_MSG_RESULT([$dpp_have_nspr]) 
    233233 
    234234         if test "x$dpp_have_nspr" = "xyes" ; then 
    …… 
    298298AC_DEFUN([DPP_NSPR_VER], 
    299299[ 
    300    AC_REQUIRE([DPP_PROG_CC_NOSTDINC]) 
    301  
    302300   dnl ----------------------------------------------------------------------- 
    303301   dnl Define the version number of the NSPR installation.  This is the number 
    …… 
    320318      if test "x$2" != "x" ; then 
    321319         dpp_nspr_headerdir="$2" 
    322          CPPFLAGS="$CPPFLAGS $CC_NOSTDINC_FLAGS -I$2" 
     320         CPPFLAGS="$CPPFLAGS -I$2 -I/usr/include" 
    323321      dnl Otherwise, fall back on the basic include sub-directory of the 
    324322      dnl base NSPR directory. 
    325323      else 
    326324         dpp_nspr_headerdir="$1/include" 
    327          CPPFLAGS="$CPPFLAGS $CC_NOSTDINC_FLAGS -I$1/include" 
     325         CPPFLAGS="$CPPFLAGS -I$1/include -I/usr/include" 
    328326      fi 
    329327   dnl If we have neither a base directory nor an include directory, fall back