db/pgbackrest
1
0
Fork 0
mirror of https://github.com/pgbackrest/pgbackrest.git synced 2025-09-16 09:06:18 +02:00
Code Issues Releases Activity

Add separators to make configure.ac easier to read.

Browse Source
This commit is contained in:
David Steele
2020-03-12 09:50:10 -04:00
parent ccdf4bf3cc
commit c3b6bd2e83
2 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/build/configure.ac
View File

@@ -1,12 +1,15 @@
# Initialize configuration
# ----------------------------------------------------------------------------------------------------------------------------------
AC_PREREQ([2.69])
AC_INIT([pgBackRest], [2.25dev])
AC_CONFIG_SRCDIR([version.h])
# Check compiler
# Check compiler supports C99 standard
# ----------------------------------------------------------------------------------------------------------------------------------
AC_PROG_CC_C99
# Enable internal test code and assertions by undefining NDEBUG
# Set warnings and optimizations based on build type (i.e. production or test)
# ----------------------------------------------------------------------------------------------------------------------------------
warning='-Wall -Wextra -Wno-clobbered -Wno-missing-field-initializers'
AC_ARG_ENABLE(
@@ -30,18 +33,22 @@ else
AC_SUBST(CWARNING, "$warning -Wwrite-strings -Wconversion -Wformat=2 -Wformat-nonliteral -Wstrict-prototypes -Wpointer-arith -Wvla")
fi
# Set includes
# Include the build directory
# ----------------------------------------------------------------------------------------------------------------------------------
AC_SUBST(CINCLUDE, "-I.")
# Check required pq library
# ----------------------------------------------------------------------------------------------------------------------------------
AC_CHECK_LIB([pq], [PQconnectdb], [], [AC_MSG_ERROR([library 'pq' is required])])
AC_SUBST(CINCLUDE, "$CINCLUDE -I`pg_config --includedir`")
# Check required openssl libraries
# ----------------------------------------------------------------------------------------------------------------------------------
AC_CHECK_LIB([crypto], [EVP_get_digestbyname], [], [AC_MSG_ERROR([library 'crypto' is required])])
AC_CHECK_LIB([ssl], [SSL_new], [], [AC_MSG_ERROR([library 'ssl' is required])])
# Check required xml library
# ----------------------------------------------------------------------------------------------------------------------------------
AC_ARG_VAR(XML2_CONFIG, [path to xml2 config utility])dnl
if test -z "$XML2_CONFIG"; then
@@ -55,12 +62,15 @@ AC_CHECK_HEADER(libxml/parser.h, [], [AC_MSG_ERROR([header file <libxml/parser.h
AC_SUBST(CLIBRARY, "$CLIBRARY `pkg-config libxml-2.0 --cflags`")
# Check required gz library
# ----------------------------------------------------------------------------------------------------------------------------------
AC_CHECK_LIB([z], [deflate], [], [AC_MSG_ERROR([library 'z' is required])])
# Check optional lz4 library
# ----------------------------------------------------------------------------------------------------------------------------------
AC_CHECK_LIB([lz4], [LZ4F_isError])
# Write output
# ----------------------------------------------------------------------------------------------------------------------------------
AC_CONFIG_HEADERS([build.auto.h])
AC_CONFIG_FILES([Makefile])
AC_OUTPUT

15
src/configure vendored
View File

@@ -2041,7 +2041,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Check compiler
# Check compiler supports C99 standard
# ----------------------------------------------------------------------------------------------------------------------------------
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3009,7 +3010,8 @@ fi
# Enable internal test code and assertions by undefining NDEBUG
# Set warnings and optimizations based on build type (i.e. production or test)
# ----------------------------------------------------------------------------------------------------------------------------------
warning='-Wall -Wextra -Wno-clobbered -Wno-missing-field-initializers'
# Check whether --enable-test was given.
@@ -3045,11 +3047,13 @@ else
fi
# Set includes
# Include the build directory
# ----------------------------------------------------------------------------------------------------------------------------------
CINCLUDE="-I."
# Check required pq library
# ----------------------------------------------------------------------------------------------------------------------------------
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for PQconnectdb in -lpq" >&5
$as_echo_n "checking for PQconnectdb in -lpq... " >&6; }
@@ -3102,6 +3106,7 @@ CINCLUDE="$CINCLUDE -I`pg_config --includedir`"
# Check required openssl libraries
# ----------------------------------------------------------------------------------------------------------------------------------
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for EVP_get_digestbyname in -lcrypto" >&5
$as_echo_n "checking for EVP_get_digestbyname in -lcrypto... " >&6; }
if ${ac_cv_lib_crypto_EVP_get_digestbyname+:} false; then :
@@ -3198,6 +3203,7 @@ fi
# Check required xml library
# ----------------------------------------------------------------------------------------------------------------------------------
if test -z "$XML2_CONFIG"; then
XML2_CONFIG="pkg-config libxml-2.0"
@@ -3661,6 +3667,7 @@ CLIBRARY="$CLIBRARY `pkg-config libxml-2.0 --cflags`"
# Check required gz library
# ----------------------------------------------------------------------------------------------------------------------------------
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5
$as_echo_n "checking for deflate in -lz... " >&6; }
if ${ac_cv_lib_z_deflate+:} false; then :
@@ -3710,6 +3717,7 @@ fi
# Check optional lz4 library
# ----------------------------------------------------------------------------------------------------------------------------------
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LZ4F_isError in -llz4" >&5
$as_echo_n "checking for LZ4F_isError in -llz4... " >&6; }
if ${ac_cv_lib_lz4_LZ4F_isError+:} false; then :
@@ -3757,6 +3765,7 @@ fi
# Write output
# ----------------------------------------------------------------------------------------------------------------------------------
ac_config_headers="$ac_config_headers build.auto.h"
ac_config_files="$ac_config_files Makefile"