-DENABLE_MODULE_MUSIG

src/secp256k1/Makefile.am

@@ -73,7 +73,7 @@ endif
 endif
 
 libsecp256k1_la_SOURCES = src/secp256k1.c
-libsecp256k1_la_CPPFLAGS = -DSECP256K1_BUILD -I$(top_srcdir)/include -I$(top_srcdir)/src $(SECP_INCLUDES)
+libsecp256k1_la_CPPFLAGS = -DSECP256K1_BUILD -DENABLE_MODULE_MUSIG -I$(top_srcdir)/include -I$(top_srcdir)/src $(SECP_INCLUDES)
 libsecp256k1_la_LIBADD = $(JNI_LIB) $(SECP_LIBS) $(COMMON_LIB)
 
 libsecp256k1_jni_la_SOURCES  = src/java/org_bitcoin_NativeSecp256k1.c src/java/org_bitcoin_Secp256k1Context.c

src/secp256k1/src/ecmult.h

@@ -45,7 +45,6 @@ static void secp256k1_ecmult(const secp256k1_ecmult_context *ctx, secp256k1_gej
 #include "num.h"
 #include "group.h"
 #include "scalar.h"
-#include "scratch.h"
 
 typedef struct {
     /* For accelerating the computation of a*P + b*G: */

src/secp256k1/src/ecmult_impl.h

@@ -1,4 +1,4 @@
-#ifdef always_do_ENABLE_MODULE_MUSIG
+#ifdef ENABLE_MODULE_MUSIG
 
 
 /**********************************************************************

src/secp256k1/src/secp256k1.c

@@ -17,6 +17,7 @@
 #include "ecdsa_impl.h"
 #include "eckey_impl.h"
 #include "hash_impl.h"
+#include "scratch_impl.h"
 
 #define ARG_CHECK(cond) do { \
     if (EXPECT(!(cond), 0)) { \