From b8cdb89ea0af82b27137ee60ad1ffebd9f66a849 Mon Sep 17 00:00:00 2001
From: Sergey Poznyakoff <gray@gnu.org>
Date: Sun, 10 Nov 2019 13:27:02 +0200
Subject: Create types.h when configuring.

---
 configure.ac                  | 5 ++++-
 include/mailutils/Makefile.am | 6 ------
 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],
 
 test -z "$server_list" && server_list=" [NONE]"
 test -z "$client_list" && client_list=" [NONE]"
-		    
+
+# Create the installable types.h
+AC_CONFIG_FILES([include/mailutils/types.h:include/mailutils/types.hin])
+
 # Initialize the (autotest) test suite.
 
 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
 errno.h: $(top_srcdir)/libmailutils/diag/errors errno.hin
 	$(AM_V_GEN)$(AWK) -f $(mu_aux_dir)/generr.awk $(top_srcdir)/libmailutils/diag/errors errno.hin > errno.h
 
-types.h: $(top_srcdir)/include/mailutils/types.hin Makefile
-	$(AM_V_GEN)sed -e 's/_MU_OFF_TYPE_/$(MU_OFF_TYPE)/' \
-                       -e 's/_MU_DEFAULT_RECORD_/$(MU_DEFAULT_RECORD)/' \
-                       -e 's/_MU_PRI_OFF_T_/$(MU_PRI_OFF_T)/' \
-                   $(top_srcdir)/include/mailutils/types.hin > types.h
-
 gitinfo.h: $(top_srcdir)/ChangeLog
 	$(AM_V_GEN)if test "$(builddir)" = "$(srcdir)"; then	\
 	   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;
 struct mu_sockaddr; /* defined in mailutils/sockaddr.h */  
 struct mu_cidr;     /* defined in mailutils/cidr.h */  
   
-typedef _MU_OFF_TYPE_ mu_off_t;
-#define MU_PRI_OFF_T "_MU_PRI_OFF_T_"
+typedef @MU_OFF_TYPE@ mu_off_t;
+#define MU_PRI_OFF_T "@MU_PRI_OFF_T@"
   
 typedef struct mu_address *mu_address_t;
 typedef struct _mu_attribute *mu_attribute_t;
@@ -152,7 +152,7 @@ mu_prstr (char const *s)
   return s ? s : "";
 }
   
-#define MU_DEFAULT_RECORD _MU_DEFAULT_RECORD_
+#define MU_DEFAULT_RECORD @MU_DEFAULT_RECORD@
 
 #ifdef __cplusplus
 }
-- 
cgit v1.2.1