Re: issues compiling 2.1.69 on FreeBSD 5.4

[John W. Eaton]

On 21-Apr-2005, Joan Picanyol i Puig <address@hidden> wrote:

| * Dmitri A. Sergatskov <address@hidden> [20050421 08:51]:
| > Octave used to have its own versions of fnmatch and glob. Those have
| > been removed since both of them are part of the POSIX.
| 
| Apparently, 2.1.69 still uses it's own version:
| 
| 525,p3,0$ nm glob/glob.o | grep fnmatch
|          U fnmatch
| 526,p3,0$ nm glob/fnmatch.o | grep fnmatch
| 00000e68 T fnmatch
| 00000000 t internal_fnmatch
| 527,p3,0$ 
| 
| > What do "man glob" and "man fnmatch" return on your computer?
| > Do you have glob.h and fnmatch.h?
| 
| Yep, in /usr/include:
| 
| 520,p3,0$ grep -E 'fnmatch\(|glob\(' /usr/include/*
| /usr/include/fnmatch.h:int       fnmatch(const char *, const char *, int);
| /usr/include/glob.h:/* Error values returned by glob(3) */
| /usr/include/glob.h:int glob(const char *, int, int (*)(const char *, int), 
glob_t *);
| /usr/include/vis.h:#define      VIS_GLOB        0x100   /* encode glob(3) 
magics */
| 
| > Here is what I get on Linux:
| > 
| Well, some features might be missing from glob:

Octave should only need standard and relatively basic functionality.
I think the real problem was an oops in configure.in (see below for a
patch).  I'm not sure how that ended up in the sources that were
distributed.

jwe


ChangeLog:

2005-04-21  John W. Eaton  <address@hidden>

        * configure.in: Fix apparent typo in check for FNM_PATHNAME.
        

Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/octave/configure.in,v
retrieving revision 1.458.2.5
diff -u -r1.458.2.5 configure.in
--- configure.in        4 Mar 2005 19:39:01 -0000       1.458.2.5
+++ configure.in        21 Apr 2005 16:07:14 -0000
@@ -957,7 +957,7 @@
 if test "$have_fnmatch_h" = yes && test "$have_glob_h" = yes; then
   AC_EGREP_CPP(yes, [#include <fnmatch.h>
 #ifdef FNM_NOESCAPE
-#ifdef FNM_FOOBAR_PATHNAME /* FIXME: delete FOOBAR_ ? */
+#ifdef FNM_PATHNAME
 #ifdef FNM_PERIOD
    yes
 #endif



-------------------------------------------------------------
Octave is freely available under the terms of the GNU GPL.

Octave's home on the web:  http://www.octave.org
How to fund new projects:  http://www.octave.org/funding.html
Subscription information:  http://www.octave.org/archive.html
-------------------------------------------------------------