--- a/liboctave/glob-match.h	Wed Dec 16 22:11:38 2009 +0100
+++ b/liboctave/glob-match.h	Thu Dec 17 02:38:33 2009 -0500
@@ -71,7 +71,10 @@
 
   Array<bool> match (const string_vector&);
 
-  string_vector glob (void);
+  // 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 glob_internal (); }
 
 private:
 
@@ -80,6 +83,8 @@
 
   // Option flags.
   unsigned int flags;
+
+  string_vector glob_internal (void);
 };
 
 #endif