2 files changed, 9 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fccb46f788e..26a93dbd817 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,7 @@
 2012-07-31  Glenn Morris  <rgm@gnu.org>
 
+        * conf_post.h [HPUX]: Undefine HAVE_RANDOM and HAVE_RINT.
+
         * conf_post.h (AMPERSAND_FULL_NAME, subprocesses):
         Move to configure.ac.
 
diff --git a/src/conf_post.h b/src/conf_post.h
index f8b76a1b19e..aa09ae7228c 100644
--- a/src/conf_post.h
+++ b/src/conf_post.h
@@ -71,11 +71,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    renaming the functions via macros.  The system's stdlib.h has fully
    prototyped declarations, which yields a conflicting definition of
    srand48; it tries to redeclare what was once srandom to be srand48.
-   So we go with HAVE_LRAND48 being defined.  Note we also undef
-   HAVE_RANDOM via configure.  */
+   So we go with HAVE_LRAND48 being defined.  */
 #ifdef HPUX
 #undef srandom
 #undef random
+/* We try to avoid checking for random and rint on hpux in
+   configure.ac, but some other configure test might check for them as
+   a dependency, so to be safe we also undefine them here.
+ */
+#undef HAVE_RANDOM
+#undef HAVE_RINT
 #endif
 
 #ifdef IRIX6_5