diff --git a/autogen/config.in b/autogen/config.in
index 10cc3c68196..12bfc70b090 100644
--- a/autogen/config.in
+++ b/autogen/config.in
@@ -1130,6 +1130,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* Define to 1 if you have the `_ftime' function. */
 #undef HAVE__FTIME
 
+/* Define to 1 if you have the `_putenv' function. */
+#undef HAVE__PUTENV
+
 /* Define to 1 if _setjmp and _longjmp work. */
 #undef HAVE__SETJMP
 
@@ -1570,13 +1573,16 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    _GL_INLINE_HEADER_END contains useful stuff to put
      in the same include file, after uses of _GL_INLINE.
 
+   Suppress extern inline with HP-UX cc, as it appears to be broken; see
+   <http://lists.gnu.org/archive/html/bug-texinfo/2013-02/msg00030.html>.
+
    Suppress the use of extern inline on Apple's platforms,
    as Libc-825.25 (2012-09-19) is incompatible with it; see
    <http://lists.gnu.org/archive/html/bug-gnulib/2012-12/msg00023.html>.
    Perhaps Apple will fix this some day.  */
 #if ((__GNUC__ \
       ? defined __GNUC_STDC_INLINE__ && __GNUC_STDC_INLINE__ \
-      : 199901L <= __STDC_VERSION__) \
+      : 199901L <= __STDC_VERSION__ && !defined __HP_cc) \
      && !defined __APPLE__)
 # define _GL_INLINE inline
 # define _GL_EXTERN_INLINE extern inline
diff --git a/autogen/configure b/autogen/configure
index b8ced336979..a1844067f9d 100755
--- a/autogen/configure
+++ b/autogen/configure
@@ -23273,6 +23273,19 @@ $as_echo "$gl_cv_func_svid_putenv" >&6; }
 
   gl_LIBOBJS="$gl_LIBOBJS putenv.$ac_objext"
 
+
+  for ac_func in _putenv
+do :
+  ac_fn_c_check_func "$LINENO" "_putenv" "ac_cv_func__putenv"
+if test "x$ac_cv_func__putenv" = x""yes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE__PUTENV 1
+_ACEOF
+
+fi
+done
+
+
   fi