diff --git a/src/configure.in b/src/configure.in
index 881cadf0..a09d597e 100644
--- a/src/configure.in
+++ b/src/configure.in
@@ -5,12 +5,12 @@ AC_SUBST(PROGS)dnl
 AC_PROG_CC
 AC_PROG_CPP
 AC_GCC_TRADITIONAL
-AC_CONST
 AC_PROG_INSTALL
 AC_PROG_YACC
 AC_AIX
 AC_MINIX
 AC_ISC_POSIX
+AC_CONST
 AC_RETSIGTYPE
 AC_SIZE_T
 AC_MAJOR_HEADER
@@ -49,7 +49,7 @@ AC_ALLOCA
 echo checking for BSD
 ( test -f /vmunix || test -f /sdmach || test -f /../../mach ) && AC_DEFINE(BSD42)
 echo checking for HP-UX
-test -f /hp-ux && test ! -f /vmunix && MALLOC=malloc.o
+test "`(uname -s) 2> /dev/null`" = 'HP-UX' && MALLOC=malloc.o
 AC_SUBST(MALLOC)
 AC_XENIX_DIR
 AC_HAVE_LIBRARY(socket, [LIBS="$LIBS -lsocket"])