diff options
author | Sergey Poznyakoff <gray@gnu.org> | 2019-11-10 13:27:02 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org> | 2019-11-10 13:27:02 +0200 |
commit | b8cdb89ea0af82b27137ee60ad1ffebd9f66a849 (patch) | |
tree | 4ce228cb64e994bea7cd1640aacbb13bf4db9ae0 | |
parent | 367aa99dd28cc74febe4e8c5f81df9812a41e05a (diff) | |
download | mailutils-b8cdb89ea0af82b27137ee60ad1ffebd9f66a849.tar.gz mailutils-b8cdb89ea0af82b27137ee60ad1ffebd9f66a849.tar.bz2 |
Create types.h when configuring.
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | include/mailutils/Makefile.am | 6 | ||||
-rw-r--r-- | include/mailutils/types.hin | 6 |
3 files changed, 7 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index f74b10e02..1a2f459db 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -1362,7 +1362,10 @@ AC_ARG_WITH([mh-bindir], | |||
1362 | 1362 | ||
1363 | test -z "$server_list" && server_list=" [NONE]" | 1363 | test -z "$server_list" && server_list=" [NONE]" |
1364 | test -z "$client_list" && client_list=" [NONE]" | 1364 | test -z "$client_list" && client_list=" [NONE]" |
1365 | 1365 | ||
1366 | # Create the installable types.h | ||
1367 | AC_CONFIG_FILES([include/mailutils/types.h:include/mailutils/types.hin]) | ||
1368 | |||
1366 | # Initialize the (autotest) test suite. | 1369 | # Initialize the (autotest) test suite. |
1367 | 1370 | ||
1368 | AC_CONFIG_TESTDIR(testsuite) | 1371 | AC_CONFIG_TESTDIR(testsuite) |
diff --git a/include/mailutils/Makefile.am b/include/mailutils/Makefile.am index a4a94ba9d..017951302 100644 --- a/include/mailutils/Makefile.am +++ b/include/mailutils/Makefile.am | |||
@@ -19,12 +19,6 @@ EXTRA_DIST=errno.hin types.hin | |||
19 | errno.h: $(top_srcdir)/libmailutils/diag/errors errno.hin | 19 | errno.h: $(top_srcdir)/libmailutils/diag/errors errno.hin |
20 | $(AM_V_GEN)$(AWK) -f $(mu_aux_dir)/generr.awk $(top_srcdir)/libmailutils/diag/errors errno.hin > errno.h | 20 | $(AM_V_GEN)$(AWK) -f $(mu_aux_dir)/generr.awk $(top_srcdir)/libmailutils/diag/errors errno.hin > errno.h |
21 | 21 | ||
22 | types.h: $(top_srcdir)/include/mailutils/types.hin Makefile | ||
23 | $(AM_V_GEN)sed -e 's/_MU_OFF_TYPE_/$(MU_OFF_TYPE)/' \ | ||
24 | -e 's/_MU_DEFAULT_RECORD_/$(MU_DEFAULT_RECORD)/' \ | ||
25 | -e 's/_MU_PRI_OFF_T_/$(MU_PRI_OFF_T)/' \ | ||
26 | $(top_srcdir)/include/mailutils/types.hin > types.h | ||
27 | |||
28 | gitinfo.h: $(top_srcdir)/ChangeLog | 22 | gitinfo.h: $(top_srcdir)/ChangeLog |
29 | $(AM_V_GEN)if test "$(builddir)" = "$(srcdir)"; then \ | 23 | $(AM_V_GEN)if test "$(builddir)" = "$(srcdir)"; then \ |
30 | test -d $(top_srcdir)/.git && $(GITINFO) -Hc -ogitinfo.h; \ | 24 | test -d $(top_srcdir)/.git && $(GITINFO) -Hc -ogitinfo.h; \ |
diff --git a/include/mailutils/types.hin b/include/mailutils/types.hin index fe02297c5..fcc6b4b48 100644 --- a/include/mailutils/types.hin +++ b/include/mailutils/types.hin | |||
@@ -81,8 +81,8 @@ struct _mu_msgset; | |||
81 | struct mu_sockaddr; /* defined in mailutils/sockaddr.h */ | 81 | struct mu_sockaddr; /* defined in mailutils/sockaddr.h */ |
82 | struct mu_cidr; /* defined in mailutils/cidr.h */ | 82 | struct mu_cidr; /* defined in mailutils/cidr.h */ |
83 | 83 | ||
84 | typedef _MU_OFF_TYPE_ mu_off_t; | 84 | typedef @MU_OFF_TYPE@ mu_off_t; |
85 | #define MU_PRI_OFF_T "_MU_PRI_OFF_T_" | 85 | #define MU_PRI_OFF_T "@MU_PRI_OFF_T@" |
86 | 86 | ||
87 | typedef struct mu_address *mu_address_t; | 87 | typedef struct mu_address *mu_address_t; |
88 | typedef struct _mu_attribute *mu_attribute_t; | 88 | typedef struct _mu_attribute *mu_attribute_t; |
@@ -152,7 +152,7 @@ mu_prstr (char const *s) | |||
152 | return s ? s : ""; | 152 | return s ? s : ""; |
153 | } | 153 | } |
154 | 154 | ||
155 | #define MU_DEFAULT_RECORD _MU_DEFAULT_RECORD_ | 155 | #define MU_DEFAULT_RECORD @MU_DEFAULT_RECORD@ |
156 | 156 | ||
157 | #ifdef __cplusplus | 157 | #ifdef __cplusplus |
158 | } | 158 | } |