Skip to content

Commit 04b763c

Browse files
committed
Merge pull request #53 from evoskuil/master
Generate autogen, add local headers for dist.
2 parents f2bf117 + 1e25005 commit 04b763c

File tree

13 files changed

+991
-8
lines changed

13 files changed

+991
-8
lines changed

Makefile.am

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,41 @@ src_bitcoin_server_CPPFLAGS = -I${srcdir}/include -DSYSCONFDIR=\"${sysconfdir}\"
3535
src_bitcoin_server_LDADD = ${bitcoin_node_LIBS} ${sodium_LIBS} ${czmq___LIBS}
3636
src_bitcoin_server_SOURCES = \
3737
src/config.cpp \
38+
src/config.hpp \
3839
src/echo.cpp \
40+
src/echo.hpp \
3941
src/endpoint.cpp \
42+
src/endpoint.hpp \
4043
src/main.cpp \
4144
src/message.cpp \
45+
src/message.hpp \
4246
src/node_impl.cpp \
47+
src/node_impl.hpp \
4348
src/publisher.cpp \
49+
src/publisher.hpp \
4450
src/server.cpp \
51+
src/server.hpp \
4552
src/settings.cpp \
53+
src/settings.hpp \
4654
src/subscribe_manager.cpp \
55+
src/subscribe_manager.hpp \
56+
src/version.hpp \
57+
src/worker-output.sh \
4758
src/worker.cpp \
59+
src/worker.hpp \
4860
src/service/blockchain.cpp \
61+
src/service/blockchain.hpp \
4962
src/service/compat.cpp \
63+
src/service/compat.hpp \
5064
src/service/fetch_x.cpp \
65+
src/service/fetch_x.hpp \
5166
src/service/fullnode.cpp \
67+
src/service/fullnode.hpp \
5268
src/service/protocol.cpp \
53-
src/service/transaction_pool.cpp
69+
src/service/protocol.hpp \
70+
src/service/transaction_pool.cpp \
71+
src/service/transaction_pool.hpp \
72+
src/service/util.hpp
5473

5574
# files => ${bash_completiondir}
5675
#------------------------------------------------------------------------------

autogen.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1-
#!/bin/bash
2-
autoreconf -i
1+
#!/bin/sh
2+
###############################################################################
3+
# Copyright (c) 2014-2015 libbitcoin-server developers (see COPYING).
4+
#
5+
# GENERATED SOURCE CODE, DO NOT EDIT EXCEPT EXPERIMENTALLY
6+
#
7+
###############################################################################
38

9+
autoreconf -i

builds/msvc/properties/ReleaseDEXE.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
<ItemDefinitionGroup>
1515
<ClCompile>
16-
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
16+
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
1717
</ClCompile>
1818
</ItemDefinitionGroup>
1919

configure.ac

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ AS_CASE([${CC}], [*clang*],
125125
AC_MSG_NOTICE([boost_LDFLAGS : ${boost_LDFLAGS}])],
126126
[AC_MSG_ERROR([Boost 1.54.0 or later is required but was not found.])])])
127127

128-
# Require bash-completion of at least version 2.0.0 and output ${bash_completion_CFLAGS/LIBS/PKG}.
128+
# Require bash-completion of at least version 2.0.0 and output ${bash_completion_CPPFLAGS/LIBS/PKG}.
129129
#------------------------------------------------------------------------------
130130
AS_CASE([${bash_completiondir}], [yes],
131131
[PKG_CHECK_MODULES([bash_completion], [bash-completion >= 2.0.0],
@@ -137,7 +137,7 @@ AS_CASE([${bash_completiondir}], [yes],
137137
AC_MSG_NOTICE([bash_completion_LIBS : ${bash_completion_LIBS}])],
138138
[AC_SUBST([bash_completion_PKG], [])])
139139

140-
# Require sodium of at least version 1.0.0 and output ${sodium_CFLAGS/LIBS/PKG}.
140+
# Require sodium of at least version 1.0.0 and output ${sodium_CPPFLAGS/LIBS/PKG}.
141141
#------------------------------------------------------------------------------
142142
# The chained zmq dependency doesn't set a minimum version for sodium.
143143
PKG_CHECK_MODULES([sodium], [libsodium >= 1.0.0])
@@ -146,15 +146,15 @@ AC_SUBST([sodium_CPPFLAGS], [${sodium_CFLAGS}])
146146
AC_MSG_NOTICE([sodium_CPPFLAGS : ${sodium_CPPFLAGS}])
147147
AC_MSG_NOTICE([sodium_LIBS : ${sodium_LIBS}])
148148

149-
# Require czmq++ of at least version 1.1.0 and output ${czmq___CFLAGS/LIBS/PKG}.
149+
# Require czmq++ of at least version 1.1.0 and output ${czmq___CPPFLAGS/LIBS/PKG}.
150150
#------------------------------------------------------------------------------
151151
PKG_CHECK_MODULES([czmq__], [libczmq++ >= 1.1.0])
152152
AC_SUBST([czmq___PKG], ['libczmq++ >= 1.1.0'])
153153
AC_SUBST([czmq___CPPFLAGS], [${czmq___CFLAGS}])
154154
AC_MSG_NOTICE([czmq___CPPFLAGS : ${czmq___CPPFLAGS}])
155155
AC_MSG_NOTICE([czmq___LIBS : ${czmq___LIBS}])
156156

157-
# Require bitcoin-node of at least version 2.0.0 and output ${bitcoin_node_CFLAGS/LIBS/PKG}.
157+
# Require bitcoin-node of at least version 2.0.0 and output ${bitcoin_node_CPPFLAGS/LIBS/PKG}.
158158
#------------------------------------------------------------------------------
159159
PKG_CHECK_MODULES([bitcoin_node], [libbitcoin-node >= 2.0.0])
160160
AC_SUBST([bitcoin_node_PKG], ['libbitcoin-node >= 2.0.0'])

install.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ echo " with_pkgconfigdir: $with_pkgconfigdir"
172172
BOOST_OPTIONS_GCC=\
173173
"threading=multi "\
174174
"variant=release "\
175+
"--with-chrono "\
175176
"--with-date_time "\
176177
"--with-filesystem "\
177178
"--with-locale "\
@@ -192,6 +193,7 @@ BOOST_OPTIONS_CLANG=\
192193
"linkflags=-stdlib=${boost_stdlib} "\
193194
"threading=multi "\
194195
"variant=release "\
196+
"--with-chrono "\
195197
"--with-date_time "\
196198
"--with-filesystem "\
197199
"--with-locale "\

m4/ax_java_devel.m4

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
# Java discovery wrapper, defines JAVA_CPPFLAGS.
2+
3+
AC_DEFUN([AX_JAVA_DEVEL], [
4+
5+
AX_PROG_JAVAC
6+
AX_PROG_JAVA
7+
AX_PROG_JAR
8+
AX_JNI_INCLUDE_DIR
9+
AC_PROG_MKDIR_P
10+
11+
JAVA_CPPFLAGS=
12+
for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS; do
13+
JAVA_CPPFLAGS="$JAVA_CPPFLAGS -I$JNI_INCLUDE_DIR"
14+
done
15+
16+
# Set CPP compile flags.
17+
AC_SUBST([JAVA_CPPFLAGS])
18+
19+
# Install .class files to ${datadir}/java.
20+
AC_SUBST([javaexecdir], [${datadir}/java])
21+
22+
# Install .jar files to ${datadir}/java (also).
23+
AC_SUBST([jarexecdir], [${datadir}/java])
24+
25+
# Build .class files in hidden directory.
26+
AC_SUBST([java_builddir], [.class])
27+
$MKDIR_P $java_builddir
28+
29+
# Build .jar files in hidden directory.
30+
AC_SUBST([jar_builddir], [.jar])
31+
$MKDIR_P $jar_builddir
32+
33+
# Instruct Automake to build .class files in ${java_builddir}.
34+
AC_SUBST([JAVAROOT], [${java_builddir}])
35+
36+
## Automake doesn't clean the modified JAVAROOT or jar builds,
37+
## so add following pattern in Makefile.am instead:
38+
#
39+
# dist_noinst_JAVA = \
40+
# [java files listed here]
41+
#
42+
# CLEANFILES = ${java_builddir}/*.class
43+
#
44+
# distclean-local:
45+
# rm -rf ${java_builddir} ${jar_builddir}
46+
#
47+
## Automake doesn't build .jar files,
48+
## so use following pattern in Makefile.am instead:
49+
#
50+
# nodist_jarexec_DATA = \
51+
# ${jar_builddir}/[jar name here]-${VERSION}.jar
52+
#
53+
# ${nodist_jarexec_DATA}: classnoinst.stamp
54+
# ${JAR} cf ${JARFLAGS} ${nodist_jarexec_DATA} -C ${java_builddir} .
55+
#
56+
# CLEANFILES += ${jar_builddir}/*.jar
57+
])

m4/ax_jni_include_dir.m4

Lines changed: 126 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,126 @@
1+
# ===========================================================================
2+
# http://www.gnu.org/software/autoconf-archive/ax_jni_include_dir.html
3+
# ===========================================================================
4+
#
5+
# SYNOPSIS
6+
#
7+
# AX_JNI_INCLUDE_DIR
8+
#
9+
# DESCRIPTION
10+
#
11+
# AX_JNI_INCLUDE_DIR finds include directories needed for compiling
12+
# programs using the JNI interface.
13+
#
14+
# JNI include directories are usually in the Java distribution. This is
15+
# deduced from the value of $JAVA_HOME, $JAVAC, or the path to "javac", in
16+
# that order. When this macro completes, a list of directories is left in
17+
# the variable JNI_INCLUDE_DIRS.
18+
#
19+
# Example usage follows:
20+
#
21+
# AX_JNI_INCLUDE_DIR
22+
#
23+
# for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
24+
# do
25+
# CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR"
26+
# done
27+
#
28+
# If you want to force a specific compiler:
29+
#
30+
# - at the configure.in level, set JAVAC=yourcompiler before calling
31+
# AX_JNI_INCLUDE_DIR
32+
#
33+
# - at the configure level, setenv JAVAC
34+
#
35+
# Note: This macro can work with the autoconf M4 macros for Java programs.
36+
# This particular macro is not part of the original set of macros.
37+
#
38+
# LICENSE
39+
#
40+
# Copyright (c) 2008 Don Anderson <[email protected]>
41+
#
42+
# Copying and distribution of this file, with or without modification, are
43+
# permitted in any medium without royalty provided the copyright notice
44+
# and this notice are preserved. This file is offered as-is, without any
45+
# warranty.
46+
47+
#serial 10
48+
49+
AU_ALIAS([AC_JNI_INCLUDE_DIR], [AX_JNI_INCLUDE_DIR])
50+
AC_DEFUN([AX_JNI_INCLUDE_DIR],[
51+
52+
JNI_INCLUDE_DIRS=""
53+
54+
if test "x$JAVA_HOME" != x; then
55+
_JTOPDIR="$JAVA_HOME"
56+
else
57+
if test "x$JAVAC" = x; then
58+
JAVAC=javac
59+
fi
60+
AC_PATH_PROG([_ACJNI_JAVAC], [$JAVAC], [no])
61+
if test "x$_ACJNI_JAVAC" = xno; then
62+
AC_MSG_ERROR([cannot find JDK; try setting \$JAVAC or \$JAVA_HOME])
63+
fi
64+
_ACJNI_FOLLOW_SYMLINKS("$_ACJNI_JAVAC")
65+
_JTOPDIR=`echo "$_ACJNI_FOLLOWED" | sed -e 's://*:/:g' -e 's:/[[^/]]*$::'`
66+
fi
67+
68+
case "$host_os" in
69+
darwin*) _JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
70+
_JINC="$_JTOPDIR/Headers";;
71+
*) _JINC="$_JTOPDIR/include";;
72+
esac
73+
_AS_ECHO_LOG([_JTOPDIR=$_JTOPDIR])
74+
_AS_ECHO_LOG([_JINC=$_JINC])
75+
76+
# On Mac OS X 10.6.4, jni.h is a symlink:
77+
# /System/Library/Frameworks/JavaVM.framework/Versions/Current/Headers/jni.h
78+
# -> ../../CurrentJDK/Headers/jni.h.
79+
AC_CHECK_FILE([$_JINC/jni.h],
80+
[JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JINC"],
81+
[_JTOPDIR=`echo "$_JTOPDIR" | sed -e 's:/[[^/]]*$::'`
82+
AC_CHECK_FILE([$_JTOPDIR/include/jni.h],
83+
[JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include"],
84+
AC_MSG_ERROR([cannot find JDK header files]))
85+
])
86+
87+
# get the likely subdirectories for system specific java includes
88+
case "$host_os" in
89+
bsdi*) _JNI_INC_SUBDIRS="bsdos";;
90+
freebsd*) _JNI_INC_SUBDIRS="freebsd";;
91+
linux*) _JNI_INC_SUBDIRS="linux genunix";;
92+
osf*) _JNI_INC_SUBDIRS="alpha";;
93+
solaris*) _JNI_INC_SUBDIRS="solaris";;
94+
mingw*) _JNI_INC_SUBDIRS="win32";;
95+
cygwin*) _JNI_INC_SUBDIRS="win32";;
96+
*) _JNI_INC_SUBDIRS="genunix";;
97+
esac
98+
99+
# add any subdirectories that are present
100+
for JINCSUBDIR in $_JNI_INC_SUBDIRS
101+
do
102+
if test -d "$_JTOPDIR/include/$JINCSUBDIR"; then
103+
JNI_INCLUDE_DIRS="$JNI_INCLUDE_DIRS $_JTOPDIR/include/$JINCSUBDIR"
104+
fi
105+
done
106+
])
107+
108+
# _ACJNI_FOLLOW_SYMLINKS <path>
109+
# Follows symbolic links on <path>,
110+
# finally setting variable _ACJNI_FOLLOWED
111+
# ----------------------------------------
112+
AC_DEFUN([_ACJNI_FOLLOW_SYMLINKS],[
113+
# find the include directory relative to the javac executable
114+
_cur="$1"
115+
while ls -ld "$_cur" 2>/dev/null | grep " -> " >/dev/null; do
116+
AC_MSG_CHECKING([symlink for $_cur])
117+
_slink=`ls -ld "$_cur" | sed 's/.* -> //'`
118+
case "$_slink" in
119+
/*) _cur="$_slink";;
120+
# 'X' avoids triggering unwanted echo options.
121+
*) _cur=`echo "X$_cur" | sed -e 's/^X//' -e 's:[[^/]]*$::'`"$_slink";;
122+
esac
123+
AC_MSG_RESULT([$_cur])
124+
done
125+
_ACJNI_FOLLOWED="$_cur"
126+
])# _ACJNI

m4/ax_prog_jar.m4

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# ===========================================================================
2+
# http://www.gnu.org/software/autoconf-archive/ax_prog_jar.html
3+
# ===========================================================================
4+
#
5+
# SYNOPSIS
6+
#
7+
# AX_PROG_JAR
8+
#
9+
# DESCRIPTION
10+
#
11+
# AX_PROG_JAR tests for an existing jar program. It uses the environment
12+
# variable JAR then tests in sequence various common jar programs.
13+
#
14+
# If you want to force a specific compiler:
15+
#
16+
# - at the configure.in level, set JAR=yourcompiler before calling
17+
# AX_PROG_JAR
18+
#
19+
# - at the configure level, setenv JAR
20+
#
21+
# You can use the JAR variable in your Makefile.in, with @JAR@.
22+
#
23+
# Note: This macro depends on the autoconf M4 macros for Java programs. It
24+
# is VERY IMPORTANT that you download that whole set, some macros depend
25+
# on other. Unfortunately, the autoconf archive does not support the
26+
# concept of set of macros, so I had to break it for submission.
27+
#
28+
# The general documentation of those macros, as well as the sample
29+
# configure.in, is included in the AX_PROG_JAVA macro.
30+
#
31+
# LICENSE
32+
#
33+
# Copyright (c) 2008 Egon Willighagen <[email protected]>
34+
#
35+
# Copying and distribution of this file, with or without modification, are
36+
# permitted in any medium without royalty provided the copyright notice
37+
# and this notice are preserved. This file is offered as-is, without any
38+
# warranty.
39+
40+
#serial 7
41+
42+
AU_ALIAS([AC_PROG_JAR], [AX_PROG_JAR])
43+
AC_DEFUN([AX_PROG_JAR],[
44+
AS_IF([test "x$JAVAPREFIX" = x],
45+
[test "x$JAR" = x && AC_CHECK_PROGS([JAR], [jar])],
46+
[test "x$JAR" = x && AC_CHECK_PROGS([JAR], [jar], [], [$JAVAPREFIX/bin])])
47+
test "x$JAR" = x && AC_MSG_ERROR([no acceptable jar program found in \$PATH])
48+
AC_PROVIDE([$0])dnl
49+
])

0 commit comments

Comments
 (0)