Changeset 19564

Timestamp:

11/20/06 13:58:57 (2 years ago)

Author:

patrick

Message:

Merged Doozer++ 2.1.9 from its vendor branch. This update facilitates easy
creation of a Flagpoll file for NSPR.

Files:

• juggler/trunk/Doozer++/ChangeLog (modified) (1 diff)
• juggler/trunk/Doozer++/config/general.m4 (modified) (2 diffs)
• juggler/trunk/Doozer++/config/pkgs/nspr.m4 (modified) (6 diffs)

juggler/trunk/Doozer++/ChangeLog

@@ -1 +1 @@
-DATE       AUTHOR       CHANGE
----------- ------------ -------------------------------------------------------
+2006-11-20 patrickh     Extended the NSPR detection tests to provide more
+                        information to the caller regarding the NSPR
+                        installation.
+                        NEW VERSION: 2.1.9
-2006-11-20 patrickh     Fixed NSPR detection tests.
-                        NEW VERSION: 2.1.8

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

@@ -22 +22 @@
-dnl -----------------------------------------------------------------
-dnl File:          general.m4,v
-32:57
-1
+56:20
+2
-dnl -----------------------------------------------------------------
-dnl ************** <auto-copyright.pl END do not edit this line> **************
@@ -47 +47 @@
-dnl ===========================================================================
-
-1 2006/11/20 19:32:57
+2 2006/11/20 19:56:20
-
-dnl Set the version of Doozer++.
-8
+9
-
-dnl ---------------------------------------------------------------------------

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

@@ -22 +22 @@
-dnl -----------------------------------------------------------------
-dnl File:          nspr.m4,v
-32:57
-2
+56:21
+3
-dnl -----------------------------------------------------------------
-dnl ************** <auto-copyright.pl END do not edit this line> **************
@@ -49 +49 @@
-dnl Variables defined:
-dnl     NSPR_ROOT             - The root of the NSPR installation.
+dnl     NSPR_INCLUDE_DIR      - The directory containing the root of the NSPR
+dnl                             header files. This may contain a subdirectory
+dnl                             called 'nspr'.
-dnl     NSPR_INCLUDES         - The compiler option giving the NSPR include
-dnl                             path.
@@ -83 +86 @@
-dnl ===========================================================================
-
-2 2006/11/20 19:32:57
+3 2006/11/20 19:56:21
-
-dnl ---------------------------------------------------------------------------
@@ -249 +252 @@
-
-      if test "x$dpp_have_nspr" = "xyes" ; then
+         NSPR_INCLUDE_DIR="$dpp_include_path"
-         NSPR_INCLUDES="-I$dpp_include_path"
-         NSPR_LIB="-l$dpp_nspr_lib"
@@ -273 +277 @@
-   fi
-
-   dnl -----------------------------------------------------------------------
-   dnl Do the substition step for $NSPR_ROOT.
-   dnl -----------------------------------------------------------------------
-   AC_SUBST(NSPR_ROOT)
+   AC_SUBST(NSPR_INCLUDE_DIR)
+   AC_SUBST(NSPR_INCLUDES)
+   AC_SUBST(NSPR_LIB)
+   AC_SUBST(PLC_LIB)
+   AC_SUBST(PLDS_LIB)
-   AC_SUBST(NSPR_LIB_STATIC)
-   AC_SUBST(PLC_LIB_STATIC)
-   AC_SUBST(PLDS_LIB_STATIC)
-   AC_SUBST(NSPR_LIBDIR)
+   AC_SUBST(NSPR_LDFLAGS)
+   AC_SUBST(NSPR_LDFLAGS_LINK_EXE)
-])
-
@@ -354 +362 @@
-
-      NSPR_VER="$dpp_nspr_ver_major"
-
+
+
+
+
-])