[pull] master from akopytov:master

.github/workflows/ci.yml

@@ -0,0 +1,51 @@
+name: CI
+on: [push, pull_request]
+
+jobs:
+  build:
+    strategy:
+      matrix:
+        os: [ ubuntu-22.04, ubuntu-20.04 ]
+    runs-on: ${{ matrix.os }}
+    name: Build on ${{ matrix.os }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Autogen
+        run: ./autogen.sh
+      - name: Configure
+        run: ./configure --with-mysql --with-pgsql
+      - name: Build
+        run: make
+      - name: MySQL version
+        run: mysql_config --version
+      - name: Sysbench version
+        run: ./src/sysbench --version
+      - name: Test
+        run: make test
+
+  build_mariadb:
+    runs-on: ubuntu-22.04
+    name: Build with MariaDB
+    steps:
+      - name: Setup MariaDB Repo
+        run: |
+          sudo apt-get install software-properties-common
+          sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8
+          sudo add-apt-repository 'deb [arch=amd64] https://ftp.nluug.nl/db/mariadb/repo/11.0/ubuntu jammy main'
+      - name: Setup MariaDB Libs
+        run: sudo apt install libmariadb-dev libmariadb-dev-compat
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Autogen
+        run: ./autogen.sh
+      - name: Configure
+        run: ./configure --with-mysql --with-pgsql
+      - name: Build
+        run: make
+      - name: MariaDB version
+        run: mariadb_config --version
+      - name: Sysbench version
+        run: ./src/sysbench --version
+      - name: Test
+        run: make test

README.md

@@ -1,5 +1,5 @@
 [![Latest Release][release-badge]][release-url]
-[![Build Status][travis-badge]][travis-url]
+[![Build Status][action-badge]][action-url]
 [![Debian Packages][deb-badge]][deb-url]
 [![RPM Packages][rpm-badge]][rpm-url]
 [![Coverage Status][coveralls-badge]][coveralls-url]
@@ -298,8 +298,8 @@ For more information on SemVer, please visit [http://semver.org/](http://semver.
 
 [coveralls-badge]: https://coveralls.io/repos/github/akopytov/sysbench/badge.svg?branch=master
 [coveralls-url]: https://coveralls.io/github/akopytov/sysbench?branch=master
-[travis-badge]: https://travis-ci.org/akopytov/sysbench.svg?branch=master
-[travis-url]: https://travis-ci.org/akopytov/sysbench?branch=master
+[action-url]: https://github.com/akopytov/sysbench/actions/workflows/ci.yml
+[action-badge]: https://github.com/akopytov/sysbench/actions/workflows/ci.yml/badge.svg
 [license-badge]: https://img.shields.io/badge/license-GPLv2-blue.svg
 [license-url]: COPYING
 [release-badge]: https://img.shields.io/github/release/akopytov/sysbench.svg

configure.ac

@@ -1,8 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ(2.63)
-AC_INIT([sysbench],[1.1.0],[https://github.com/akopytov/sysbench/issues],
-        [sysbench], [https://github.com/akopytov/sysbench])
+AC_PREREQ([2.63])
+AC_INIT([sysbench],[1.1.0],[https://github.com/akopytov/sysbench/issues],[sysbench],[https://github.com/akopytov/sysbench])
 AC_CONFIG_AUX_DIR([config])
 
 # Define m4_ifblank and m4_ifnblank macros from introduced in
@@ -31,7 +30,7 @@ CXXFLAGS=${SAVE_CXXFLAGS}
 
 AM_INIT_AUTOMAKE([-Wall -Werror foreign])
 AC_CONFIG_SRCDIR([src/sysbench.c])
-AC_CONFIG_HEADER([config/config.h])
+AC_CONFIG_HEADERS([config/config.h])
 AC_CONFIG_MACRO_DIR([m4])
 
 m4_pattern_forbid([^PKG_[A-Z_]+$],
@@ -40,7 +39,6 @@ m4_pattern_forbid([^PKG_[A-Z_]+$],
 ACX_USE_SYSTEM_EXTENSIONS
 
 AC_PROG_CC
-AC_PROG_CC_C99
 AC_PROG_CPP
 AM_PROG_CC_C_O
 
@@ -58,7 +56,7 @@ AS_CASE([$CFLAGS],
 
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 
-AC_PROG_LIBTOOL
+LT_INIT
 
 AC_CHECK_PROG(sb_have_pkg_config, pkg-config, yes, no)
 if test x"$sb_have_pkg_config" = xno; then
@@ -73,10 +71,17 @@ AC_LIB_PREFIX()
 
 CPPFLAGS="-D_GNU_SOURCE ${CPPFLAGS}"
 
-# Mac OS X requires _DARWIN_C_SOURCE for valloc(3) to be visible
-case "${host_cpu}-${host_os}" in
-	*-darwin*) CPPFLAGS="-D_DARWIN_C_SOURCE ${CPPFLAGS}";;
-esac
+AM_CONDITIONAL([IS_MACOS], [test "$host_os" = "darwin"])
+
+if test "$host_os" = "darwin"; then
+   # MacOS requires _DARWIN_C_SOURCE for valloc(3) to be visible
+	CPPFLAGS="-D_DARWIN_C_SOURCE ${CPPFLAGS}"
+  # LuaJIT also requires MACOSX_DEPLOYMENT_TARGET to be set on MacOS
+  if test -z "$MACOSX_DEPLOYMENT_TARGET"; then
+     MACOSX_DEPLOYMENT_TARGET="$(sw_vers -productVersion)"
+  fi
+  AC_SUBST(MACOSX_DEPLOYMENT_TARGET, $MACOSX_DEPLOYMENT_TARGET)
+fi
 
 # Build optimized or debug version ?
 # First check for gcc and g++
@@ -199,9 +204,6 @@ AC_SUBST([USE_PGSQL])
 AC_CHECK_AIO
 AM_CONDITIONAL(USE_AIO, test x$enable_aio = xyes)
 
-# Checks for header files.
-AC_HEADER_STDC
-
 AC_CHECK_HEADERS([ \
 errno.h \
 fcntl.h \
@@ -225,7 +227,7 @@ libgen.h \
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_TYPE_OFF_T
-AC_HEADER_TIME
+
 AX_TLS([],
   AC_MSG_ERROR([thread-local storage is not suppored by the target platform!])
 )

m4/ac_check_pgsql.m4

@@ -10,7 +10,7 @@ AC_DEFUN([AC_CHECK_PGSQL],[
 if test [ -z "$ac_cv_pgsql_includes" ] 
 then 
     AC_ARG_WITH([pgsql-includes], 
-                AC_HELP_STRING([--with-pgsql-includes], [path to PostgreSQL header files]),
+                AS_HELP_STRING([--with-pgsql-includes], [path to PostgreSQL header files]),
                 [ac_cv_pgsql_includes=$withval])
 fi
 if test [ -n "$ac_cv_pgsql_includes" ]
@@ -24,7 +24,7 @@ fi
 if test [ -z "$ac_cv_pgsql_libs" ]
 then
     AC_ARG_WITH([pgsql-libs], 
-                AC_HELP_STRING([--with-pgsql-libs], [path to PostgreSQL libraries]),
+                AS_HELP_STRING([--with-pgsql-libs], [path to PostgreSQL libraries]),
                 [ac_cv_pgsql_libs=$withval])
 fi
 

m4/ax_tls.m4

@@ -44,31 +44,28 @@
 #   modified version of the Autoconf Macro, you may extend this special
 #   exception to the GPL to apply to your modified version as well.
 
-#serial 14
+#serial 15
 
 AC_DEFUN([AX_TLS], [
   AC_MSG_CHECKING([for thread local storage (TLS) class])
   AC_CACHE_VAL([ac_cv_tls],
    [for ax_tls_keyword in thread_local _Thread_local __thread '__declspec(thread)' none; do
        AS_CASE([$ax_tls_keyword],
           [none], [ac_cv_tls=none ; break],
-          [AC_TRY_COMPILE(
-              [#include <stdlib.h>
-               static void
-               foo(void) {
-               static ] $ax_tls_keyword [ int bar;
-               exit(1);
-               }],
-               [],
-               [ac_cv_tls=$ax_tls_keyword ; break],
-               ac_cv_tls=none
-           )])
-    done
-  ])
+          [AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+              [#include <stdlib.h>],
+              [static  $ax_tls_keyword  int bar;]
+            )],
+            [ac_cv_tls=$ax_tls_keyword ; break],
+            [ac_cv_tls=none]
+          )]
+        )
+    done ]
+  )
   AC_MSG_RESULT([$ac_cv_tls])
 
   AS_IF([test "$ac_cv_tls" != "none"],
-    [AC_DEFINE_UNQUOTED([TLS],[$ac_cv_tls],[If the compiler supports a TLS storage class define it to that here])
-     m4_ifnblank([$1],[$1])],
-    [m4_ifnblank([$2],[$2])])
+    [AC_DEFINE_UNQUOTED([TLS],[$ac_cv_tls],[If the compiler supports a TLS storage class, define it to that here])
+     m4_ifnblank([$1],[$1],[[:]])],
+    [m4_ifnblank([$2],[$2],[[:]])])
 ])