autoconf: Incremental autoreconf fixes (take 2)

 - No need for SIMD_FLAGS in the generic case
 - No need to compile against jerasure/gf_complete

Signed-off-by: Tushar Gohad <tushar.gohad@intel.com>

2 files changed, 5 insertions, 32 deletions

diff --git a/Makefile.am b/Makefile.am
index 365672a..ce71d88 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,7 +5,7 @@ AM_CFLAGS = -g3 -O0
 else
 AM_CFLAGS = -O2
 endif
-AM_CFLAGS += $(SIMD_FLAGS) -fPIC $(AM_CPPFLAGS) -L/usr/local/lib
+AM_CFLAGS += -fPIC $(AM_CPPFLAGS) -L/usr/local/lib
 
 VALGRIND_EXEC_COMMAND = $(LIBTOOL_COMMAND) valgrind --tool=memcheck --error-exitcode=1 --leak-check=yes --track-fds=yes --malloc-fill=A5 --free-fill=DE --fullpath-after=.
 
diff --git a/configure.ac b/configure.ac
index 6da398f..3da654b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -63,8 +63,8 @@ EXTRA_LDFLAGS="$BASE_LDFLAGS"
 
 dnl Check for C library headers
 AC_HEADER_STDC
-AC_CHECK_HEADERS(sys/types.h stdio.h stdlib.h stddef.h stdarg.h 
-                 malloc.h memory.h string.h strings.h inttypes.h 
+AC_CHECK_HEADERS(sys/types.h stdio.h stdlib.h stddef.h stdarg.h \
+                 malloc.h memory.h string.h strings.h inttypes.h \
                  stdint.h ctype.h math.h iconv.h signal.h dlfcn.h)
 AC_CHECK_FUNCS(malloc calloc realloc free)
 
@@ -82,34 +82,6 @@ SOURCES="$SOURCES $srcdir/test/*.c"
 # Check for jerasure/gf_complete headers
 AC_CHECK_HEADERS(jerasure.h cauchy.h galois.h liberation.h reed_sol.h gf_complete.h)
 
-dnl Default behavior of AC_CHECK_LIB if the library is found is to set the HAVE_LIB* 
-dnl variable and add the library to LIBS, which has the result of all compiles
-dnl --including those performed by configure-- linking against the discovered
-dnl library. This un-necessary linkage can increase build time as well as
-dnl complicates configuration, so default behavior has been overridden so we dont
-dnl set the LIBS.
-AC_CHECK_LIB([Jerasure], [jerasure_autoconf_test], 
-             [
-               echo "Found libJerasure"
-               HAVE_LIBJERASURE = 1
-             ],
-             [
-              echo "Error! You need to have libJerasure installed."
-              echo "libJerasure is available from bitbucket.org/kmgreen2/jerasure-kmg.git"
-              exit -1
-             ])
-
-AC_CHECK_LIB([gf_complete], [gf_init_easy],
-             [
-               echo "Found libgf_complete"
-               HAVE_LIBGF_COMPLETE = 1
-             ],
-             [
-              echo "Error! You need to have gf_complete installed."
-              echo "gf_complete is available from http://web.eecs.utk.edu/~plank/plank/papers/CS-13-703.html"
-              exit -1
-             ])
-
 AX_EXT()
 
 AC_ARG_ENABLE(debug,
@@ -133,5 +105,6 @@ AC_SUBST(EXTRA_CFLAGS)
 AC_SUBST(BUILD_LDFLAGS)
 AC_SUBST(EXTRA_LDFLAGS)
 
-AC_OUTPUT(Makefile, erasurecode.pc)
+AC_OUTPUT(Makefile)
+AC_OUTPUT(erasurecode.pc)