diff --git a/configure.ac b/configure.ac index f97ff862e..781a305e2 100644 --- a/configure.ac +++ b/configure.ac @@ -508,18 +508,6 @@ CFLAGS=$ac_save_CFLAGS LDFLAGS=$ac_save_LDFLAGS ac_c_werror_flag=$cu_save_c_werror_flag -# Detect when using xlc to determine whether to use -qinclude= -AC_CACHE_CHECK([whether the system supports xlc include], [utils_cv_xlc], - [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([[ - #ifndef __xlc__ - #error "not xlc" - #endif - ]])], - [utils_cv_xlc=yes], - [utils_cv_xlc=no])]) -AM_CONDITIONAL([USE_XLC_INCLUDE], [test "$utils_cv_xlc" = yes]) - ############################################################################ dnl Autogenerated by the 'gen-lists-of-programs.sh' auxiliary script. diff --git a/src/blake2/b2sum.c b/src/blake2/b2sum.c index 5df2046f8..5cb25b86a 100644 --- a/src/blake2/b2sum.c +++ b/src/blake2/b2sum.c @@ -13,6 +13,10 @@ https://blake2.net. */ +#ifdef HAVE_CONFIG_H +# include +#endif + #include #include #include diff --git a/src/local.mk b/src/local.mk index a69d40521..763c8a01c 100644 --- a/src/local.mk +++ b/src/local.mk @@ -399,14 +399,7 @@ src_sha384sum_SOURCES = src/md5sum.c src_sha384sum_CPPFLAGS = -DHASH_ALGO_SHA384=1 $(AM_CPPFLAGS) src_sha512sum_SOURCES = src/md5sum.c src_sha512sum_CPPFLAGS = -DHASH_ALGO_SHA512=1 $(AM_CPPFLAGS) -# Include the file on the command line to avoid modifying -# the blake2 upstream source -if USE_XLC_INCLUDE -src_b2sum_CPPFLAGS = -qinclude=config.h -else -src_b2sum_CPPFLAGS = -include config.h -endif -src_b2sum_CPPFLAGS += -DHASH_ALGO_BLAKE2=1 $(AM_CPPFLAGS) +src_b2sum_CPPFLAGS = -DHASH_ALGO_BLAKE2=1 -DHAVE_CONFIG_H $(AM_CPPFLAGS) src_b2sum_SOURCES = src/md5sum.c \ src/blake2/blake2.h src/blake2/blake2-impl.h \ src/blake2/blake2b-ref.c \