ubuntu 14.04 needs -pthread

skaes · Mar 8, 2015 · 422edce · 422edce
1 parent fbd4ec5
commit 422edce
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/Makefile.am b/Makefile.am
@@ -3,6 +3,7 @@ ACLOCAL_AMFLAGS = ${ACLOCAL_FLAGS}
 
 AM_CPPFLAGS = $(OPTDIR_CPPFLAGS) $(DEPS_CFLAGS) -D_GNU_SOURCE
 AM_CFLAGS = --std=gnu99 -Wall -fno-fast-math
+AM_LDFLAGS = $(OPT_PTHREAD_FLAGS)
 LDADD = $(OPTDIR_LDFLAGS) $(DEPS_LIBS) -lm
 
 bin_PROGRAMS = \

diff --git a/README.md b/README.md
@@ -96,7 +96,7 @@ headers and libraries are installed under `/opt/logjam`, `/usr/local` or
 `autogen.sh` accepts the usual configure arguments, such as
 `--prefix`. Thus, if you have installed the libraries under
 `/opt/logjam`, and want to install the logjam tools in the same place,
-run `sh autogen.sh --with-opt-dir=/opt/logjam --prefix=/opt/logjam `
+run `sh autogen.sh --with-opt-dir=/opt/logjam --prefix=/opt/logjam`
 
 If you want to get rid of the installed software, run
 ```

diff --git a/configure.ac b/configure.ac
@@ -55,6 +55,7 @@ AS_IF([test "x$with_opt_dir" == "x"],
                          )
       ])
 
+AS_IF([test `uname -s` == "Linux"], AC_SUBST([OPT_PTHREAD_FLAGS], ["-pthread"]), AC_SUBST([OPT_PTHREAD_FLAGS]))
 
 AC_CHECK_FUNCS(htonll ntohll)
-Original file line number
+Diff line change
@@ Expand Up / @@ -55,6 +55,7 @@ AS_IF([test "x$with_opt_dir" == "x"], @@
                              )
           ])
+    AS_IF([test `uname -s` == "Linux"], AC_SUBST([OPT_PTHREAD_FLAGS], ["-pthread"]), AC_SUBST([OPT_PTHREAD_FLAGS]))
     AC_CHECK_FUNCS(htonll ntohll)
@@ Expand Down @@