Skip to content
Permalink
Browse files

Merge branch 's3_support' of github.com:boxbackup/boxbackup into s3_s…

…upport
  • Loading branch information
qris committed Jun 24, 2017
2 parents 8f9d9db + a042c99 commit ef99b539822d6d4792a0ef647c43bd9f007a3c79
Showing with 12 additions and 11 deletions.
  1. +6 −4 infrastructure/cmake/CMakeLists.txt
  2. +1 −2 infrastructure/m4/boxbackup_tests.m4
  3. +5 −5 lib/intercept/intercept.h
@@ -388,9 +388,6 @@ if(WIN32)
target_link_libraries(lib_common PUBLIC dbghelp ws2_32 gdi32)
endif()

# Link to ZLib
# http://stackoverflow.com/a/6174604/648162
include_directories(${base_dir}/../zlib-win32/include)
# On Windows we want to statically link zlib to make debugging and distribution easier,
# but FindZLIB.cmake doesn't offer that as an option, so we have to go through some
# contortions to "find" the correct library. ZLIB_ROOT is required in this case.
@@ -446,6 +443,11 @@ else()
include_directories(${PCRE_INCLUDE_DIRS})
target_link_libraries(lib_common PUBLIC ${PCRE_LIBRARIES})

if(NOT PCRE_FOUND)
# You must use pkg-config. PCRE_ROOT is not used except on Win32.
message(FATAL_ERROR "Please install libpcre and ensure that pkg-config --list-all can find it")
endif()

if(DEBUG)
message(STATUS "Linking PCRE libraries from ${PCRE_LIBRARY_DIRS}: ${PCRE_LIBRARIES}")
endif()
@@ -600,7 +602,7 @@ foreach(header_file ${detect_header_files})
endforeach()

if(NOT HAVE_PCREPOSIX_H)
message(FATAL_ERROR "pcreposix.h not found at PCRE_ROOT/include: ${PCRE_ROOT}/include")
message(FATAL_ERROR "pcreposix.h not found even though PCRE was apparently detected?!")
endif()

# PCRE is required, so unconditionally define this:
@@ -328,9 +328,8 @@ AX_CHECK_MALLOC_WORKAROUND
AC_FUNC_CLOSEDIR_VOID
AC_FUNC_ERROR_AT_LINE
AC_TYPE_SIGNAL
AC_FUNC_STAT
AC_CHECK_FUNCS([ftruncate getpeereid getpeername getpid getpwuid gettimeofday lchown])
AC_CHECK_FUNCS([setproctitle utimensat])
AC_CHECK_FUNCS([setproctitle utimensat __lxstat __lxstat64])
AC_SEARCH_LIBS([setproctitle], [bsd])

# NetBSD implements kqueue too differently for us to get it fixed by 0.10
@@ -34,15 +34,15 @@ extern "C"
typedef struct dirent *(readdir_t) (DIR *dir);
typedef struct dirent *(readdir_t) (DIR *dir);
typedef int (closedir_t)(DIR *dir);
#if defined __GNUC__ && __GNUC__ >= 2
#if defined HAVE___LXSTAT64 || defined HAVE___LXSTAT
// Linux glibc implements the stat function using inline redirection
// to __lxstat(64), so that's what we have to intercept.
#define LINUX_WEIRD_LSTAT
#define STAT_STRUCT struct stat /* should be stat64 */
typedef int (lstat_t) (int ver, const char *file_name,
STAT_STRUCT *buf);
typedef int (lstat_t) (int ver, const char *file_name, STAT_STRUCT *buf);
#else
#define STAT_STRUCT struct stat
typedef int (lstat_t) (const char *file_name,
STAT_STRUCT *buf);
typedef int (lstat_t) (const char *file_name, STAT_STRUCT *buf);
#endif
}

0 comments on commit ef99b53

Please sign in to comment.
You can’t perform that action at this time.