Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Replace manual HAVE_* definition for sqlite by discovered one to help portability
Baptiste Daroussin committed 12 years ago
commit d857b93f65e13f3dd6bdde3c09e902b5a7533bf0
parent 7fa56e5
3 files changed +18 -16
modified configure.ac
@@ -33,6 +33,20 @@ AC_CHECK_HEADERS_ONCE([endian.h])
AC_CHECK_HEADERS_ONCE([fcntl.h])
AC_CHECK_HEADERS_ONCE([dlfcn.h])
AC_CHECK_HEADERS_ONCE([memory.h])
+
AC_CHECK_HEADERS_ONCE([sys/types.h])
+
AC_CHECK_HEADERS_ONCE([sys/stat.h])
+
AC_CHECK_HEADERS_ONCE([stdlib.h])
+
AC_CHECK_HEADERS_ONCE([string.h])
+
AC_CHECK_HEADERS_ONCE([memory.h])
+
AC_CHECK_HEADERS_ONCE([inttypes.h])
+
AC_CHECK_HEADERS_ONCE([unistd.h])
+
AC_CHECK_HEADERS_ONCE([dlfcn.h])
+

+
AC_CHECK_FUNCS_ONCE([posix_fallocate])
+
AC_CHECK_FUNCS_ONCE([usleep])
+
AC_CHECK_FUNCS_ONCE([localtime_r])
+
AC_CHECK_FUNCS_ONCE([gmtime_r])
+
AC_CHECK_FUNCS_ONCE([strerror_r])

AC_DEFUN([AC_PROG_GIT], [AC_CHECK_PROG(GITBIN,git,yes)])
AC_PROG_GIT
modified external/Makefile.am
@@ -169,22 +169,7 @@ libyaml_static_la_SOURCES= $(libyaml_la_SOURCES)
libyaml_static_la_CFLAGS= $(yaml_common_cflags) -static
libyaml_static_la_LDFLAGS=	-all-static

-
sqlite_common_cflags=	-DHAVE_POSIX_FALLOCATE=1 \
-
			-DHAVE_SYS_TYPES_H=1 \
-
			-DHAVE_SYS_STAT_H=1 \
-
			-DHAVE_STDLIB_H=1 \
-
			-DHAVE_STRING_H=1 \
-
			-DHAVE_MEMORY_H=1 \
-
			-DHAVE_STRINGS_H=1 \
-
			-DHAVE_INTTYPES_H=1 \
-
			-DHAVE_STDINT_H=1 \
-
			-DHAVE_UNISTD_H=1 \
-
			-DHAVE_DLFCN_H=1 \
-
			-DHAVE_USLEEP=1 \
-
			-DHAVE_LOCALTIME_R=1 \
-
			-DHAVE_GMTIME_R=1 \
-
			-DHAVE_DECL_STRERROR_R=1 \
-
			-DHAVE_STRERROR_R=1 \
+
sqlite_common_cflags=	-DHAVE_SQLITE_CONFIG_H \
			-Wno-unused-variable \
			-Wno-unused-function \
			-Wno-strict-aliasing \
added external/sqlite/config.h
@@ -0,0 +1,3 @@
+
#ifdef HAVE_CONFIG_H
+
#include "pkg_config.h"
+
#endif