octave-build.patch

   1 --- octave-3.4.0/scripts/Makefile.am~   2011-02-08 11:00:51.000000000 +0100
   2 +++ octave-3.4.0/scripts/Makefile.am    2011-04-14 11:15:55.080456597 +0200
   3 @@ -316,7 +316,7 @@
   4
   5  gethelp_SOURCES = gethelp.cc
   6
   7 -.DOCSTRINGS: $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile
   8 +.DOCSTRINGS: gethelp $(FCN_FILES) $(GEN_FCN_FILES) mkdoc $(gethelp_SOURCES) Makefile
   9         @$(MAKE) $(AM_MAKEFLAGS) gethelp$(BUILD_EXEEXT)
  10         if [ "x$(srcdir)" != "x." ] && [ -f $(srcdir)/DOCSTRINGS ] && [ ! -f DOCSTRINGS ]; then \
  11                 cp $(srcdir)/DOCSTRINGS DOCSTRINGS; \
  12 --- octave-3.4.0/configure.ac~  2011-02-08 11:01:12.000000000 +0100
  13 +++ octave-3.4.0/configure.ac   2011-04-14 11:38:50.030497595 +0200
  14 @@ -631,7 +631,7 @@
  15
  16  OCTAVE_CHECK_LIBRARY(qhull, QHull,
  17    [Qhull library not found -- this will result in loss of functionality of some geometry functions.],
  18 -  [qhull/qhull_a.h], [qh_qhull], [], [],
  19 +  [libqhull/qhull_a.h], [qh_qhull], [], [],
  20    [warn_qhull=
  21     OCTAVE_CHECK_QHULL_VERSION
  22     OCTAVE_CHECK_QHULL_OK([TEXINFO_QHULL="@set HAVE_QHULL"
  23 @@ -1731,7 +1731,7 @@
  24  AC_CHECK_MEMBERS(struct group.gr_passwd)
  25
  26  octave_found_termlib=no
  27 -for termlib in ncurses curses termcap terminfo termlib; do
  28 +for termlib in tinfo ncurses curses termcap terminfo termlib; do
  29    AC_CHECK_LIB(${termlib}, tputs, [
  30      TERM_LIBS="-l${termlib}"
  31      octave_found_termlib=yes
  32 --- octave-3.4.2/m4/acinclude.m4.orig   2011-06-10 19:48:38.000000000 +0200
  33 +++ octave-3.4.2/m4/acinclude.m4        2011-07-07 18:21:32.660791806 +0200
  34 @@ -935,7 +935,7 @@
  35    [AC_CACHE_CHECK([for qh_version in $QHULL_LIBS],
  36      octave_cv_lib_qhull_version,  [
  37        AC_LINK_IFELSE([AC_LANG_PROGRAM([[
  38 -#include <qhull/qhull_a.h>
  39 +#include <libqhull/qhull_a.h>
  40  ]], [[
  41  const char *tmp = qh_version;
  42  ]])], [octave_cv_lib_qhull_version=yes], [octave_cv_lib_qhull_version=no])])
  43 @@ -952,7 +952,7 @@
  44      octave_cv_lib_qhull_ok, [
  45        AC_RUN_IFELSE([AC_LANG_PROGRAM([[
  46  #include <stdio.h>
  47 -#include <qhull/qhull.h>
  48 +#include <libqhull/qhull_a.h>
  49  #ifdef NEED_QHULL_VERSION
  50  char *qh_version = "version";
  51  #endif
  52 --- octave-3.4.2/src/DLD-FUNCTIONS.orig/convhulln.cc    2011-04-11 16:57:08.000000000 +0200
  53 +++ octave-3.4.2/src/DLD-FUNCTIONS/convhulln.cc 2011-07-07 18:23:18.760795361 +0200
  54 @@ -43,7 +43,7 @@
  55
  56  #ifdef HAVE_QHULL
  57  extern "C" {
  58 -#include <qhull/qhull_a.h>
  59 +#include <libqhull/qhull_a.h>
  60  }
  61
  62  # ifdef NEED_QHULL_VERSION
  63 --- octave-3.4.2/src/DLD-FUNCTIONS.orig/__delaunayn__.cc        2011-04-11 16:57:08.000000000 +0200
  64 +++ octave-3.4.2/src/DLD-FUNCTIONS/__delaunayn__.cc     2011-07-07 18:23:18.774128693 +0200
  65 @@ -52,7 +52,7 @@
  66
  67  #ifdef HAVE_QHULL
  68  extern "C" {
  69 -#include <qhull/qhull_a.h>
  70 +#include <libqhull/qhull_a.h>
  71  }
  72
  73  #ifdef NEED_QHULL_VERSION
  74 --- octave-3.4.2/src/DLD-FUNCTIONS.orig/__voronoi__.cc  2011-04-11 16:57:08.000000000 +0200
  75 +++ octave-3.4.2/src/DLD-FUNCTIONS/__voronoi__.cc       2011-07-07 18:23:19.144128708 +0200
  76 @@ -45,7 +45,7 @@
  77
  78  #ifdef HAVE_QHULL
  79  extern "C" {
  80 -#include <qhull/qhull_a.h>
  81 +#include <libqhull/qhull_a.h>
  82  }
  83
  84  #ifdef NEED_QHULL_VERSION
  85 --- octave-3.4.2/m4/ax_pthread.m4.orig  2011-04-11 16:57:08.000000000 +0200
  86 +++ octave-3.4.2/m4/ax_pthread.m4       2011-07-07 21:24:27.544492621 +0200
  87 @@ -169,6 +169,7 @@
  88                  -*)
  89                  AC_MSG_CHECKING([whether pthreads work with $flag])
  90                  PTHREAD_CFLAGS="$flag"
  91 +                PTHREAD_LIBS="$flag"
  92                  ;;
  93
  94                 pthread-config)