Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit bb377b15 bb377b15420cbd45ef91838cf7491d3453fcc32e by Sergey Poznyakoff
Options

Make libmailutils independent from gnulib. Remove generated files 

from the repository. Bootstrap directly from the gnulib CVS.

* configure.ac: Update.
* lib/Makefile.am: Update.
* mailbox/Makefile.am: Update.
* include/mailutils/Makefile.am (SUBDIRS): Remove gnu
* include/mailutils/gnu/Makefile.am: Remove
* examples/argcv.c, examples/mta.c, guimb/guimb.h,
imap4d/imap4d.h, libargp/mu_argp.c, libargp/tls.c,
maidag/maidag.h, mail/mail.h, mail/send.c,
mail.local/mail.local.h, mh/mh.h: Remove getline.h
* libproto/nntp/mbox.c: Include mailutils/md5.h
* libargp/cmdline.h: Include strings.h
* m4/debug.m4, m4/enable.m4, m4/gsasl.m4, m4/guile.m4,
m4/mu_libobj.m4: Minor fix
* m4/intmax.m4,m4/inttypes-pri.m4,m4/inttypes_h.m4: Update
* mailbox/alloca.h: Remove
* mailbox/mailbox.c: Include string.h
* mailbox/nls.c: Include locale.h
* po/Makevars: Remove.

* absolute-header.m4, alloca.m4, allocsa.m4, argp.m4, codeset.m4,
d-type.m4, eealloc.m4, eoverflow.m4, error.m4, exitfail.m4,
extensions.m4, fnmatch.m4, full-header-path.m4, getdelim.m4,
getline.m4, getlogin_r.m4, getndelim2.m4, getopt.m4, getpass.m4,
gettext.m4, glibc2.m4, glibc21.m4, glob.m4, gnulib.m4, iconv.m4,
intdiv0.m4, isc-posix.m4, lcmessage.m4, lib-ld.m4, lib-link.m4,
lib-prefix.m4, lock.m4, longdouble.m4, longlong.m4,
mailbox-link.m4, mbchar.m4, mbiter.m4, mbrtowc.m4, mbstate_t.m4,
mbswidth.m4, memchr.m4, mempcpy.m4, minmax.m4, obstack.m4,
onceonly.m4, po.m4, printf-posix.m4, progtest.m4, regex.m4,
restrict.m4, setenv.m4, signed.m4, size_max.m4, snprintf.m4,
ssize_t.m4, stat-macros.m4, stdbool.m4, stdint.m4, stdint_h.m4,
strcase.m4, strchrnul.m4, strdup.m4, strerror_r.m4, strndup.m4,
strnlen.m4, strtok_r.m4, sysexits.m4, uint32_t.m4, uintmax_t.m4,
ulonglong.m4, unistd_h.m4, unlocked-io.m4, vasnprintf.m4,
vasprintf.m4, visibility.m4, vsnprintf.m4, wchar_t.m4, wcwidth.m4,
wint_t.m4, xalloc.m4, xsize.m4: Remove.

* alloca.c, allocsa.c, allocsa.h, asprintf.c, basename.c, error.c,
error.h, exit.h, exitfail.c, exitfail.h, fnmatch.c, fnmatch_.h,
fnmatch_loop.c, getpass.c, getpass.h, intprops.h, malloc.c,
mbswidth.c, mbswidth.h, md5.c, md5.h, obstack.c, obstack.h,
realloc.c, setenv.c, setenv.h, snprintf.c, snprintf.h, stdbool.h,
stdbool_.h, strcasecmp.c, strncasecmp.c, strsignal.c, strtok_r.c,
unsetenv.c, utmp.c, vasprintf.c, vasprintf.h, vsyslog.c,
xalloc-die.c, xalloc.h, xalloc_die.c, xmalloc.c, xsize.h,
xstrdup.c: Remove.

* alloca.c, alloca_.h, argp-ba.c, argp-eexst.c, argp-fmtstream.c,
argp-fmtstream.h, argp-fs-xinl.c, argp-help.c, argp-namefrob.h,
argp-parse.c, argp-pin.c, argp-pv.c, argp-pvh.c, argp-xinl.c,
argp.h, asnprintf.c, fnmatch.c, fnmatch_.h, fnmatch_loop.c,
getdelim.c, getdelim.h, getline.c, getline.h, getlogin_r.c,
getlogin_r.h, getndelim2.c, getndelim2.h, getopt.c, getopt.h,
getopt1.c, getopt_.h, getopt_int.h, gettext.h, glob-libc.h,
glob.c, glob_.h, malloc.c, mbchar.c, mbchar.h, mbuiter.h,
memchr.c, mempcpy.c, mempcpy.h, minmax.h, pin.c, printf-args.c,
printf-args.h, printf-parse.c, printf-parse.h, regcomp.c, regex.c,
regex.h, regex_internal.c, regex_internal.h, regexec.c,
stat-macros.h, stdbool_.h, stdint_.h, strcase.h, strcasecmp.c,
strchrnul.c, strchrnul.h, strdup.c, strdup.h, strncasecmp.c,
strndup.c, strndup.h, strnlen.c, strnlen.h, strnlen1.c,
strnlen1.h, strtok_r.c, strtok_r.h, sysexit_.h, unlocked-io.h,
vasnprintf.c, vasnprintf.h, vsnprintf.c, vsnprintf.h, wcwidth.h,
xsize.h: Remove.
1 parent 947065be
Inline Side-by-side
Showing 35 changed files with 339 additions and 482 deletions
...@@ -5,12 +5,12 @@ Makefile ...@@ -5,12 +5,12 @@ Makefile
5 Makefile.in 5 Makefile.in
6 _* 6 _*
7 aclocal.m4 7 aclocal.m4
8 autom4te.cache
8 config.h 9 config.h
9 config.h.in 10 config.h.in
10 config.log 11 config.log
11 config.status 12 config.status
12 configure 13 configure
13 autom4te.cache
14 intl 14 intl
15 libtool 15 libtool
16 stamp-h1 16 stamp-h1
......
...@@ -20,10 +20,8 @@ dnl Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA ...@@ -20,10 +20,8 @@ dnl Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 AC_INIT([GNU Mailutils], [1.2.90], [bug-mailutils@gnu.org], [mailutils]) 20 AC_INIT([GNU Mailutils], [1.2.90], [bug-mailutils@gnu.org], [mailutils])
21 AC_CONFIG_SRCDIR([mailbox/mailbox.c]) 21 AC_CONFIG_SRCDIR([mailbox/mailbox.c])
22 AC_CONFIG_AUX_DIR([scripts]) 22 AC_CONFIG_AUX_DIR([scripts])
23 AC_CANONICAL_TARGET([])
24 AM_INIT_AUTOMAKE 23 AM_INIT_AUTOMAKE
25 AC_CONFIG_HEADERS([config.h]) 24 AC_CONFIG_HEADERS([config.h])
26 gl_USE_SYSTEM_EXTENSIONS
27 25
28 AC_PREREQ(2.60) 26 AC_PREREQ(2.60)
29 27
...@@ -54,11 +52,12 @@ AC_SUBST(SIEVE_MODDIR,'$(libdir)/$(PACKAGE)') ...@@ -54,11 +52,12 @@ AC_SUBST(SIEVE_MODDIR,'$(libdir)/$(PACKAGE)')
54 AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)') 52 AC_SUBST(MU_COMMON_LIBRARIES,'$(LTLIBINTL) $(LTLIBICONV)')
55 AC_SUBST(MU_APP_LIBRARIES,'../lib/libmuaux.la ../libargp/libargp.a -L${top_builddir}/libcfg -lmucfg') 53 AC_SUBST(MU_APP_LIBRARIES,'../lib/libmuaux.la ../libargp/libargp.a -L${top_builddir}/libcfg -lmucfg')
56 54
57 AC_SUBST(MU_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_builddir}/include/mailutils/gnu -I${top_srcdir}/mailbox -I${top_srcdir}/libargp -I${top_srcdir}/libcfg') 55 AC_SUBST(MU_COMMON_INCLUDES,'-I${srcdir} -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_builddir}/lib -I${top_builddir} -I${top_builddir}/include -I${top_srcdir}/mailbox -I${top_srcdir}/libargp -I${top_srcdir}/libcfg')
58 56
59 dnl Check for programs 57 dnl Check for programs
60 AC_PROG_CC 58 AC_PROG_CC
61 AM_PROG_CC_C_O 59 AM_PROG_CC_C_O
60 gl_EARLY
62 AC_PROG_CXX 61 AC_PROG_CXX
63 AC_PROG_INSTALL 62 AC_PROG_INSTALL
64 AC_PROG_LN_S 63 AC_PROG_LN_S
...@@ -92,6 +91,18 @@ AC_CHECK_TYPE(iconv_t,:, ...@@ -92,6 +91,18 @@ AC_CHECK_TYPE(iconv_t,:,
92 AC_SUBST(MU_LINK_POSTFLAGS,[`for opt in $LTLIBICONV; do case $opt in -[[lL]]*) echo $opt;; esac; done|tr '\n' ' '`]) 91 AC_SUBST(MU_LINK_POSTFLAGS,[`for opt in $LTLIBICONV; do case $opt in -[[lL]]*) echo $opt;; esac; done|tr '\n' ' '`])
93 92
94 93
94 dnl Escape defuns that force automake to add their arguments
95 dnl to LIBOBJS.
96 dnl All dependencies has been handled by gnulib-sync.
97
98 AC_DEFINE([GNULIB_ARGP_EXTERN_BASENAME],1,
99 [Define to use our own version of __argp_base_name])
100
101 # Check for large file support
102 AC_SYS_LARGEFILE
103
104 gl_INIT
105
95 dnl Check for libraries 106 dnl Check for libraries
96 USE_LOADABLE_MODULES=no 107 USE_LOADABLE_MODULES=no
97 AC_CHECK_LIB(resolv, res_query) 108 AC_CHECK_LIB(resolv, res_query)
...@@ -368,32 +379,6 @@ AC_CHECK_MEMBERS([struct tm.tm_zone, struct tm.tm_gmtoff, struct tm.tm_isdst], ...@@ -368,32 +379,6 @@ AC_CHECK_MEMBERS([struct tm.tm_zone, struct tm.tm_gmtoff, struct tm.tm_isdst],
368 379
369 dnl Check for working functions 380 dnl Check for working functions
370 381
371 dnl Escape defuns that force automake to add their arguments
372 dnl to LIBOBJS.
373 dnl All dependencies has been handled by gnulib-sync.
374
375 m4_copy([AC_REPLACE_FUNCS],[MU_SAVE_AC_REPLACE_FUNCS])
376 m4_copy([AC_LIBOBJ],[MU_SAVE_AC_LIBOBJ])
377
378 m4_copy([MU_LIBOBJ],[AC_LIBOBJ])
379 AC_DEFUN([AC_REPLACE_FUNCS],
380 [AC_CHECK_FUNCS([$1], , [MU_LIBOBJ($ac_func)])
381 ])
382
383 libmailutils_GNULIB
384
385 AC_DEFINE([GNULIB_ARGP_EXTERN_BASENAME],1,
386 [Define to use our own version of __argp_base_name])
387
388 dnl Restore overridden defuns
389 m4_copy([MU_SAVE_AC_REPLACE_FUNCS],[AC_REPLACE_FUNCS])
390 m4_copy([MU_SAVE_AC_LIBOBJ],[AC_LIBOBJ])
391
392 libmuaux_GNULIB
393
394 # Check for large file support
395 AC_SYS_LARGEFILE
396
397 ##### 382 #####
398 # Determine the size of off_t and define an equivalent mu_off_t type. 383 # Determine the size of off_t and define an equivalent mu_off_t type.
399 # We cannot use off_t in the library since its size depends on whether 384 # We cannot use off_t in the library since its size depends on whether
...@@ -411,7 +396,6 @@ elif test $ac_cv_sizeof_off_t -eq $ac_cv_sizeof_long_long; then ...@@ -411,7 +396,6 @@ elif test $ac_cv_sizeof_off_t -eq $ac_cv_sizeof_long_long; then
411 else 396 else
412 AC_MSG_ERROR([Cannot find ${ac_cv_sizeof_off_t}-byte type, suitable for mu_off_t]) 397 AC_MSG_ERROR([Cannot find ${ac_cv_sizeof_off_t}-byte type, suitable for mu_off_t])
413 fi 398 fi
414
415 AC_FUNC_MMAP 399 AC_FUNC_MMAP
416 400
417 AC_CHECK_DECLS([strtok_r, strchrnul, strndup, asprintf, vasprintf, strsignal], 401 AC_CHECK_DECLS([strtok_r, strchrnul, strndup, asprintf, vasprintf, strsignal],
...@@ -452,29 +436,18 @@ AH_BOTTOM([ ...@@ -452,29 +436,18 @@ AH_BOTTOM([
452 #endif 436 #endif
453 ]) 437 ])
454 438
455 MU_CHECK_FUNC(fgetpwent) 439 AC_CHECK_FUNC(fgetpwent)
456 440
457 ## Check for presence of utmp.h and utmp-related functions 441 ## Check for presence of utmp.h and utmp-related functions
458 MU_CHECK_UTMP 442 MU_CHECK_UTMP
459 443
460 dnl Check for libraries 444 dnl Check for libraries
461 445
462 # FIXME: We used to allow to link against libc copy of argp (if any)
463 # The gnulib version fixes a number of bugs and provides new features,
464 # so currently we force to use it. This may change when gnulib and glibc
465 # are synchronized.
466 MU_HEADER(getopt.h,getopt_.h)
467 MU_HEADER(argp.h)
468
469 AH_BOTTOM([ 446 AH_BOTTOM([
470 /* program_name is used by lib/error.c */ 447 /* program_name is used by lib/error.c */
471 #define program_name program_invocation_name 448 #define program_name program_invocation_name
472 ]) 449 ])
473 450
474 if test "$ac_use_included_regex" = yes; then
475 MU_HEADER(regex.h)
476 fi
477
478 451
479 ## FriBidi support 452 ## FriBidi support
480 453
...@@ -514,7 +487,6 @@ if test "$use_fribidi" = "yes"; then ...@@ -514,7 +487,6 @@ if test "$use_fribidi" = "yes"; then
514 fi 487 fi
515 488
516 489
517
518 ## SQL support 490 ## SQL support
519 491
520 AH_TEMPLATE(USE_SQL,[Enables SQL support]) 492 AH_TEMPLATE(USE_SQL,[Enables SQL support])
...@@ -1061,18 +1033,6 @@ dnl get sysconfdir expanded. ...@@ -1061,18 +1033,6 @@ dnl get sysconfdir expanded.
1061 1033
1062 CPPFLAGS="$CPPFLAGS -DSYSCONFDIR=\\\"\$(sysconfdir)\\\"" 1034 CPPFLAGS="$CPPFLAGS -DSYSCONFDIR=\\\"\$(sysconfdir)\\\""
1063 1035
1064 S=`echo "$MU_LIBOBJS" |
1065 tr ' ' '\n' | sort | uniq |
1066 sed 's,\.[[^.]]* ,$U&,g;s,\.[[^.]]*$,$U&,' |
1067 tr '\n' ' '`
1068 MU_LTLIBOBJS=`echo "$S" |
1069 sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`
1070 AC_SUBST(MU_LTLIBOBJS)
1071
1072 MU_FINISH
1073
1074 ### Display the status
1075
1076 AC_CONFIG_COMMANDS([status],[ 1036 AC_CONFIG_COMMANDS([status],[
1077 cat <<EOF 1037 cat <<EOF
1078 1038
......
...@@ -24,7 +24,6 @@ ...@@ -24,7 +24,6 @@
24 #include <string.h> 24 #include <string.h>
25 #include <errno.h> 25 #include <errno.h>
26 #include <unistd.h> 26 #include <unistd.h>
27 #include <getline.h>
28 #include <mailutils/argcv.h> 27 #include <mailutils/argcv.h>
29 #include <mailutils/errno.h> 28 #include <mailutils/errno.h>
30 29
......
...@@ -61,7 +61,6 @@ ...@@ -61,7 +61,6 @@
61 #include <sys/socket.h> 61 #include <sys/socket.h>
62 #include <netinet/in.h> 62 #include <netinet/in.h>
63 #include <mu_asprintf.h> 63 #include <mu_asprintf.h>
64 #include <getline.h>
65 #include <mailutils/argcv.h> 64 #include <mailutils/argcv.h>
66 #include <mailutils/mailutils.h> 65 #include <mailutils/mailutils.h>
67 66
......
...@@ -27,7 +27,6 @@ ...@@ -27,7 +27,6 @@
27 #include <unistd.h> 27 #include <unistd.h>
28 #include <errno.h> 28 #include <errno.h>
29 #include <string.h> /* strerror(3), strdup(3) */ 29 #include <string.h> /* strerror(3), strdup(3) */
30 #include <getline.h>
31 30
32 #include <mailutils/errno.h> 31 #include <mailutils/errno.h>
33 #include <mailutils/mailbox.h> 32 #include <mailutils/mailbox.h>
......
...@@ -97,7 +97,6 @@ ...@@ -97,7 +97,6 @@
97 97
98 #include <mu_asprintf.h> 98 #include <mu_asprintf.h>
99 #include <mu_umaxtostr.h> 99 #include <mu_umaxtostr.h>
100 #include <getline.h>
101 100
102 #ifdef __cplusplus 101 #ifdef __cplusplus
103 extern "C" { 102 extern "C" {
......
...@@ -82,5 +82,5 @@ pkginclude_HEADERS = \ ...@@ -82,5 +82,5 @@ pkginclude_HEADERS = \
82 nobase_pkginclude_HEADERS = \ 82 nobase_pkginclude_HEADERS = \
83 sys/nntp.h\ 83 sys/nntp.h\
84 sys/pop3.h 84 sys/pop3.h
85 SUBDIRS = gnu sys 85 SUBDIRS = sys
86 86
......
1 ## Process this file with GNU Automake to create Makefile.in
2
3 ## Copyright (C) 2002, 2005, 2007 Free Software Foundation, Inc.
4 ##
5 ## GNU Mailutils is free software; you can redistribute it and/or
6 ## modify it under the terms of the GNU General Public License as
7 ## published by the Free Software Foundation; either version 3, or (at
8 ## your option) any later version.
9 ##
10 ## This program is distributed in the hope that it will be useful, but
11 ## WITHOUT ANY WARRANTY; without even the implied warranty of
12 ## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
13 ## General Public License for more details.
14 ##
15 ## You should have received a copy of the GNU General Public License
16 ## along with this program; if not, write to the Free Software
17 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
18 ## 02110-1301 USA
19
20 AUTOMAKE_OPTIONS=no-dependencies
21
22 gnudir = $(pkgincludedir)/gnu
23 EXTRA_HEADERS =
24 gnu_HEADERS = @GNU_INCLS@
25 DISTCLEANFILES = getopt.h argp.h regex.h
1 Makefile.in 1 *.lo
2 Makefile
3 .deps 2 .deps
4 .libs 3 .libs
5 *.lo 4 Makefile
6 libmuaux.la 5 Makefile.in
6 alloca.c
7 alloca.h
8 alloca.in.h
9 argp-ba.c
10 argp-eexst.c
11 argp-fmtstream.c
12 argp-fmtstream.h
13 argp-fs-xinl.c
14 argp-help.c
15 argp-namefrob.h
16 argp-parse.c
17 argp-pin.c
18 argp-pv.c
19 argp-pvh.c
20 argp-xinl.c
21 argp.h
22 asnprintf.c
23 asprintf.c
24 at-func.c
25 basename.c
26 canonicalize-lgpl.c
27 canonicalize.h
28 chdir-long.c
29 chdir-long.h
30 chown.c
31 config.charset
32 creat-safer.c
33 dirent.h
34 dirent.in.h
35 dirfd.c
36 dirfd.h
37 dirname.c
38 dirname.h
39 dup-safer.c
40 dup2.c
41 error.c
42 error.h
43 exitfail.c
44 exitfail.h
45 fchdir.c
46 fchmodat.c
47 fchown-stub.c
48 fchownat.c
49 fcntl--.h
50 fcntl-safer.h
51 fcntl.h
52 fcntl.in.h
53 fd-safer.c
54 float+.h
55 float.h
56 float.in.h
57 fnmatch.c
58 fnmatch.h
59 fnmatch.in.h
60 fnmatch_loop.c
61 fstatat.c
62 getcwd.c
63 getdelim.c
64 getline.c
65 getlogin_r.c
66 getopt.c
67 getopt.h
68 getopt.in.h
69 getopt1.c
70 getopt_int.h
71 getpass.c
72 getpass.h
73 gettext.h
74 glob-libc.h
75 glob.c
76 glob.h
77 glob.in.h
78 gnulib.mk
79 intprops.h
80 lchown.c
7 libmailutils.la 81 libmailutils.la
82 libmuaux.la
83 localcharset.c
84 localcharset.h
85 lstat.c
86 lstat.h
87 malloc.c
88 malloca.c
89 malloca.h
90 malloca.valgrind
91 mbswidth.c
92 mbswidth.h
93 mempcpy.c
94 memrchr.c
95 mkdirat.c
96 obstack.c
97 obstack.h
98 open-safer.c
99 openat-die.c
100 openat-priv.h
101 openat-proc.c
102 openat.c
103 openat.h
104 pathmax.h
105 pipe-safer.c
106 printf-args.c
107 printf-args.h
108 printf-parse.c
109 printf-parse.h
110 readlink.c
111 realloc.c
112 ref-add.sed
113 ref-add.sin
114 ref-del.sed
115 ref-del.sin
116 regcomp.c
117 regex.c
118 regex.h
119 regex_internal.c
120 regex_internal.h
121 regexec.c
122 same-inode.h
123 save-cwd.c
124 save-cwd.h
125 setenv.c
126 setenv.h
127 sleep.c
128 snprintf.c
129 stdbool.h
130 stdbool.in.h
131 stdint.h
132 stdint.in.h
133 stdio.h
134 stdio.in.h
135 stdlib.h
136 stdlib.in.h
137 strcasecmp.c
138 strchrnul.c
139 strdup.c
140 streq.h
141 strerror.c
142 string.h
143 string.in.h
144 stripslash.c
145 strncasecmp.c
146 strndup.c
147 strnlen.c
148 strtok_r.c
149 sys
150 sys_stat.h
151 sys_stat.in.h
152 sysexits.h
153 sysexits.in.h
154 unistd--.h
155 unistd-safer.h
156 unistd.h
157 unistd.in.h
158 unitypes.h
159 uniwidth.h
160 unsetenv.c
161 vasnprintf.c
162 vasnprintf.h
163 vasprintf.c
164 vsnprintf.c
165 wchar.h
166 wchar.in.h
167 wctype.h
168 wctype.in.h
169 wcwidth.c
170 xalloc-die.c
171 xalloc.h
172 xgetcwd.c
173 xgetcwd.h
174 xmalloc.c
175 xsize.h
176 xstrndup.c
177 xstrndup.h
......
...@@ -18,11 +18,11 @@ ...@@ -18,11 +18,11 @@
18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 18 ## Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA
19 ## 02110-1301 USA 19 ## 02110-1301 USA
20 20
21 noinst_LTLIBRARIES = libmuaux.la 21 include gnulib.mk
22 22
23 INCLUDES = @MU_COMMON_INCLUDES@ 23 INCLUDES = @MU_COMMON_INCLUDES@
24 24
25 libmuaux_la_SOURCES = \ 25 libmuaux_la_SOURCES += \
26 argpinit.c\ 26 argpinit.c\
27 daemon.c\ 27 daemon.c\
28 mailcap.c\ 28 mailcap.c\
...@@ -30,44 +30,8 @@ libmuaux_la_SOURCES = \ ...@@ -30,44 +30,8 @@ libmuaux_la_SOURCES = \
30 muinit.c\ 30 muinit.c\
31 mu_dbm.c 31 mu_dbm.c
32 32
33 EXTRA_DIST = utmp.c 33 noinst_HEADERS +=\
34
35 noinst_HEADERS =\
36 mu_dbm.h\ 34 mu_dbm.h\
37 mu_asprintf.h 35 mu_asprintf.h
38 36
39 libmuaux_la_LIBADD = @LTLIBOBJS@
40
41 BUILT_SOURCES=
42 MOSTLYCLEANFILES=
43
44 ##:## EOF marker for gnulib-sync script. Please, do not remove ##:##
45 ## Do not change anything below this line ##
46 libmuaux_la_SOURCES += allocsa.h allocsa.c
47 EXTRA_DIST += allocsa.valgrind
48
49
50 libmuaux_la_SOURCES += exit.h
51
52 EXTRA_DIST += exitfail.h
53
54 EXTRA_DIST += xalloc.h
55
56 EXTRA_DIST += xalloc.h
57
58 EXTRA_DIST += getpass.h
59
60 libmuaux_la_SOURCES += mbswidth.h mbswidth.c
61
62
63
64 libmuaux_la_SOURCES += setenv.h
65
66 libmuaux_la_SOURCES += snprintf.h
67
68 libmuaux_la_SOURCES += vasprintf.h
69
70 libmuaux_la_SOURCES += xalloc-die.c
71
72 libmuaux_la_SOURCES += xsize.h
73 37
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
30 #include "mailutils/errno.h" 30 #include "mailutils/errno.h"
31 #include "argp.h" 31 #include "argp.h"
32 #include <errno.h> /* May declare program_invocation_name */ 32 #include <errno.h> /* May declare program_invocation_name */
33 #include <strings.h>
33 34
34 #ifdef __cplusplus 35 #ifdef __cplusplus
35 extern "C" { 36 extern "C" {
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
21 # include <config.h> 21 # include <config.h>
22 #endif 22 #endif
23 23
24 #include <getline.h>
25 #include <pwd.h> 24 #include <pwd.h>
26 #include <stdio.h> 25 #include <stdio.h>
27 #include <stdlib.h> 26 #include <stdlib.h>
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
22 22
23 #include "cmdline.h" 23 #include "cmdline.h"
24 #include <mailutils/tls.h> 24 #include <mailutils/tls.h>
25 #include "strcase.h" /* FIXME */
26 25
27 static struct argp_option _tls_argp_options[] = { 26 static struct argp_option _tls_argp_options[] = {
28 {"ssl-cert", OPT_SSL_CERT, N_("FILE"), OPTION_HIDDEN, 27 {"ssl-cert", OPT_SSL_CERT, N_("FILE"), OPTION_HIDDEN,
......
...@@ -37,8 +37,7 @@ ...@@ -37,8 +37,7 @@
37 # include <strings.h> 37 # include <strings.h>
38 #endif 38 #endif
39 39
40 #include <md5.h> 40 #include <mailutils/md5.h>
41
42 #include <mailutils/body.h> 41 #include <mailutils/body.h>
43 #include <mailutils/debug.h> 42 #include <mailutils/debug.h>
44 #include <mailutils/errno.h> 43 #include <mailutils/errno.h>
......
1 Makefile 1 Makefile
2 Makefile.in 2 Makefile.in
3 absolute-header.m4
4 alloca.m4
5 argp.m4
6 canonicalize-lgpl.m4
7 chdir-long.m4
8 chown.m4
9 codeset.m4
10 d-ino.m4
11 d-type.m4
12 dirfd.m4
13 dirname.m4
14 dos.m4
15 double-slash-root.m4
16 dup2.m4
17 eealloc.m4
18 eoverflow.m4
19 error.m4
20 exitfail.m4
21 extensions.m4
22 fchdir.m4
23 fcntl-safer.m4
24 fcntl_h.m4
25 float_h.m4
26 fnmatch.m4
27 getcwd-abort-bug.m4
28 getcwd-path-max.m4
29 getcwd.m4
30 getdelim.m4
31 getline.m4
32 getlogin_r.m4
33 getopt.m4
34 getpass.m4
35 gettext.m4
36 glibc21.m4
37 glob.m4
38 gnulib-cache.m4
39 gnulib-common.m4
40 gnulib-comp.m4
41 gnulib-tool.m4
42 iconv.m4
43 include_next.m4
44 inline.m4
45 intl.m4
46 intldir.m4
47 intlmacosx.m4
48 lchown.m4
49 lib-ld.m4
50 lib-link.m4
51 lib-prefix.m4
52 localcharset.m4
53 longdouble.m4
54 longlong.m4
55 lstat.m4
56 malloc.m4
57 malloca.m4
58 mbrtowc.m4
59 mbstate_t.m4
60 mbswidth.m4
61 mempcpy.m4
62 memrchr.m4
63 openat.m4
64 pathmax.m4
65 po.m4
66 progtest.m4
67 readlink.m4
68 realloc.m4
69 regex.m4
70 save-cwd.m4
71 setenv.m4
72 signed.m4
73 sleep.m4
74 snprintf.m4
75 ssize_t.m4
76 stdbool.m4
77 stdint.m4
78 stdint_h.m4
79 stdio_h.m4
80 stdlib_h.m4
81 strcase.m4
82 strchrnul.m4
83 strdup.m4
84 strerror.m4
85 string_h.m4
86 strndup.m4
87 strnlen.m4
88 strtok_r.m4
89 sys_stat_h.m4
90 sysexits.m4
91 unistd-safer.m4
92 unistd_h.m4
93 vasnprintf.m4
94 vasprintf.m4
95 vsnprintf.m4
96 wchar.m4
97 wchar_t.m4
98 wctype.m4
99 wcwidth.m4
100 wint_t.m4
101 xalloc.m4
102 xgetcwd.m4
103 xsize.m4
104 xstrndup.m4
......
...@@ -15,10 +15,10 @@ dnl ...@@ -15,10 +15,10 @@ dnl
15 15
16 AC_DEFUN([MU_DEBUG_MODE], 16 AC_DEFUN([MU_DEBUG_MODE],
17 [AC_ARG_ENABLE(debug, 17 [AC_ARG_ENABLE(debug,
18 [ --enable-debug enable debugging mode], 18 AC_HELP_STRING([--enable-debug], [enable debugging mode]),
19 [if test x"$enableval" = xyes; then 19 [if test x"$enableval" = xyes; then
20 if test x"$GCC" = xyes; then 20 if test x"$GCC" = xyes; then
21 AC_MSG_CHECKING(whether gcc accepts -ggdb) 21 AC_MSG_CHECKING([whether gcc accepts -ggdb])
22 save_CFLAGS=$CFLAGS 22 save_CFLAGS=$CFLAGS
23 CFLAGS="-ggdb -Wall" 23 CFLAGS="-ggdb -Wall"
24 AC_TRY_COMPILE([],void f(){}, 24 AC_TRY_COMPILE([],void f(){},
......
...@@ -29,7 +29,7 @@ AC_DEFUN([MU_ENABLE_SUPPORT], [ ...@@ -29,7 +29,7 @@ AC_DEFUN([MU_ENABLE_SUPPORT], [
29 case "${enableval}" in 29 case "${enableval}" in
30 yes) mu_cache_var=yes;; 30 yes) mu_cache_var=yes;;
31 no) mu_cache_var=no;; 31 no) mu_cache_var=no;;
32 *) AC_MSG_ERROR(bad value ${enableval} for --disable-$1) ;; 32 *) AC_MSG_ERROR([bad value ${enableval} for --disable-$1]) ;;
33 esac], 33 esac],
34 [mu_cache_var=yes]) 34 [mu_cache_var=yes])
35 35
......
...@@ -26,7 +26,7 @@ AC_DEFUN([MU_CHECK_GSASL], ...@@ -26,7 +26,7 @@ AC_DEFUN([MU_CHECK_GSASL],
26 AC_HELP_STRING([--with-gsasl], [use libgsasl for SASL authentication]), 26 AC_HELP_STRING([--with-gsasl], [use libgsasl for SASL authentication]),
27 [case $withval in 27 [case $withval in
28 yes|no) wantgsasl=$withval;; 28 yes|no) wantgsasl=$withval;;
29 *) AC_MSG_ERROR(bad value for --with-gsasl: $withval);; 29 *) AC_MSG_ERROR([bad value for --with-gsasl: $withval]);;
30 esac], 30 esac],
31 [wantgsasl=no]) 31 [wantgsasl=no])
32 32
......
...@@ -50,7 +50,7 @@ AC_DEFUN([MU_CHECK_GUILE], ...@@ -50,7 +50,7 @@ AC_DEFUN([MU_CHECK_GUILE],
50 case "x$GUILE_VERSION" in 50 case "x$GUILE_VERSION" in
51 x[[0-9]]*) 51 x[[0-9]]*)
52 if test $GUILE_VERSION -lt 14; then 52 if test $GUILE_VERSION -lt 14; then
53 AC_MSG_RESULT(Nope. Version number too low.) 53 AC_MSG_RESULT([Nope. Version number too low.])
54 mu_cv_lib_guile=no 54 mu_cv_lib_guile=no
55 else 55 else
56 AC_DEFINE_UNQUOTED(GUILE_VERSION, $GUILE_VERSION, 56 AC_DEFINE_UNQUOTED(GUILE_VERSION, $GUILE_VERSION,
......
1 # intmax.m4 serial 2 (gettext-0.14.2) 1 # intmax.m4 serial 3 (gettext-0.16)
2 dnl Copyright (C) 2002-2005 Free Software Foundation, Inc. 2 dnl Copyright (C) 2002-2005 Free Software Foundation, Inc.
3 dnl This file is free software; the Free Software Foundation 3 dnl This file is free software; the Free Software Foundation
4 dnl gives unlimited permission to copy and/or distribute it, 4 dnl gives unlimited permission to copy and/or distribute it,
...@@ -22,7 +22,10 @@ AC_DEFUN([gt_TYPE_INTMAX_T], ...@@ -22,7 +22,10 @@ AC_DEFUN([gt_TYPE_INTMAX_T],
22 #if HAVE_INTTYPES_H_WITH_UINTMAX 22 #if HAVE_INTTYPES_H_WITH_UINTMAX
23 #include <inttypes.h> 23 #include <inttypes.h>
24 #endif 24 #endif
25 ], [intmax_t x = -1;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) 25 ], [intmax_t x = -1;
26 return !x;],
27 gt_cv_c_intmax_t=yes,
28 gt_cv_c_intmax_t=no)])
26 if test $gt_cv_c_intmax_t = yes; then 29 if test $gt_cv_c_intmax_t = yes; then
27 AC_DEFINE(HAVE_INTMAX_T, 1, 30 AC_DEFINE(HAVE_INTMAX_T, 1,
28 [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) 31 [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.])
......
1 # inttypes-pri.m4 serial 2 (gettext-0.15) 1 # inttypes-pri.m4 serial 4 (gettext-0.16)
2 dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc. 2 dnl Copyright (C) 1997-2002, 2006 Free Software Foundation, Inc.
3 dnl This file is free software; the Free Software Foundation 3 dnl This file is free software; the Free Software Foundation
4 dnl gives unlimited permission to copy and/or distribute it, 4 dnl gives unlimited permission to copy and/or distribute it,
...@@ -6,13 +6,15 @@ dnl with or without modifications, as long as this notice is preserved. ...@@ -6,13 +6,15 @@ dnl with or without modifications, as long as this notice is preserved.
6 6
7 dnl From Bruno Haible. 7 dnl From Bruno Haible.
8 8
9 AC_PREREQ(2.52)
10
9 # Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI* 11 # Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI*
10 # macros to non-string values. This is the case on AIX 4.3.3. 12 # macros to non-string values. This is the case on AIX 4.3.3.
11 13
12 AC_DEFUN([gt_INTTYPES_PRI], 14 AC_DEFUN([gt_INTTYPES_PRI],
13 [ 15 [
14 AC_REQUIRE([gl_HEADER_INTTYPES_H]) 16 AC_CHECK_HEADERS([inttypes.h])
15 if test $gl_cv_header_inttypes_h = yes; then 17 if test $ac_cv_header_inttypes_h = yes; then
16 AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], 18 AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken],
17 gt_cv_inttypes_pri_broken, 19 gt_cv_inttypes_pri_broken,
18 [ 20 [
...@@ -26,5 +28,9 @@ char *p = PRId32; ...@@ -26,5 +28,9 @@ char *p = PRId32;
26 if test "$gt_cv_inttypes_pri_broken" = yes; then 28 if test "$gt_cv_inttypes_pri_broken" = yes; then
27 AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, 29 AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1,
28 [Define if <inttypes.h> exists and defines unusable PRI* macros.]) 30 [Define if <inttypes.h> exists and defines unusable PRI* macros.])
31 PRI_MACROS_BROKEN=1
32 else
33 PRI_MACROS_BROKEN=0
29 fi 34 fi
35 AC_SUBST([PRI_MACROS_BROKEN])
30 ]) 36 ])
......
1 # inttypes_h.m4 serial 6 1 # inttypes_h.m4 serial 7
2 dnl Copyright (C) 1997-2004 Free Software Foundation, Inc. 2 dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc.
3 dnl This file is free software; the Free Software Foundation 3 dnl This file is free software; the Free Software Foundation
4 dnl gives unlimited permission to copy and/or distribute it, 4 dnl gives unlimited permission to copy and/or distribute it,
5 dnl with or without modifications, as long as this notice is preserved. 5 dnl with or without modifications, as long as this notice is preserved.
...@@ -15,7 +15,7 @@ AC_DEFUN([gl_AC_HEADER_INTTYPES_H], ...@@ -15,7 +15,7 @@ AC_DEFUN([gl_AC_HEADER_INTTYPES_H],
15 [AC_TRY_COMPILE( 15 [AC_TRY_COMPILE(
16 [#include <sys/types.h> 16 [#include <sys/types.h>
17 #include <inttypes.h>], 17 #include <inttypes.h>],
18 [uintmax_t i = (uintmax_t) -1;], 18 [uintmax_t i = (uintmax_t) -1; return !i;],
19 gl_cv_header_inttypes_h=yes, 19 gl_cv_header_inttypes_h=yes,
20 gl_cv_header_inttypes_h=no)]) 20 gl_cv_header_inttypes_h=no)])
21 if test $gl_cv_header_inttypes_h = yes; then 21 if test $gl_cv_header_inttypes_h = yes; then
......
1 dnl This file is part of GNU mailutils.
2 dnl Copyright (C) 2001, 2005, 2007 Free Software Foundation, Inc.
3 dnl
4 dnl This program is free software; you can redistribute it and/or modify
5 dnl it under the terms of the GNU General Public License as published by
6 dnl the Free Software Foundation; either version 3 of the License, or
7 dnl (at your option) any later version.
8 dnl
9 dnl This program is distributed in the hope that it will be useful,
10 dnl but WITHOUT ANY WARRANTY; without even the implied warranty of
11 dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 dnl GNU General Public License for more details.
13 dnl
14 dnl You should have received a copy of the GNU General Public License
15 dnl along with this program; if not, write to the Free Software Foundation,
16 dnl Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
17 dnl
18
19 AC_SUBST(MU_LIBOBJS)
20 AC_SUBST(MU_EXTRA_DIST)
21
22 AC_SUBST(MU_EXTRA_DIST)
23 m4_define([mu_extra_dist],[])
24 AC_DEFUN([MU_LIBSOURCES],[
25 m4_foreach(source, [$1], [m4_define([mu_extra_dist], mu_extra_dist source)])])
26 AC_DEFUN([MU_LIBSOURCE],[m4_define([mu_extra_dist], mu_extra_dist [$1])])
27
28 AC_DEFUN([MU_FINISH],[
29 [MU_EXTRA_DIST]="mu_extra_dist"
30 ])
31
32 AC_DEFUN([MU_LIBOBJ],[
33 MU_LIBOBJS="$MU_LIBOBJS $1.o"])
34
35 AC_DEFUN([MU_CHECK_FUNC],[
36 AC_CHECK_FUNC($1,,
37 [MU_LIBOBJ($1)])])
38
39 AC_DEFUN([MU_REPLACE_FUNCS],
40 [AC_CHECK_FUNCS([$1], , [dnl
41 MU_LIBOBJ($ac_func)
42 ])])
43
44 AC_SUBST(GNU_INCLS)
45 AC_DEFUN([MU_HEADER],[
46 pushdef([mu_upcase],translit($1,[a-z-],[A-Z_]))
47 pushdef([mu_cache_var],[mu_cv_header_]translit($1,[-./],[___]))
48
49 if test x"[$]mu_cache_var" != xyes; then
50 AC_CONFIG_LINKS(include/mailutils/gnu/$1:mailbox/ifelse($2,,$1,$2))
51 GNU_INCLS="$GNU_INCLS $1"
52 mu_cache_var=yes
53 fi
54
55 popdef([mu_upcase])
56 popdef([mu_cache_var])
57 ])
58
...@@ -86,7 +86,6 @@ ...@@ -86,7 +86,6 @@
86 86
87 #include <mu_dbm.h> 87 #include <mu_dbm.h>
88 #include <mu_asprintf.h> 88 #include <mu_asprintf.h>
89 #include <getline.h>
90 89
91 #if defined (USE_DBM) || defined (USE_SQL) 90 #if defined (USE_DBM) || defined (USE_SQL)
92 # define USE_MAILBOX_QUOTAS 1 91 # define USE_MAILBOX_QUOTAS 1
......
...@@ -86,7 +86,6 @@ ...@@ -86,7 +86,6 @@
86 86
87 #include <mu_dbm.h> 87 #include <mu_dbm.h>
88 #include <mu_asprintf.h> 88 #include <mu_asprintf.h>
89 #include <getline.h>
90 89
91 #if defined (USE_DBM) || defined (USE_SQL) 90 #if defined (USE_DBM) || defined (USE_SQL)
92 # define USE_MAILBOX_QUOTAS 1 91 # define USE_MAILBOX_QUOTAS 1
......
...@@ -82,7 +82,6 @@ ...@@ -82,7 +82,6 @@
82 #include <mailutils/nls.h> 82 #include <mailutils/nls.h>
83 #include <mailutils/tls.h> 83 #include <mailutils/tls.h>
84 #include <mailutils/argcv.h> 84 #include <mailutils/argcv.h>
85 #include <getline.h>
86 #include <mu_asprintf.h> 85 #include <mu_asprintf.h>
87 86
88 #ifdef __cplusplus 87 #ifdef __cplusplus
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
21 #include <sys/stat.h> 21 #include <sys/stat.h>
22 #include <fcntl.h> 22 #include <fcntl.h>
23 #include <stdio.h> 23 #include <stdio.h>
24 #include <getline.h>
25 24
26 #include "mail.h" 25 #include "mail.h"
27 26
......
...@@ -32,7 +32,7 @@ AM_CPPFLAGS = \ ...@@ -32,7 +32,7 @@ AM_CPPFLAGS = \
32 -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\ 32 -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"\
33 -DLOCALEDIR=\"$(localedir)\" 33 -DLOCALEDIR=\"$(localedir)\"
34 34
35 EXTRA_DIST = @MU_EXTRA_DIST@ errors muerrno.cin parsedate.y fgetpwent.c cfg_parser.y cfg_parser.h 35 EXTRA_DIST = @MU_EXTRA_DIST@ errors muerrno.cin parsedate.y fgetpwent.c cfg_parser.y cfg_parser.h inttostr.c
36 36
37 libmailutils_la_SOURCES = \ 37 libmailutils_la_SOURCES = \
38 address.c\ 38 address.c\
...@@ -66,6 +66,7 @@ libmailutils_la_SOURCES = \ ...@@ -66,6 +66,7 @@ libmailutils_la_SOURCES = \
66 mailer.c\ 66 mailer.c\
67 mapfile_stream.c\ 67 mapfile_stream.c\
68 mbx_default.c\ 68 mbx_default.c\
69 md5.c\
69 message.c\ 70 message.c\
70 memory_stream.c\ 71 memory_stream.c\
71 message_stream.c\ 72 message_stream.c\
...@@ -86,6 +87,7 @@ libmailutils_la_SOURCES = \ ...@@ -86,6 +87,7 @@ libmailutils_la_SOURCES = \
86 registrar.c\ 87 registrar.c\
87 refcount.c\ 88 refcount.c\
88 rfc2047.c\ 89 rfc2047.c\
90 sha1.c\
89 socket_stream.c\ 91 socket_stream.c\
90 stream.c\ 92 stream.c\
91 syslog.c\ 93 syslog.c\
...@@ -93,7 +95,8 @@ libmailutils_la_SOURCES = \ ...@@ -93,7 +95,8 @@ libmailutils_la_SOURCES = \
93 tcp.c\ 95 tcp.c\
94 ticket.c\ 96 ticket.c\
95 url.c\ 97 url.c\
96 wicket.c 98 wicket.c\
99 imaxtostr.c offtostr.c umaxtostr.c
97 100
98 BUILT_SOURCES = parsedate.c muerrno.c cfg_parser.c cfg_parser.h 101 BUILT_SOURCES = parsedate.c muerrno.c cfg_parser.c cfg_parser.h
99 MOSTLYCLEANFILES= 102 MOSTLYCLEANFILES=
...@@ -112,171 +115,6 @@ cfg_parser.c cfg_parser.h: $(srcdir)/cfg_parser.y ...@@ -112,171 +115,6 @@ cfg_parser.c cfg_parser.h: $(srcdir)/cfg_parser.y
112 muerrno.c: errors muerrno.cin 115 muerrno.c: errors muerrno.cin
113 $(AWK) -f $(top_srcdir)/scripts/generr.awk $^ > $@ 116 $(AWK) -f $(top_srcdir)/scripts/generr.awk $^ > $@
114 117
115 libmailutils_la_DEPENDENCIES = @MU_LTLIBOBJS@ 118 libmailutils_la_LIBADD = @MU_COMMON_LIBRARIES@
116 libmailutils_la_LIBADD = @MU_LTLIBOBJS@ @MU_COMMON_LIBRARIES@
117 libmailutils_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@ 119 libmailutils_la_LDFLAGS = -version-info @VI_CURRENT@:@VI_REVISION@:@VI_AGE@
118 120
119 ##:## EOF marker for gnulib-sync script. Please, do not remove ##:##
120 ## Do not change anything below this line ##
121
122 BUILT_SOURCES += $(ALLOCA_H)
123 EXTRA_DIST += alloca_.h
124
125 # We need the following in order to create <alloca.h> when the system
126 # doesn't have one that works with the given compiler.
127 alloca.h: alloca_.h
128 cp -f $(srcdir)/alloca_.h $@-t
129 mv -f $@-t $@
130 MOSTLYCLEANFILES += alloca.h alloca.h-t
131
132 libmailutils_la_SOURCES += argp.h argp-ba.c argp-eexst.c \
133 argp-fmtstream.c argp-fmtstream.h argp-fs-xinl.c argp-help.c \
134 argp-namefrob.h argp-parse.c argp-pin.c argp-pv.c argp-pvh.c \
135 argp-xinl.c
136
137 EXTRA_DIST += getline.h
138
139 EXTRA_DIST += regcomp.c regex.h regex_internal.c regex_internal.h regexec.c
140
141 libmailutils_la_SOURCES += strtok_r.h
142
143 BUILT_SOURCES += $(GLOB_H)
144 EXTRA_DIST += glob_.h glob-libc.h
145
146 # We need the following in order to create <glob.h> when the system
147 # doesn't have one that works with the given compiler.
148 glob.h: glob_.h
149 cp -f $(srcdir)/glob_.h $@-t
150 mv -f $@-t $@
151 MOSTLYCLEANFILES += glob.h glob.h-t
152
153 EXTRA_DIST += inttostr.c inttostr.h
154
155
156
157
158 BUILT_SOURCES += $(FNMATCH_H)
159 EXTRA_DIST += fnmatch_.h fnmatch_loop.c
160
161 # We need the following in order to create <fnmatch.h> when the system
162 # doesn't have one that supports the required API.
163 fnmatch.h: fnmatch_.h
164 cp -f $(srcdir)/fnmatch_.h $@-t
165 mv -f $@-t $@
166 MOSTLYCLEANFILES += fnmatch.h fnmatch.h-t
167
168 EXTRA_DIST += getdelim.h
169
170 EXTRA_DIST += getlogin_r.h
171
172 BUILT_SOURCES += $(GETOPT_H)
173 EXTRA_DIST += getopt_.h getopt_int.h
174
175 # We need the following in order to create <getopt.h> when the system
176 # doesn't have one that works with the given compiler.
177 getopt.h: getopt_.h
178 cp -f $(srcdir)/getopt_.h $@-t
179 mv -f $@-t $@
180 MOSTLYCLEANFILES += getopt.h getopt.h-t
181
182 libmailutils_la_SOURCES += gettext.h
183
184 EXTRA_DIST += intprops.h
185
186
187 libmailutils_la_SOURCES += mbchar.h
188
189 libmailutils_la_SOURCES += mbuiter.h
190
191
192 EXTRA_DIST += mempcpy.h
193
194 libmailutils_la_SOURCES += minmax.h
195
196 libmailutils_la_SOURCES += size_max.h
197
198
199 EXTRA_DIST += stat-macros.h
200
201 BUILT_SOURCES += $(STDBOOL_H)
202 EXTRA_DIST += stdbool_.h
203
204 # We need the following in order to create <stdbool.h> when the system
205 # doesn't have one that works.
206 stdbool.h: stdbool_.h
207 rm -f $@-t $@
208 sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h > $@-t
209 mv $@-t $@
210 MOSTLYCLEANFILES += stdbool.h stdbool.h-t
211
212 BUILT_SOURCES += $(STDINT_H)
213 EXTRA_DIST += stdint_.h
214
215 # We need the following in order to create <stdint.h> when the system
216 # doesn't have one that works with the given compiler.
217 stdint.h: stdint_.h
218 rm -f $@-t $@
219 sed -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
220 -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
221 -e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \
222 -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
223 -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
224 -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
225 -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
226 -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
227 -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
228 -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
229 -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
230 -e 's/@''HAVE_SIGNED_SIG_ATOMIC_T''@/$(HAVE_SIGNED_SIG_ATOMIC_T)/g' \
231 -e 's/@''SIG_ATOMIC_T_SUFFIX''@/$(SIG_ATOMIC_T_SUFFIX)/g' \
232 -e 's/@''BITSIZEOF_SIZE_T''@/$(BITSIZEOF_SIZE_T)/g' \
233 -e 's/@''SIZE_T_SUFFIX''@/$(SIZE_T_SUFFIX)/g' \
234 -e 's/@''BITSIZEOF_WCHAR_T''@/$(BITSIZEOF_WCHAR_T)/g' \
235 -e 's/@''HAVE_SIGNED_WCHAR_T''@/$(HAVE_SIGNED_WCHAR_T)/g' \
236 -e 's/@''WCHAR_T_SUFFIX''@/$(WCHAR_T_SUFFIX)/g' \
237 -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
238 -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
239 -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
240 < $(srcdir)/stdint_.h > $@-t
241 mv $@-t $@
242 MOSTLYCLEANFILES += stdint.h stdint.h-t
243
244 libmailutils_la_SOURCES += strcase.h
245
246 libmailutils_la_SOURCES += strchrnul.h
247
248 EXTRA_DIST += strdup.h
249
250 EXTRA_DIST += strndup.h
251
252 EXTRA_DIST += strnlen.h
253
254 libmailutils_la_SOURCES += strnlen1.h strnlen1.c
255
256 BUILT_SOURCES += $(SYSEXITS_H)
257 EXTRA_DIST += sysexit_.h
258
259 # We need the following in order to create <sysexits.h> when the system
260 # doesn't have one that works with the given compiler.
261 sysexits.h: sysexit_.h
262 cp -f $(srcdir)/sysexit_.h $@-t
263 mv -f $@-t $@
264 MOSTLYCLEANFILES += sysexits.h sysexits.h-t
265
266 BUILT_SOURCES += $(UNISTD_H)
267
268 # We need the following in order to create an empty placeholder for
269 # <unistd.h> when the system doesn't have one.
270 unistd.h:
271 echo '/* Empty placeholder for $@. */' >$@
272 MOSTLYCLEANFILES += unistd.h
273
274 libmailutils_la_SOURCES += printf-args.h printf-parse.h vasnprintf.h
275
276 libmailutils_la_SOURCES += vsnprintf.h
277
278 libmailutils_la_SOURCES += wcwidth.h
279
280 libmailutils_la_SOURCES += xsize.h
281
282 EXTRA_DIST += getopt.c getopt1.c imaxtostr.c offtostr.c umaxtostr.c glob.c regex.c fnmatch.c getdelim.c getline.c getline.c md5.c getndelim2.c mempcpy.c strcasecmp.c strncasecmp.c strchrnul.c strndup.c strnlen.c strtok_r.c vasnprintf.c printf-args.c printf-parse.c asnprintf.c vsnprintf.c unlocked-io.h mbchar.c strdup.c memchr.c sha1.c getlogin_r.c getlogin_r.c
......
1 /* Memory allocation on the stack.
2
3 Copyright (C) 1995, 1999, 2001, 2002, 2003, 2004, 2006 Free Software
4 Foundation, Inc.
5
6 This program is free software; you can redistribute it and/or modify it
7 under the terms of the GNU General Public License as published
8 by the Free Software Foundation; either version 2, or (at your option)
9 any later version.
10
11 This program is distributed in the hope that it will be useful,
12 but WITHOUT ANY WARRANTY; without even the implied warranty of
13 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
14 General Public License for more details.
15
16 You should have received a copy of the GNU General Public
17 License along with this program; if not, write to the Free Software
18 Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
19 USA. */
20
21 /* Avoid using the symbol _ALLOCA_H here, as Bison assumes _ALLOCA_H
22 means there is a real alloca function. */
23 #ifndef _GNULIB_ALLOCA_H
24 # define _GNULIB_ALLOCA_H
25
26 /* alloca (N) returns a pointer to N bytes of memory
27 allocated on the stack, which will last until the function returns.
28 Use of alloca should be avoided:
29 - inside arguments of function calls - undefined behaviour,
30 - in inline functions - the allocation may actually last until the
31 calling function returns,
32 - for huge N (say, N >= 65536) - you never know how large (or small)
33 the stack is, and when the stack cannot fulfill the memory allocation
34 request, the program just crashes.
35 */
36
37 #ifndef alloca
38 # ifdef __GNUC__
39 # define alloca __builtin_alloca
40 # elif defined _AIX
41 # define alloca __alloca
42 # elif defined _MSC_VER
43 # include <malloc.h>
44 # define alloca _alloca
45 # else
46 # include <stddef.h>
47 # ifdef __cplusplus
48 extern "C"
49 # endif
50 void *alloca (size_t);
51 # endif
52 #endif
53
54 #endif /* _GNULIB_ALLOCA_H */
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
23 23
24 #include <stdlib.h> 24 #include <stdlib.h>
25 #include <errno.h> 25 #include <errno.h>
26 #include <strdup.h>
27 #include <alloca.h> 26 #include <alloca.h>
27 #include <string.h>
28 28
29 #include <mailutils/debug.h> 29 #include <mailutils/debug.h>
30 #include <mailutils/errno.h> 30 #include <mailutils/errno.h>
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
22 22
23 #include <stdlib.h> 23 #include <stdlib.h>
24 #include <mailutils/nls.h> 24 #include <mailutils/nls.h>
25 #include <locale.h>
25 26
26 /* Initialize Native Language Support */ 27 /* Initialize Native Language Support */
27 28
......
...@@ -56,7 +56,6 @@ ...@@ -56,7 +56,6 @@
56 56
57 #include <mu_asprintf.h> 57 #include <mu_asprintf.h>
58 #include <mu_umaxtostr.h> 58 #include <mu_umaxtostr.h>
59 #include <getline.h>
60 59
61 #if !HAVE_DECL_STRCHRNUL 60 #if !HAVE_DECL_STRCHRNUL
62 extern char *strchrnul (const char *s, int c_in); 61 extern char *strchrnul (const char *s, int c_in);
......
1 *.gmo
2 *.mo
1 Makefile 3 Makefile
2 Makefile.in 4 Makefile.in
3 Makefile.in.in 5 Makefile.in.in
6 Makevars.template
4 POTFILES 7 POTFILES
5 Rules-quot 8 Rules-quot
6 boldquot.sed 9 boldquot.sed
7 en@boldquot.header 10 en@boldquot.header
8 en@quot.header 11 en@quot.header
12 insert-header.sed
9 insert-header.sin 13 insert-header.sin
10 mailutils.pot 14 mailutils.pot
11 quot.sed 15 quot.sed
12 remove-potcdate.sin
13 remove-potcdate.sed 16 remove-potcdate.sed
17 remove-potcdate.sin
14 stamp-po 18 stamp-po
15 *.mo
16 *.gmo
......
1 #
2 # Makefile variables for PO directory.
3 # Copyright (C) 2002, 2003 Free Software Foundation, Inc.
4 #
5
6 DOMAIN = $(PACKAGE)
7
8 subdir = po
9 top_builddir = ..
10
11 XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ \
12 --flag=util_error:1:c-format\
13 --flag=util_out:2:c-format\
14 --flag=util_send:1:c-format\
15 --flag=util_finish:3:c-format\
16 --flag=mu_error:1:c-format\
17 --flag=sieve_compile_error:3:c-format\
18 --flag=sieve_debug_internal:3:c-format\
19 --flag=mu_sieve_error:2:c-format\
20 --flag=mu_sieve_debug:2:c-format\
21 --flag=mu_sieve_log_action:2:c-format\
22 --flag=mu_stream_printf:3:c-format\
23 --flag=mu_pop3_writeline:2:c-format\
24 --flag=mu_nntp_writeline:2:c-format\
25 --flag=util_out:2:c-format\
26 --flag=util_send:1:c-format\
27 --flag=util_do_command:1:c-format\
28 --flag=util_error:1:c-format\
29 --flag=util_cache_command:2:c-format\
30 --flag=mailer_err:1:c-format\
31 --flag=mh_getyn:1:c-format\
32 --flag=mh_getyn_interactive:1:c-format\
33 --flag=mh_error:1:c-format\
34 --flag=ali_parse_error:1:c-format\
35 --flag=pop3d_outf:1:c-format\
36 --flag=imap_writeline:2:c-format
37
38 COPYRIGHT_HOLDER = Free Software Foundation, Inc.
39 MSGID_BUGS_ADDRESS = bug-mailutils@gnu.org
40 EXTRA_LOCALE_CATEGORIES =
41
42 # EOF
1 Makefile.in
2 Makefile
3 .gdbinit 1 .gdbinit
2 Makefile
3 Makefile.in
4 compile 4 compile
5 config.guess 5 config.guess
6 config.rpath 6 config.rpath
7 config.sub 7 config.sub
8 depcomp 8 depcomp
9 elisp-comp
9 install-sh 10 install-sh
11 link-warning.h
12 ltmain.sh
13 mailutils.spec
10 mdate-sh 14 mdate-sh
11 missing 15 missing
12 mkinstalldirs 16 mkinstalldirs
13 texinfo.tex 17 texinfo.tex
14 ltmain.sh
15 mailutils.spec
16 elisp-comp
......