diff options
-rw-r--r-- | README.submodule | 19 | ||||
-rw-r--r-- | include/wordsplit.h | 2 |
2 files changed, 15 insertions, 6 deletions
diff --git a/README.submodule b/README.submodule index e04a4ec..9b7212f 100644 --- a/README.submodule +++ b/README.submodule @@ -31,29 +31,38 @@ recursively, joining several trees together, reductions, etc. * Usage 1. Install grecs as a submodule: git submodule add git://git.gnu.org.ua/grecs.git grecs -2. Add a call to GRECS_SETUP to your configure.ac. It can be as +2. Modify your configure.ac + +First, indicate that grecs/am is the location of additional Autoconf +macros. To do so, add the following statement + + AC_CONFIG_MACRO_DIR([grecs/am]) + +Somewhere below this statement, add a call to GRECS_SETUP. It can be as simple as: GRECS_SETUP If the subproject directory is not 'grecs', supply the actual -directory name as the first argument to this macro, e.g.: +directory name as the first argument to both this macro, and +AC_CONFIG_MACRO_DIR, e.g.: - GRECS_SETUP(lib/grecs) + AC_CONFIG_MACRO_DIR([lib/grecs/am]) + GRECS_SETUP([lib/grecs]) For a detailed description of the GRECS_SETUP macro, run `man doc/GRECS_SETUP.3'. -3. In your Makefile.am, add @GRECS_INCLUDES@ to the INCLUDES value, +3. In your Makefile.am, add @GRECS_INCLUDES@ to the AM_CPPFLAGS value, and @GRECS_LDADD@ to LDADD, e.g.: - INCLUDES = @GRECS_INCLUDES@ + AM_CPPFLAGS = @GRECS_INCLUDES@ LDADD = @GRECS_LDADD@ 4. Include "grecs.h" 5. Use the library to handle your configuration files. See the documentation for a detailed discussion. diff --git a/include/wordsplit.h b/include/wordsplit.h index d8cd461..8726cf1 100644 --- a/include/wordsplit.h +++ b/include/wordsplit.h @@ -36,13 +36,13 @@ struct wordsplit size_t ws_wordc; /* [Output] Number of words in ws_wordv. */ char **ws_wordv; /* [Output] Array of parsed out words. */ size_t ws_offs; /* [Input] (WRDSF_DOOFFS) Number of initial elements in ws_wordv to fill with NULLs. */ size_t ws_wordn; /* Number of elements ws_wordv can accomodate. */ int ws_flags; /* [Input] Flags passed to wordsplit. */ - int ws_options; /* [Input] (WRDSF_PATHEXPAND) + int ws_options; /* [Input] (WRDSF_OPTIONS) Additional options. */ const char *ws_delim; /* [Input] (WRDSF_DELIM) Word delimiters. */ const char *ws_comment; /* [Input] (WRDSF_COMMENT) Comment characters. */ const char *ws_escape[2]; /* [Input] (WRDSF_ESCAPE) Characters to be escaped with backslash. */ void (*ws_alloc_die) (wordsplit_t *wsp); |