Re: build trouble on MacOS 10.5 [changeset]

[Thomas Treichl]

Rob Mahurin schrieb:
> On Tue, Dec 22, 2009 at 09:16:30AM -0500, Ben Abbott wrote:
> > Good news, I'm able to build with all libs except for Apple's Carbon and OpenGL 
> > frameworks.
> >
> >   $ ./configure --prefix=/sw --infodir=${prefix}/share/info 
> > --mandir=${prefix}/share/man --libexecdir=${prefix}/lib 
> > --with-blas=-Wl,-framework -Wl,vecLib --without-framework-carbon 
> > --without-framework-opengl
> >
> > Make check only has two failures.
> >
> > Summary:
> >
> >   PASS   5659
> >   FAIL      2
> >
> > Once, I can build everything I need to be fully functional, I'll
> > look into the test failures.
>
> I see the same, with a fresh checkout of revision 10014:cb98128649e9.
>
> 	$ ./configure 
> 	CC=gcc-mp-4.3 CXX=g++-mp-4.3 F77=gfortran-mp-4.3 LDFLAGS=-L/opt/local/lib
>         --without-framework-opengl --without-framework-carbon
>
>           PASS   5507
>           FAIL      2
>
> I needed the patch attached to include <config.h> before any
> <string.h>.  Is this harmless on other systems?  Is it safe to assume
> that anyone doing "make -C src lex.cc" will have a running perl, or is
> some other magic necessary?  jwe had a less ugly suggestion.
>
> Cheers,
> Rob

On an OS X 10.4 system I need the changes in md5.c, gl2ps and lex.cc, too,
and further I also need similiar changes in src/DLD-FUNCTIONS/md5sum.cc and 
src/DLD-FUNCTIONS/lookup.cc. A changeset for these two files is attached - maybe 
somebody could add these changes to the sources, too?

Thanks,

  Thomas


# HG changeset patch
# User Thomas Treichl
# Date 1261509414 -3600
# Node ID 17a9c9aad53fe54cc5ca8f1016cfea03f3eee17f
# Parent  cb98128649e9b663844a9e4666876690e1f104c1
Include config.h before another header file.

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-22  Thomas Treichl  <address@hidden>
+
+       * DLD-FUNCTIONS/md5sum.cc, DLD-FUNCTIONS/lookup.cc: Include
+       config.h before another header file.
+
 2009-12-20  Shai Ayal  <address@hidden>
 
        * DLD-FUNCTIONS/fltk_backend.cc (plot_sindow::set_name): New method.
diff --git a/src/DLD-FUNCTIONS/lookup.cc b/src/DLD-FUNCTIONS/lookup.cc
--- a/src/DLD-FUNCTIONS/lookup.cc
+++ b/src/DLD-FUNCTIONS/lookup.cc
@@ -22,13 +22,13 @@
 
 // Author: Jaroslav Hajek <address@hidden>
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <cctype>
 #include <functional>
 #include <algorithm>
-
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
 
 #include "dNDArray.h"
 #include "CNDArray.h"
diff --git a/src/DLD-FUNCTIONS/md5sum.cc b/src/DLD-FUNCTIONS/md5sum.cc
--- a/src/DLD-FUNCTIONS/md5sum.cc
+++ b/src/DLD-FUNCTIONS/md5sum.cc
@@ -21,12 +21,12 @@
 
 */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 #include <string>
 #include <vector>
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
 
 #include "defun-dld.h"
 #include "file-stat.h"