epsilon-link.patch

   1 --- epsilon-0.9.2/configure.in.orig     2011-05-27 12:47:34.000000000 +0200
   2 +++ epsilon-0.9.2/configure.in  2012-02-03 19:00:24.215650540 +0100
   3 @@ -31,7 +31,8 @@
   4  AC_CHECK_LIB([popt], [poptGetContext], [have_popt_lib=yes], ,)
   5
   6  if test x$have_popt_h = xyes -a x$have_popt_lib = xyes ; then
   7 -    LIBS="$LIBS -lpopt"
   8 +    POPT_LIBS="-lpopt"
   9 +    AC_SUBST([POPT_LIBS])
  10  else
  11      AC_MSG_ERROR([
  12  =================================================
  13 @@ -56,7 +56,8 @@
  14              AC_CHECK_LIB([pthread], [pthread_create], [have_pthread_lib=yes], ,)
  15
  16              if test x$have_pthread_h = xyes -a x$have_pthread_lib = xyes ; then
  17 -                LIBS="$LIBS -lpthread"
  18 +                THREAD_LIBS="-lpthread"
  19 +               AC_SUBST([THREAD_LIBS])
  20                  AC_DEFINE([ENABLE_PTHREADS], [1],)
  21              else
  22                  AC_MSG_ERROR([
  23 @@ -122,7 +123,8 @@
  24              AC_CHECK_LIB([pthread], [pthread_create], [have_pthread_lib=yes], ,)
  25
  26              if test x$have_pthread_h = xyes -a x$have_pthread_lib = xyes ; then
  27 -                LIBS="$LIBS -lpthread"
  28 +                THREAD_LIBS="-lpthread"
  29 +               AC_SUBST([THREAD_LIBS])
  30                  AC_DEFINE([ENABLE_PTHREADS], [1],)
  31              else
  32                  AC_MSG_ERROR([
  33 --- epsilon-0.9.2/src/Makefile.am.orig  2010-04-05 07:01:04.000000000 +0200
  34 +++ epsilon-0.9.2/src/Makefile.am       2012-02-03 19:07:50.418998813 +0100
  35 @@ -8,7 +8,7 @@
  36
  37  # the library search path.
  38  epsilon_LDFLAGS = $(all_libraries)
  39 -epsilon_LDADD = $(top_builddir)/lib/libepsilon.la
  40 +epsilon_LDADD = $(top_builddir)/lib/libepsilon.la $(POPT_LIBS) $(THREAD_LIBS)
  41  noinst_HEADERS = pbm.h options.h cmd_version.h cmd_list_all_fb.h \
  42         cmd_encode_file.h psi.h misc.h cmd_decode_file.h cmd_truncate_file.h cmd_start_node.h \
  43      worker_mpi_node.h epsilon_version.h