4 files changed, 17 insertions, 21 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 18fb262..269038c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -515,6 +515,11 @@ if(HAVE_SYSLOG)
         add_definitions(-DHAVE_SYSLOG)
 endif()
 
+check_function_exists(vsyslog HAVE_VSYSLOG)
+if(HAVE_VSYSLOG)
+        add_definitions(-DHAVE_VSYSLOG)
+endif()
+
 check_symbol_exists(timespecsub sys/time.h HAVE_TIMESPECSUB)
 if(HAVE_TIMESPECSUB)
         add_definitions(-DHAVE_TIMESPECSUB)
diff --git a/crypto/compat/syslog_r.c b/crypto/compat/syslog_r.c
index d68169d..30841c1 100644
--- a/crypto/compat/syslog_r.c
+++ b/crypto/compat/syslog_r.c
@@ -1,3 +1,5 @@
+#include <stdio.h>
+#include <stdlib.h>
 #include <syslog.h>
 
 void
@@ -14,6 +16,15 @@ void
 vsyslog_r(int pri, struct syslog_data *data, const char *fmt, va_list ap)
 {
 #ifdef HAVE_SYSLOG
+#ifdef HAVE_VSYSLOG
         vsyslog(pri, fmt, ap);
+#else
+        char *msg = NULL;
+
+        if (vasprintf(&msg, fmt, ap) == -1)
+                return;
+        syslog(pri, "%s", msg);
+        free(msg);
+#endif
 #endif
 }
diff --git a/include/compat/syslog.h b/include/compat/syslog.h
index 3528eb3..c7a2608 100644
--- a/include/compat/syslog.h
+++ b/include/compat/syslog.h
@@ -36,23 +36,3 @@ void vsyslog_r(int, struct syslog_data *, const char *, va_list);
 #endif
 
 #endif
-
-#ifdef _AIX
-#ifdef HAVE_SYSLOG
-#include <stdlib.h>
-void vsyslog(int facility_priority, const char *format, va_list arglist) {
-        char *msg = NULL;
-        vasprintf(&msg, format, arglist);
-
-        if (!msg)
-                return;
-
-        syslog(facility_priority, "%s", msg);
-        free(msg);
-}
-#endif /* HAVE_SYSLOG */
-
-void vsyslog_r(int pri, struct syslog_data *data, const char *fmt, va_list ap) {
-        vsyslog(pri, fmt, ap);
-}
-#endif /* AIX */
diff --git a/m4/check-libc.m4 b/m4/check-libc.m4
index 8ecc89a..7ac1a10 100644
--- a/m4/check-libc.m4
+++ b/m4/check-libc.m4
@@ -26,7 +26,7 @@ AC_CHECK_FUNCS([asprintf freezero ftruncate getdelim getline memmem])
 AC_CHECK_FUNCS([readpassphrase reallocarray recallocarray])
 AC_CHECK_FUNCS([strcasecmp strlcat strlcpy strndup strnlen strsep strtonum])
 AC_CHECK_FUNCS([timegm _mkgmtime timespecsub])
-AC_CHECK_FUNCS([getopt getprogname syslog syslog_r])
+AC_CHECK_FUNCS([getopt getprogname syslog syslog_r vsyslog])
 AC_CACHE_CHECK([for getpagesize], ac_cv_func_getpagesize, [
         AC_LINK_IFELSE([AC_LANG_PROGRAM([[
 #include <unistd.h>