# HG changeset patch
# User John W. Eaton <jwe@octave.org>
# Date 1264010590 18000
# Node ID deba43069023e6d13282ff584722dea20c436930
# Parent  adc0143e94195fd77933b7f57f29c825f32e2c87
don't install oct-glob.h

diff -r adc0143e9419 -r deba43069023 liboctave/ChangeLog
--- a/liboctave/ChangeLog	Wed Jan 20 17:50:56 2010 +0100
+++ b/liboctave/ChangeLog	Wed Jan 20 13:03:10 2010 -0500
@@ -1,3 +1,12 @@
+2010-01-20  John W. Eaton  <jwe@octave.org>
+
+	* Makefile.am (PRIVATE_INCS): New variable.  List oct-glob.h
+	here instead of in INCS.
+	(liboctave_la_SOURCES): Include $(PRIVATE_INCS) in the list.
+
+	* glob-match.cc (glob_match::match, glob_match::glob): Now const.
+	Move definitions here from glob-match.h.
+
 2010-01-20  Jaroslav Hajek  <highegg@gmail.com>
 
 	* mx-inlines.cc (mx_inline_any_r, mx_inline_all_r): New helper
diff -r adc0143e9419 -r deba43069023 liboctave/Makefile.am
--- a/liboctave/Makefile.am	Wed Jan 20 17:50:56 2010 +0100
+++ b/liboctave/Makefile.am	Wed Jan 20 13:03:10 2010 -0500
@@ -215,7 +215,6 @@
   oct-env.h \
   oct-fftw.h \
   oct-getopt.h \
-  oct-glob.h \
   oct-group.h \
   oct-inttypes.h \
   oct-locbuf.h \
@@ -251,6 +250,9 @@
   syswait.h \
   $(MATRIX_INC)
 
+PRIVATE_INCS = \
+  oct-glob.h
+
 OTHER_INC = \
   intNDArray.cc \
   kpse.cc \
@@ -505,7 +507,8 @@
 liboctave_la_SOURCES = \
   $(LIBOCTAVE_SOURCES) \
   $(LIBOCT_READLINE_SOURCES) \
-  $(LIBOCT_PATHSEARCH_SOURCES)
+  $(LIBOCT_PATHSEARCH_SOURCES) \
+  $(PRIVATE_INCS)
 
 liboctave_la_LIBADD = $(LINK_DEPS)
 
diff -r adc0143e9419 -r deba43069023 liboctave/glob-match.cc
--- a/liboctave/glob-match.cc	Wed Jan 20 17:50:56 2010 +0100
+++ b/liboctave/glob-match.cc	Wed Jan 20 13:03:10 2010 -0500
@@ -27,6 +27,19 @@
 #include <fnmatch.h>
 
 #include "glob-match.h"
+#include "oct-glob.h"
+
+bool
+glob_match::match (const std::string& str) const
+{
+  return octave_fnmatch (pat, str, fnmatch_flags);
+}
+
+string_vector
+glob_match::glob (void) const
+{
+  return octave_glob (pat);
+}
 
 int
 glob_match::opts_to_fnmatch_flags (unsigned int xopts) const
diff -r adc0143e9419 -r deba43069023 liboctave/glob-match.h
--- a/liboctave/glob-match.h	Wed Jan 20 17:50:56 2010 +0100
+++ b/liboctave/glob-match.h	Wed Jan 20 13:03:10 2010 -0500
@@ -26,7 +26,6 @@
 #include <string>
 
 #include "Array.h"
-#include "oct-glob.h"
 #include "str-vec.h"
 
 class
@@ -69,12 +68,9 @@
 
   void set_pattern (const string_vector& p) { pat = p; }
 
-  bool match (const std::string& str)
-  {
-    return octave_fnmatch (pat, str, fnmatch_flags);
-  }
+  bool match (const std::string& str) const;
 
-  Array<bool> match (const string_vector& str)
+  Array<bool> match (const string_vector& str) const
   {
     int n = str.length ();
 
@@ -89,7 +85,7 @@
   // We forward to glob_internal here to avoid problems with gnulib's
   // glob.h defining glob to be rpl_glob.
 
-  string_vector glob (void) { return octave_glob (pat); }
+  string_vector glob (void) const;
 
 private: