diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2016-11-05 20:18:05 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2016-11-05 20:18:05 +0200 |
commit | fd19deb4391f18e1a752ae5cfe4a9d3155e97705 (patch) | |
tree | 04fe4977ea9197ed4156498d3efc9c8bde0302ce /maidag | |
parent | e8f82804806e94f9b6e4fc072d785e29ea099827 (diff) | |
download | mailutils-fd19deb4391f18e1a752ae5cfe4a9d3155e97705.tar.gz mailutils-fd19deb4391f18e1a752ae5cfe4a9d3155e97705.tar.bz2 |
Fix option sorting.
* libmailutils/opt/opt.c (sort_group): Don't assume stability of the sort.
Use auxiliary data structure to sort array of options that contain aliases.
* libmailutils/tests/parseopt.c (set_prog_args): Fix delimiter.
* libmailutils/tests/strtoc.c (v_cidr_format): Error checking.
* maidag/Makefile.am (maidag_LDADD): Reorder libraries to make sure maidag
uses freshly built libraries (not the ones already installed in the system).
* mh/pick.c (options): Bugfix.
Diffstat (limited to 'maidag')
-rw-r--r-- | maidag/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/maidag/Makefile.am b/maidag/Makefile.am index 53c887eaf..d684f41f5 100644 --- a/maidag/Makefile.am +++ b/maidag/Makefile.am @@ -33,9 +33,6 @@ endif maidag_LDADD = \ ../lib/libmuscript.a\ - @LIBMU_SCM@ @GUILE_LIBS@\ - @LIBMU_SCM_DEPS@\ - @MU_LIB_PY@ @PYTHON_LIBS@\ ${MU_APP_LIBRARIES}\ ${MU_LIB_SIEVE}\ ${MU_LIB_MBOX}\ @@ -49,7 +46,12 @@ maidag_LDADD = \ @MU_AUTHLIBS@\ ${MU_LIB_MAILUTILS} \ @MU_COMMON_LIBRARIES@\ + @LIBMU_SCM@\ + @LIBMU_SCM_DEPS@\ + @MU_LIB_PY@\ $(LIBMU_DBM)\ + @GUILE_LIBS@\ + @PYTHON_LIBS@\ @DBMLIBS@\ @MU_TCPWRAP_LIBRARIES@ |