Skip to content

John McEleney / mailutils

Go to a project
Toggle navigation
Toggle navigation pinning
Commit a0444b41 a0444b412a65a4949b40d993319384609109f0e3 by Sergey Poznyakoff
Options

Added @INTLINCS@ and @LTLIBINTL@ where appropriate.

1 parent 0db3dbbb
Inline Side-by-side
Showing 18 changed files with 34 additions and 34 deletions
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 # Copyright (C) 2000,2001,2002 Free Software Foundation 2 # Copyright (C) 2000,2001,2002 Free Software Foundation
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox/include -I${top_srcdir}/lib 5 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/mailbox/include -I${top_srcdir}/lib @INTLINCS@
6 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" 6 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"
7 7
8 lib_LTLIBRARIES = libmuauth.la 8 lib_LTLIBRARIES = libmuauth.la
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
2 # Copyright (C) 2000,2001,2002 Free Software Foundation 2 # Copyright (C) 2000,2001,2002 Free Software Foundation
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include 5 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @INTLINCS@
6 6
7 sbin_PROGRAMS = comsatd 7 sbin_PROGRAMS = comsatd
8 8
9 comsatd_SOURCES = action.c cfg.c comsat.c comsat.h 9 comsatd_SOURCES = action.c cfg.c comsat.c comsat.h
10 10
11 comsatd_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 11 comsatd_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
2 # Copyright (C) 2000,2001,2002 Free Software Foundation 2 # Copyright (C) 2000,2001,2002 Free Software Foundation
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm 5 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @INTLINCS@
6 6
7 bin_PROGRAMS = dotlock 7 bin_PROGRAMS = dotlock
8 #dotlock_SOURCES = dotlock.c 8 #dotlock_SOURCES = dotlock.c
9 9
10 dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 10 dotlock_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
11 11
12 install-exec-hook: 12 install-exec-hook:
13 for i in $(bin_PROGRAMS); do\ 13 for i in $(bin_PROGRAMS); do\
......
...@@ -16,7 +16,7 @@ noinst_PROGRAMS = \ ...@@ -16,7 +16,7 @@ noinst_PROGRAMS = \
16 moddir=@SIEVE_MODDIR@ 16 moddir=@SIEVE_MODDIR@
17 mod_LTLIBRARIES = numaddr.la 17 mod_LTLIBRARIES = numaddr.la
18 18
19 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib 19 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
20 AM_LDFLAGS = ../mailbox/libmailbox.la ../lib/libmailutils.la 20 AM_LDFLAGS = ../mailbox/libmailbox.la ../lib/libmailutils.la
21 21
22 numaddr_la_SOURCES = numaddr.c 22 numaddr_la_SOURCES = numaddr.c
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
2 # Copyright (C) 2000,2001,2002 Free Software Foundation 2 # Copyright (C) 2000,2001,2002 Free Software Foundation
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib 5 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
6 SUBDIRS = testsuite 6 SUBDIRS = testsuite
7 7
8 bin_PROGRAMS = frm 8 bin_PROGRAMS = frm
9 frm_SOURCES = frm.c 9 frm_SOURCES = frm.c
10 frm_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 10 frm_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
2 # Copyright (C) 2000,2001,2002 Free Software Foundation 2 # Copyright (C) 2000,2001,2002 Free Software Foundation
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib 5 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
6 SUBDIRS = testsuite 6 SUBDIRS = testsuite
7 7
8 bin_PROGRAMS = from 8 bin_PROGRAMS = from
9 9
10 from_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 10 from_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include \ 5 INCLUDES = -I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include \
6 -I$(top_srcdir)/libmu_scm @GUILE_INCLUDES@ 6 -I$(top_srcdir)/libmu_scm @GUILE_INCLUDES@ @INTLINCS@
7 7
8 SUBDIRS=scm 8 SUBDIRS=scm
9 9
...@@ -11,5 +11,5 @@ bin_PROGRAMS=@GUIMB@ ...@@ -11,5 +11,5 @@ bin_PROGRAMS=@GUIMB@
11 EXTRA_PROGRAMS=guimb 11 EXTRA_PROGRAMS=guimb
12 guimb_SOURCES=main.c collect.c util.c guimb.h 12 guimb_SOURCES=main.c collect.c util.c guimb.h
13 guimb_LDADD = ../libmu_scm/libmu_scm.la ../mailbox/libmailbox.la \ 13 guimb_LDADD = ../libmu_scm/libmu_scm.la ../mailbox/libmailbox.la \
14 ../lib/libmailutils.la @GUILE_LIBS@ 14 ../lib/libmailutils.la @GUILE_LIBS@ @LTLIBINTL@
15 15
......
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
2 # Copyright (C) 2000,2001,2002 Free Software Foundation 2 # Copyright (C) 2000,2001,2002 Free Software Foundation
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @AUTHINCS@ 5 INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include @AUTHINCS@ @INTLINCS@
6 SUBDIRS = testsuite 6 SUBDIRS = testsuite
7 7
8 sbin_PROGRAMS = imap4d 8 sbin_PROGRAMS = imap4d
9 9
10 imap4d_LDADD = @AUTHOBJS@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la 10 imap4d_LDADD = @AUTHOBJS@ ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la @LTLIBINTL@
11 imap4d_SOURCES = append.c authenticate.c bye.c capability.c check.c close.c \ 11 imap4d_SOURCES = append.c authenticate.c bye.c capability.c check.c close.c \
12 commands.c copy.c create.c delete.c examine.c expunge.c fetch.c imap4d.c \ 12 commands.c copy.c create.c delete.c examine.c expunge.c fetch.c imap4d.c \
13 imap4d.h list.c logout.c login.c lsub.c namespace.c noop.c rename.c search.c \ 13 imap4d.h list.c logout.c login.c lsub.c namespace.c noop.c rename.c search.c \
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 # Copyright (C) 2000,2001,2002 Free Software Foundation 2 # Copyright (C) 2000,2001,2002 Free Software Foundation
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES =-I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @GUILE_INCLUDES@ 5 INCLUDES =-I. -I$(top_builddir) -I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @GUILE_INCLUDES@ @INTLINCS@
6 6
7 lib_LTLIBRARIES=@MU_SCM@ 7 lib_LTLIBRARIES=@MU_SCM@
8 EXTRA_LTLIBRARIES=libmu_scm.la 8 EXTRA_LTLIBRARIES=libmu_scm.la
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 # Copyright (C) 2000,2001,2002 Free Software Foundation 2 # Copyright (C) 2000,2001,2002 Free Software Foundation
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib 5 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @INTLINCS@
6 YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap 6 YLWRAP = $(SHELL) $(top_srcdir)/scripts/ylwrap
7 AM_YFLAGS = -dtv 7 AM_YFLAGS = -dtv
8 AM_CPPFLAGS = -DSIEVE_MODDIR=\"@SIEVE_MODDIR@\" 8 AM_CPPFLAGS = -DSIEVE_MODDIR=\"@SIEVE_MODDIR@\"
......
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
2 # Copyright (C) 2000,2001,2002 Free Software Foundation 2 # Copyright (C) 2000,2001,2002 Free Software Foundation
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/mailbox -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @GUILE_INCLUDES@ 5 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/mailbox -I$(top_srcdir)/include -I$(top_srcdir)/libmu_scm @GUILE_INCLUDES@ @INTLINCS@
6 SUBDIRS = testsuite 6 SUBDIRS = testsuite
7 7
8 libexec_PROGRAMS = mail.local 8 libexec_PROGRAMS = mail.local
9 mail_local_SOURCES = main.c mailquota.c script.c mail.local.h 9 mail_local_SOURCES = main.c mailquota.c script.c mail.local.h
10 10
11 mail_local_LDADD = @LIBMU_SCM@ @GUILE_LIBS@ ../mailbox/libmailbox.la \ 11 mail_local_LDADD = @LIBMU_SCM@ @GUILE_LIBS@ ../mailbox/libmailbox.la \
12 @AUTHLIBS@ ../libsieve/libsieve.la ../lib/libmailutils.la 12 @AUTHLIBS@ ../libsieve/libsieve.la ../lib/libmailutils.la @LTLIBINTL@
13 13
14 14
15 install-exec-hook: 15 install-exec-hook:
......
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 AM_YFLAGS=-vt 5 AM_YFLAGS=-vt
6 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox 6 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib -I${top_srcdir}/mailbox @INTLINCS@
7 AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\" 7 AM_CFLAGS = -DSITE_MAIL_RC=\"@SITE_MAIL_RC@\"
8 8
9 bin_PROGRAMS = mail 9 bin_PROGRAMS = mail
10 10
11 mail_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la \ 11 mail_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la \
12 @READLINE_LIBS@ 12 @READLINE_LIBS@ @LTLIBINTL@
13 13
14 EXTRA_DIST = msgset.c 14 EXTRA_DIST = msgset.c
15 15
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 # Copyright (C) 2000,2001,2002 Free Software Foundation 2 # Copyright (C) 2000,2001,2002 Free Software Foundation
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES = -I${top_srcdir}/include -I$(top_srcdir)/intl -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu 5 INCLUDES = -I${top_srcdir}/include -I$(top_srcdir)/intl -I${top_srcdir}/mailbox -I${top_srcdir}/mailbox/include -I${top_srcdir}/include/mailutils/gnu @INTLINCS@
6 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\" 6 AM_CFLAGS = -DSITE_VIRTUAL_PWDDIR=\"@SITE_VIRTUAL_PWDDIR@\"
7 7
8 SUBDIRS = include testsuite 8 SUBDIRS = include testsuite
...@@ -86,9 +86,9 @@ url_smtp.c \ ...@@ -86,9 +86,9 @@ url_smtp.c \
86 wicket.c 86 wicket.c
87 87
88 libmailbox_la_DEPENDENCIES = @MU_LTLIBOBJS@ 88 libmailbox_la_DEPENDENCIES = @MU_LTLIBOBJS@
89 libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @LIBINTL@ 89 libmailbox_la_LIBADD = @MU_LTLIBOBJS@ @LTLIBINTL@
90 libmailbox_la_LDFLAGS = -version-info 0:0:0 90 libmailbox_la_LDFLAGS = -version-info 0:0:0
91 91
92 mailutils_config_SOURCES = mailutils-config.c 92 mailutils_config_SOURCES = mailutils-config.c
93 mailutils_config_LDADD = ./libmailbox.la ../lib/libmailutils.la 93 mailutils_config_LDADD = ./libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
94 mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" -I$(top_srcdir)/intl -DLINK_FLAGS="\"-L$(libdir)\"" -DAUTHLIBS="\"$(MYSQLLIBS)\"" -DGUILE_LIBS="\"$(GUILE_LIBS)\"" 94 mailutils_config_CFLAGS = -DCOMPILE_FLAGS="\"-I$(includedir)\"" -I$(top_srcdir)/intl -DLINK_FLAGS="\"-L$(libdir)\"" -DAUTHLIBS="\"$(MYSQLLIBS)\"" -DGUILE_LIBS="\"$(GUILE_LIBS)\""
......
...@@ -2,9 +2,9 @@ ...@@ -2,9 +2,9 @@
2 # Copyright (C) 2000,2001,2002 Free Software Foundation 2 # Copyright (C) 2000,2001,2002 Free Software Foundation
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib 5 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
6 SUBDIRS = testsuite 6 SUBDIRS = testsuite
7 7
8 bin_PROGRAMS = messages 8 bin_PROGRAMS = messages
9 9
10 messages_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 10 messages_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
......
...@@ -31,8 +31,8 @@ mhpath_SOURCES = mhpath.c ...@@ -31,8 +31,8 @@ mhpath_SOURCES = mhpath.c
31 folder_SOURCES = folder.c 31 folder_SOURCES = folder.c
32 fmtcheck_SOURCES = fmtcheck.c 32 fmtcheck_SOURCES = fmtcheck.c
33 repl_SOURCES = repl.c 33 repl_SOURCES = repl.c
34 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib 34 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @INTLINCS@
35 mh_LIBS = ./libmh.a ../mailbox/libmailbox.la ../lib/libmailutils.la 35 mh_LIBS = ./libmh.a ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
36 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@ 36 scan_LDADD = $(mh_LIBS) @CURSES_LIBS@
37 inc_LDADD = $(mh_LIBS) 37 inc_LDADD = $(mh_LIBS)
38 rmm_LDADD = $(mh_LIBS) 38 rmm_LDADD = $(mh_LIBS)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 # Copyright (C) 2000,2001,2002 Free Software Foundation 2 # Copyright (C) 2000,2001,2002 Free Software Foundation
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include 5 INCLUDES =-I$(srcdir) -I$(top_srcdir)/lib -I$(top_srcdir)/include @INTLINCS@
6 6
7 sbin_PROGRAMS = pop3d 7 sbin_PROGRAMS = pop3d
8 bin_PROGRAMS = @POPAUTH@ 8 bin_PROGRAMS = @POPAUTH@
...@@ -13,7 +13,7 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \ ...@@ -13,7 +13,7 @@ pop3d_SOURCES = apop.c auth.c capa.c dele.c extra.c pop3d.c pop3d.h \
13 list.c lock.c noop.c quit.c retr.c rset.c stat.c signal.c top.c uidl.c \ 13 list.c lock.c noop.c quit.c retr.c rset.c stat.c signal.c top.c uidl.c \
14 user.c 14 user.c
15 15
16 pop3d_LDADD = ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la 16 pop3d_LDADD = ../mailbox/libmailbox.la @AUTHLIBS@ ../lib/libmailutils.la @LTLIBINTL@
17 17
18 popauth_SOURCES = popauth.c 18 popauth_SOURCES = popauth.c
19 popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 19 popauth_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
......
...@@ -2,10 +2,10 @@ ...@@ -2,10 +2,10 @@
2 # Copyright (C) 2000,2001,2002 Free Software Foundation 2 # Copyright (C) 2000,2001,2002 Free Software Foundation
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib 5 INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/lib @INTLINCS@
6 SUBDIRS = testsuite 6 SUBDIRS = testsuite
7 7
8 bin_PROGRAMS = readmsg 8 bin_PROGRAMS = readmsg
9 9
10 readmsg_SOURCES = readmsg.c msglist.c readmsg.h 10 readmsg_SOURCES = readmsg.c msglist.c readmsg.h
11 readmsg_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la 11 readmsg_LDADD = ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
......
...@@ -2,11 +2,11 @@ ...@@ -2,11 +2,11 @@
2 # Copyright (C) 2000,2001,2002 Free Software Foundation 2 # Copyright (C) 2000,2001,2002 Free Software Foundation
3 # See file COPYING in the distribution root directory for copying conditions. 3 # See file COPYING in the distribution root directory for copying conditions.
4 4
5 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib 5 INCLUDES = -I${top_srcdir}/include -I${top_srcdir}/lib @INTLINCS@
6 SUBDIRS = testsuite 6 SUBDIRS = testsuite
7 7
8 bin_PROGRAMS = sieve 8 bin_PROGRAMS = sieve
9 sieve_SOURCES = sieve.c 9 sieve_SOURCES = sieve.c
10 sieve_LDADD = ../libsieve/libsieve.la ../mailbox/libmailbox.la ../lib/libmailutils.la 10 sieve_LDADD = ../libsieve/libsieve.la ../mailbox/libmailbox.la ../lib/libmailutils.la @LTLIBINTL@
11 sieve_LDFLAGS = -export-dynamic 11 sieve_LDFLAGS = -export-dynamic
12 12
......