Merge pull request #8927 from JacobBarthelmeh/usersettings

Fix for user_settings.h build with configure.ac and HAVE_CURVE25519

Author: dgarske

src/include.am

@@ -1298,9 +1298,7 @@ endif
 endif !BUILD_FIPS_V6
 
 if BUILD_FEMATH
-if BUILD_CURVE25519_SMALL
 src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/fe_low_mem.c
-else
 if BUILD_CURVE25519_INTELASM
 if !BUILD_X86_ASM
 src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/fe_x25519_asm.S
@@ -1356,13 +1354,10 @@ else
 src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/fe_operations.c
 endif !BUILD_ARMASM
 endif !BUILD_CURVE25519_INTELASM
-endif !BUILD_CURVE25519_SMALL
 endif BUILD_FEMATH
 
 if BUILD_GEMATH
-if BUILD_ED25519_SMALL
 src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/ge_low_mem.c
-else
 src_libwolfssl@LIBSUFFIX@_la_SOURCES += wolfcrypt/src/ge_operations.c
 if !BUILD_FEMATH
 if BUILD_CURVE25519_INTELASM
@@ -1401,7 +1396,6 @@ endif !BUILD_ARMASM
 endif !BUILD_FIPS_V6
 endif !BUILD_CURVE25519_INTELASM
 endif !BUILD_FEMATH
-endif !BUILD_ED25519_SMALL
 endif BUILD_GEMATH
 
 if !BUILD_FIPS_V6