Following JMarc's suggestion. Patch already committed.
--
Angus
Index: src/frontends/xforms/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/ChangeLog,v
retrieving revision 1.980
diff -u -p -r1.980 ChangeLog
--- src/frontends/xforms/ChangeLog 8 Apr 2005 15:11:46 -0000 1.980
+++ src/frontends/xforms/ChangeLog 25 Apr 2005 11:04:49 -0000
@@ -1,3 +1,9 @@
+2005-04-25 Angus Leeming <[EMAIL PROTECTED]>
+
+ * globbing.[Ch]: moved here from the support directory.
+
+ * Makefile.am: associated change.
+
2005-04-08 Angus Leeming <[EMAIL PROTECTED]>
* FormAboutlyx.C (build): ensure that the CREDITS data fits on the
Index: src/frontends/xforms/FormFiledialog.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/FormFiledialog.C,v
retrieving revision 1.67
diff -u -p -r1.67 FormFiledialog.C
--- src/frontends/xforms/FormFiledialog.C 1 Feb 2005 16:41:24 -0000 1.67
+++ src/frontends/xforms/FormFiledialog.C 25 Apr 2005 11:04:49 -0000
@@ -15,13 +15,13 @@
#include "forms/form_filedialog.h"
#include "forms_gettext.h"
+#include "globbing.h"
#include "xforms_helpers.h"
#include "frontends/Dialogs.h"
#include "support/filefilterlist.h"
#include "support/filetools.h"
-#include "support/globbing.h"
#include "support/lstrings.h"
#include "support/lyxlib.h"
#include "support/package.h"
Index: src/frontends/xforms/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/frontends/xforms/Makefile.am,v
retrieving revision 1.122
diff -u -p -r1.122 Makefile.am
--- src/frontends/xforms/Makefile.am 4 Dec 2004 14:50:24 -0000 1.122
+++ src/frontends/xforms/Makefile.am 25 Apr 2005 11:04:49 -0000
@@ -37,6 +37,8 @@ libxforms_la_SOURCES = \
freebrowser.h \
fdesign_base.C \
fdesign_base.h \
+ globbing.C \
+ globbing.h \
input_validators.C \
input_validators.h \
lyx_gui.C \
Index: src/frontends/xforms/globbing.C
===================================================================
RCS file: src/frontends/xforms/globbing.C
diff -N src/frontends/xforms/globbing.C
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/frontends/xforms/globbing.C 25 Apr 2005 11:04:49 -0000
@@ -0,0 +1,44 @@
+/**
+ * \file globbing.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
+
+#include "globbing.h"
+#include "support/path.h"
+
+#include <glob.h>
+
+using std::string;
+using std::vector;
+
+
+namespace lyx {
+namespace support {
+
+void glob(vector<string> & matches,
+ string const & pattern,
+ string const & working_dir,
+ int flags)
+{
+ Path p(working_dir);
+
+ glob_t glob_buffer;
+ glob_buffer.gl_offs = 0;
+ glob(pattern.c_str(), flags, 0, &glob_buffer);
+
+ matches.insert(matches.end(),
+ glob_buffer.gl_pathv,
+ glob_buffer.gl_pathv + glob_buffer.gl_pathc);
+
+ globfree(&glob_buffer);
+}
+
+} // namespace support
+} // namespace lyx
Index: src/frontends/xforms/globbing.h
===================================================================
RCS file: src/frontends/xforms/globbing.h
diff -N src/frontends/xforms/globbing.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ src/frontends/xforms/globbing.h 25 Apr 2005 11:04:49 -0000
@@ -0,0 +1,36 @@
+// -*- C++ -*-
+/**
+ * \file globbing.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#ifndef GLOBBING_H
+#define GLOBBING_H
+
+#include <string>
+#include <vector>
+
+namespace lyx {
+namespace support {
+
+/** A wrapper for the Posix function 'glob'.
+ * \param matches files found to match \c pattern are appended.
+ * \param pattern the glob to be expanded. Eg "*.[Ch]".
+ * \param working_dir the starting directory from which \c pattern
+ * is to be expanded. Used only if \c pattern is a relative path.
+ * \param flags flags to be passed to the system function. See 'man glob'.
+ */
+void glob(std::vector<std::string> & matches,
+ std::string const & pattern,
+ std::string const & working_dir,
+ int flags = 0);
+
+} // namespace support
+} // namespace lyx
+
+#endif // NOT GLOBBING_H
Index: src/support/ChangeLog
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/ChangeLog,v
retrieving revision 1.341
diff -u -p -r1.341 ChangeLog
--- src/support/ChangeLog 24 Apr 2005 12:21:57 -0000 1.341
+++ src/support/ChangeLog 25 Apr 2005 11:04:50 -0000
@@ -1,3 +1,9 @@
+2005-04-25 Angus Leeming <[EMAIL PROTECTED]>
+
+ * globbing.[Ch]: removed to frontends/xforms.
+
+ * Makefile.am: associated change.
+
2005-04-24 Angus Leeming <[EMAIL PROTECTED]>
* userinfo.C (user_name): add Windows-specific code.
Index: src/support/Makefile.am
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/support/Makefile.am,v
retrieving revision 1.91
diff -u -p -r1.91 Makefile.am
--- src/support/Makefile.am 23 Mar 2005 21:10:43 -0000 1.91
+++ src/support/Makefile.am 25 Apr 2005 11:04:50 -0000
@@ -44,8 +44,6 @@ libsupport_la_SOURCES = \
fs_extras.C \
fs_extras.h \
getcwd.C \
- globbing.C \
- globbing.h \
$(COMPRESSION) kill.C \
limited_stack.h \
lstrings.C \
Index: src/support/globbing.C
===================================================================
RCS file: src/support/globbing.C
diff -N src/support/globbing.C
--- src/support/globbing.C 26 Nov 2004 14:37:40 -0000 1.11
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,44 +0,0 @@
-/**
- * \file globbing.C
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Angus Leeming
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include <config.h>
-
-#include "support/globbing.h"
-#include "support/path.h"
-
-#include <glob.h>
-
-using std::string;
-using std::vector;
-
-
-namespace lyx {
-namespace support {
-
-void glob(vector<string> & matches,
- string const & pattern,
- string const & working_dir,
- int flags)
-{
- Path p(working_dir);
-
- glob_t glob_buffer;
- glob_buffer.gl_offs = 0;
- glob(pattern.c_str(), flags, 0, &glob_buffer);
-
- matches.insert(matches.end(),
- glob_buffer.gl_pathv,
- glob_buffer.gl_pathv + glob_buffer.gl_pathc);
-
- globfree(&glob_buffer);
-}
-
-} // namespace support
-} // namespace lyx
Index: src/support/globbing.h
===================================================================
RCS file: src/support/globbing.h
diff -N src/support/globbing.h
--- src/support/globbing.h 26 Nov 2004 14:37:40 -0000 1.6
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,36 +0,0 @@
-// -*- C++ -*-
-/**
- * \file globbing.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Angus Leeming
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef GLOBBING_H
-#define GLOBBING_H
-
-#include <string>
-#include <vector>
-
-namespace lyx {
-namespace support {
-
-/** A wrapper for the Posix function 'glob'.
- * \param matches files found to match \c pattern are appended.
- * \param pattern the glob to be expanded. Eg "*.[Ch]".
- * \param working_dir the starting directory from which \c pattern
- * is to be expanded. Used only if \c pattern is a relative path.
- * \param flags flags to be passed to the system function. See 'man glob'.
- */
-void glob(std::vector<std::string> & matches,
- std::string const & pattern,
- std::string const & working_dir,
- int flags = 0);
-
-} // namespace support
-} // namespace lyx
-
-#endif // NOT GLOBBING_H
