diff --git a/ChangeLog b/ChangeLog
index f3c53e606..75c7b00ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Feb 16 13:45:01 EET 2008 (edwin)
+------------------------------------
+  * configure, configure.in: AC_TRY_COMPILE already wraps its args with int
+			     main(){}, don't do it twice
+			     This fixes a build failure on HP-UX
+
 Sat Feb 16 12:52:55 EET 2008 (edwin)
 ------------------------------------
   * libclamav/Makefile.am: fix location of nsis headers, needed for
diff --git a/configure b/configure
index 70ae3a890..ce5eec826 100755
--- a/configure
+++ b/configure
@@ -15668,7 +15668,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; }
+in_port_t pt; pt = 0; return pt;
   ;
   return 0;
 }
@@ -15724,7 +15724,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 int
 main ()
 {
-int main(int argc, char **argv) { in_addr_t pt; pt = 0; return pt; }
+ in_addr_t pt; pt = 0; return pt;
   ;
   return 0;
 }
@@ -16816,14 +16816,12 @@ int
 main ()
 {
 
-int main(void) {
 #ifdef msg_accrights
 #error msg_accrights defined
 #endif
 struct msghdr m;
 m.msg_accrights = 0;
 return 0;
-}
 
 
   ;
@@ -16889,14 +16887,12 @@ int
 main ()
 {
 
-int main(void) {
 #ifdef msg_control
 #error msg_control defined
 #endif
 struct msghdr m;
 m.msg_control = 0;
 return 0;
-}
 
   ;
   return 0;
diff --git a/configure.in b/configure.in
index 5829645b9..d844f8d19 100644
--- a/configure.in
+++ b/configure.in
@@ -630,7 +630,7 @@ AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <netinet/in.h>
 ],
-[int main(int argc, char **argv) { in_port_t pt; pt = 0; return pt; }],
+[in_port_t pt; pt = 0; return pt;],
 [
     AC_MSG_RESULT(yes)
     AC_DEFINE([HAVE_IN_PORT_T],1,[in_port_t is defined])
@@ -643,7 +643,7 @@ AC_TRY_COMPILE([
 #include <sys/types.h>
 #include <netinet/in.h>
 ],
-[int main(int argc, char **argv) { in_addr_t pt; pt = 0; return pt; }],
+[ in_addr_t pt; pt = 0; return pt; ],
 [
     AC_MSG_RESULT(yes)
     AC_DEFINE([HAVE_IN_ADDR_T],1,[in_addr_t is defined])
@@ -947,14 +947,12 @@ AC_CACHE_CHECK([for msg_accrights field in struct msghdr],
 #include <sys/uio.h>
 ],
 [
-int main(void) {
 #ifdef msg_accrights
 #error msg_accrights defined
 #endif
 struct msghdr m;
 m.msg_accrights = 0;
 return 0;
-}
 ]
 , [ac_cv_have_accrights_in_msghdr="yes"],[ac_cv_have_accrights_in_msghdr="no"])
 ])
@@ -971,14 +969,12 @@ AC_CACHE_CHECK([for msg_control field in struct msghdr],
 #include <sys/uio.h>
 ],
 [
-int main(void) {
 #ifdef msg_control
 #error msg_control defined
 #endif
 struct msghdr m;
 m.msg_control = 0;
 return 0;
-}
 ], [ ac_cv_have_control_in_msghdr="yes" ], [ ac_cv_have_control_in_msghdr="no" ])
 ])
 if test "x$ac_cv_have_control_in_msghdr" = "xyes" ; then