Merge branch '0.2.x' into 0.3.x
Conflicts: blkmaker_jansson.c
This commit is contained in:
@@ -11,7 +11,7 @@ AC_INIT(
|
||||
[http://gitorious.org/bitcoin/libblkmaker])
|
||||
AC_CONFIG_AUX_DIR([.])
|
||||
AC_PREREQ([2.59])
|
||||
AM_INIT_AUTOMAKE([1.10 -Wall dist-bzip2])
|
||||
AM_INIT_AUTOMAKE([1.10 -Wall dist-bzip2 foreign])
|
||||
|
||||
AC_PROG_CC_C99
|
||||
m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
|
||||
|
||||
Reference in New Issue
Block a user