beecrypt/patches/beecrypt-4.2.1-build-system.patch

   1 --- beecrypt-4.2.1/configure.ac
   2 +++ beecrypt-4.2.1/configure.ac
   3 @@ -11,7 +11,7 @@
   4
   5  # Checks for package options
   6  AC_ARG_ENABLE(expert-mode, [  --enable-expert-mode      follow user-defined CFLAGS settings [[default=no]]],[
   7 -  ac_enable_expert_mode=yes
   8 +  ac_enable_expert_mode=$enableval
   9    ],[
  10    if test "X$CFLAGS" != "X"; then
  11      echo "enabling expert mode"
  12 @@ -25,7 +25,7 @@
  13    if test "$ac_enable_expert_mode" = yes; then
  14      AC_MSG_ERROR([--enable-debug cannot be used in conjunction with --enable-expert-mode])
  15    fi
  16 -  ac_enable_debug=yes
  17 +  ac_enable_debug=$enableval
  18    ],[
  19    ac_enable_debug=no
  20    ])
  21 @@ -456,7 +456,7 @@
  22        ac_cv_python_include="-I`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_inc()'`"
  23      ])
  24      AC_CACHE_CHECK([where to install python libraries], ac_cv_python_libdir, [
  25 -      ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib()'`
  26 +      ac_cv_python_libdir=`$PYTHON -c 'import distutils.sysconfig; print distutils.sysconfig.get_python_lib(1, 0)'`
  27      ])
  28    fi
  29  fi
  30 --- beecrypt-4.2.1/java/Makefile.am
  31 +++ beecrypt-4.2.1/java/Makefile.am
  32 @@ -26,7 +26,7 @@
  33
  34  INCLUDES = -I$(top_srcdir)/include
  35
  36 -libaltdir=$(prefix)/lib@LIBALT@
  37 +libaltdir=$(libdir)
  38
  39  libalt_LTLIBRARIES = libbeecrypt_java.la
  40
  41 --- beecrypt-4.2.1/acinclude.m4
  42 +++ beecrypt-4.2.1/acinclude.m4
  43 @@ -1589,20 +1589,5 @@
  44    AC_SUBST(TYPEDEF_BC_THREADID_T,$bc_typedef_bc_threadid_t)
  45    ])
  46 -
  47 -AH_BOTTOM([
  48 -#if ENABLE_THREADS
  49 -# ifndef _REENTRANT
  50 -#  define _REENTRANT
  51 -# endif
  52 -# if LINUX
  53 -#  define _LIBC_REENTRANT
  54 -# endif
  55 -#else
  56 -# ifdef _REENTRANT
  57 -#  undef _REENTRANT
  58 -# endif
  59 -#endif
  60 -])
  61
  62
  63  dnl  BEE_THREAD_LOCAL_STORAGE
  64 @@ -1623,7 +1609,5 @@
  65    ])
  66
  67  AH_BOTTOM([
  68 -#if !ENABLE_THREAD_LOCAL_STORAGE
  69 -# define __thread
  70 -#endif
  71 +#include "config.threads.h"
  72  ])
  73 --- beecrypt-4.2.1/config.threads.h
  74 +++ beecrypt-4.2.1/config.threads.h
  75 @@ -0,0 +1,16 @@
  76 +#if ENABLE_THREADS
  77 +# ifndef _REENTRANT
  78 +#  define _REENTRANT
  79 +# endif
  80 +# if LINUX
  81 +#  define _LIBC_REENTRANT
  82 +# endif
  83 +#else
  84 +# ifdef _REENTRANT
  85 +#  undef _REENTRANT
  86 +# endif
  87 +#endif
  88 +
  89 +#if !ENABLE_THREAD_LOCAL_STORAGE
  90 +# define __thread
  91 +#endif