op public repos

Blame

Date:: Mon Jan 10 10:31:52 2022 UTC
Message:: fix readline on !OpenBSD I talked too fast. There's a typo that disabled readline even if found with pkg-config, and also the way I hooked it in kamiftp was wrong...
Actions:: History | Blob | Raw File
  1 bbcba3ed 2022-01-10 op AC_INIT([kamid-portable], [0.1], [kamid@omarpolo.com], [],
  2 bbcba3ed 2022-01-10 op 	[https://kamid.omarpolo.com])
  3 bbcba3ed 2022-01-10 op AC_CONFIG_AUX_DIR(etc)
  4 bbcba3ed 2022-01-10 op AC_CONFIG_LIBOBJ_DIR(compat)
  5 bbcba3ed 2022-01-10 op AM_INIT_AUTOMAKE([foreign subdir-objects])
  6 bbcba3ed 2022-01-10 op 
  7 bbcba3ed 2022-01-10 op KAMID_RELEASE=No
  8 bbcba3ed 2022-01-10 op 
  9 bbcba3ed 2022-01-10 op AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
 10 bbcba3ed 2022-01-10 op AC_SUBST(VERSION)
 11 bbcba3ed 2022-01-10 op AC_SUBST(KAMID_RELEASE)
 12 bbcba3ed 2022-01-10 op 
 13 bbcba3ed 2022-01-10 op AC_CANONICAL_HOST
 14 bbcba3ed 2022-01-10 op 
 15 bbcba3ed 2022-01-10 op # When CFLAGS isn't set at this stage and gcc is detected by the macro below,
 16 bbcba3ed 2022-01-10 op # autoconf will automatically use CFLAGS="-O2 -g". Prevent that by using an
 17 bbcba3ed 2022-01-10 op # empty default.
 18 bbcba3ed 2022-01-10 op : ${CFLAGS=""}
 19 bbcba3ed 2022-01-10 op 
 20 bbcba3ed 2022-01-10 op # Save user CPPFLAGS, CFLAGS and LDFLAGS. We need to change them because
 21 bbcba3ed 2022-01-10 op # AC_CHECK_HEADER doesn't give us any other way to update the include
 22 bbcba3ed 2022-01-10 op # paths. But for Makefile.am we want to use AM_CPPFLAGS and friends.
 23 bbcba3ed 2022-01-10 op SAVED_CFLAGS="$CFLAGS"
 24 bbcba3ed 2022-01-10 op SAVED_CPPFLAGS="$CPPFLAGS"
 25 bbcba3ed 2022-01-10 op SAVED_LDFLAGS="$LDFLAGS"
 26 bbcba3ed 2022-01-10 op 
 27 bbcba3ed 2022-01-10 op # Checks for programs.
 28 bbcba3ed 2022-01-10 op AC_PROG_CC
 29 bbcba3ed 2022-01-10 op AC_PROG_CPP
 30 bbcba3ed 2022-01-10 op AC_PROG_INSTALL
 31 bbcba3ed 2022-01-10 op AC_PROG_LN_S
 32 bbcba3ed 2022-01-10 op AC_PROG_MAKE_SET
 33 bbcba3ed 2022-01-10 op AC_PROG_YACC
 34 bbcba3ed 2022-01-10 op PKG_PROG_PKG_CONFIG
 35 bbcba3ed 2022-01-10 op AC_USE_SYSTEM_EXTENSIONS
 36 bbcba3ed 2022-01-10 op 
 37 bbcba3ed 2022-01-10 op # Some functions can be in libbsd.  Thanks to lldpb for the inspiration :)
 38 bbcba3ed 2022-01-10 op AC_ARG_WITH([libbsd],
 39 bbcba3ed 2022-01-10 op   AS_HELP_STRING([--with-libbsd], [Use libbsd @<:@default=auto@:>@]),
 40 bbcba3ed 2022-01-10 op   [],
 41 bbcba3ed 2022-01-10 op   [with_libbsd=auto])
 42 bbcba3ed 2022-01-10 op if test x"$with_libbsd" != x"no"; then
 43 bbcba3ed 2022-01-10 op   PKG_CHECK_MODULES([libbsd], [libbsd-overlay libbsd-ctor], [
 44 bbcba3ed 2022-01-10 op     _save_AM_CFLAGS="$AM_CFLAGS"
 45 bbcba3ed 2022-01-10 op     _save_LIBS="$LIBS"
 46 bbcba3ed 2022-01-10 op     AM_CFLAGS="$AM_CFLAGS $libbsd_CFLAGS"
 47 bbcba3ed 2022-01-10 op     LIBS="$LIBS $libbsd_LIBS"
 48 bbcba3ed 2022-01-10 op   ], [
 49 bbcba3ed 2022-01-10 op     if test x"$with_libbsd" = x"yes"; then
 50 bbcba3ed 2022-01-10 op        AC_MSG_FAILURE([*** no libbsd support found])
 51 bbcba3ed 2022-01-10 op     fi
 52 bbcba3ed 2022-01-10 op     with_libbsd=no
 53 bbcba3ed 2022-01-10 op   ])
 54 bbcba3ed 2022-01-10 op fi
 55 bbcba3ed 2022-01-10 op 
 56 bbcba3ed 2022-01-10 op # Checks for library functions.
 57 bbcba3ed 2022-01-10 op AC_SEARCH_LIBS([arc4random], [],
 58 bbcba3ed 2022-01-10 op 	[AC_DEFINE([HAVE_ARC4RANDOM], 1, [arc4random])],
 59 bbcba3ed 2022-01-10 op 	[AC_DEFINE([HAVE_ARC4RANDOM], 0, [arc4random])])
 60 bbcba3ed 2022-01-10 op 
 61 bbcba3ed 2022-01-10 op AC_REPLACE_FUNCS([
 62 bbcba3ed 2022-01-10 op 	asprintf	\
 63 bbcba3ed 2022-01-10 op 	err		\
 64 bbcba3ed 2022-01-10 op 	freezero	\
 65 bbcba3ed 2022-01-10 op 	getdtablecount	\
 66 bbcba3ed 2022-01-10 op 	getdtablesize	\
 67 bbcba3ed 2022-01-10 op 	getprogname	\
 68 bbcba3ed 2022-01-10 op 	memmem		\
 69 bbcba3ed 2022-01-10 op 	recallocarray	\
 70 bbcba3ed 2022-01-10 op 	setproctitle	\
 71 bbcba3ed 2022-01-10 op 	setprogname	\
 72 bbcba3ed 2022-01-10 op 	strlcat		\
 73 bbcba3ed 2022-01-10 op 	strlcpy		\
 74 bbcba3ed 2022-01-10 op 	strsep		\
 75 bbcba3ed 2022-01-10 op 	strtonum	\
 76 bbcba3ed 2022-01-10 op 	vis		\
 77 bbcba3ed 2022-01-10 op ])
 78 bbcba3ed 2022-01-10 op 
 79 bbcba3ed 2022-01-10 op AC_MSG_CHECKING([for sys/queue.h with TAILQ_FOREACH_SAFE and STAILQ_ENTRY])
 80 bbcba3ed 2022-01-10 op AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 81 bbcba3ed 2022-01-10 op #include <sys/queue.h>
 82 bbcba3ed 2022-01-10 op #include <stddef.h>
 83 bbcba3ed 2022-01-10 op ], [
 84 bbcba3ed 2022-01-10 op 	TAILQ_HEAD(tailhead, entry) head;
 85 bbcba3ed 2022-01-10 op 	struct entry {
 86 bbcba3ed 2022-01-10 op 		TAILQ_ENTRY(entry) entries;
 87 bbcba3ed 2022-01-10 op 	} *np, *nt;
 88 bbcba3ed 2022-01-10 op 	TAILQ_INIT(&head);
 89 bbcba3ed 2022-01-10 op 	TAILQ_FOREACH_SAFE(np, &head, entries, nt) {
 90 bbcba3ed 2022-01-10 op 		/* nop */ ;
 91 bbcba3ed 2022-01-10 op 	}
 92 bbcba3ed 2022-01-10 op 
 93 bbcba3ed 2022-01-10 op 	STAILQ_HEAD(listhead, qentry) qhead = STAILQ_HEAD_INITIALIZER(qhead);
 94 bbcba3ed 2022-01-10 op 	struct qentry {
 95 bbcba3ed 2022-01-10 op 		STAILQ_ENTRY(qentry) entries;
 96 bbcba3ed 2022-01-10 op 	} foo;
 97 bbcba3ed 2022-01-10 op 
 98 bbcba3ed 2022-01-10 op 	return 0;
 99 bbcba3ed 2022-01-10 op ])], [
100 bbcba3ed 2022-01-10 op 	AC_MSG_RESULT(yes)
101 bbcba3ed 2022-01-10 op 	AC_DEFINE([HAVE_QUEUE_H], 1, [QUEUE_H])
102 bbcba3ed 2022-01-10 op ], AC_MSG_RESULT(no))
103 bbcba3ed 2022-01-10 op 
104 bbcba3ed 2022-01-10 op AC_CHECK_HEADERS([sys/tree.h])
105 bbcba3ed 2022-01-10 op 
106 bbcba3ed 2022-01-10 op AC_CHECK_DECL(PR_SET_NAME, AC_DEFINE([HAVE_PR_SET_NAME], 1, [pr_set_name]), [],
107 bbcba3ed 2022-01-10 op 	[[#include <sys/prctl.h>]])
108 bbcba3ed 2022-01-10 op 
109 bbcba3ed 2022-01-10 op AC_CHECK_LIB([crypto], [RAND_add], [], [
110 bbcba3ed 2022-01-10 op 	AC_MSG_ERROR([requires openssl])
111 bbcba3ed 2022-01-10 op ])
112 bbcba3ed 2022-01-10 op 
113 bbcba3ed 2022-01-10 op AC_CHECK_LIB(tls, tls_init, [], [
114 bbcba3ed 2022-01-10 op 	AC_MSG_ERROR([requires libtls])
115 bbcba3ed 2022-01-10 op ])
116 bbcba3ed 2022-01-10 op 
117 bbcba3ed 2022-01-10 op AS_CASE([$host_os],
118 bbcba3ed 2022-01-10 op 	[*openbsd*], [AC_CHECK_LIB([event], [event_init], [],
119 bbcba3ed 2022-01-10 op 			[AC_MSG_ERROR([requires libevent])])],
120 bbcba3ed 2022-01-10 op 	[PKG_CHECK_MODULES([libevent2], [libevent_core >= 2],
121 bbcba3ed 2022-01-10 op 		[
122 bbcba3ed 2022-01-10 op 			AC_DEFINE([HAVE_EVENT2], 1, [1 if using event2])
123 bbcba3ed 2022-01-10 op 			AM_CFLAGS="$libevent2_CFLAGS $AM_CFLAGS"
124 bbcba3ed 2022-01-10 op 			LIBS="$libevent2_LIBS $LIBS"
125 bbcba3ed 2022-01-10 op 		], [AC_MSG_ERROR([requires libevent])])])
126 bbcba3ed 2022-01-10 op 
127 bbcba3ed 2022-01-10 op AC_CHECK_LIB(util, imsg_init, [], [
128 bbcba3ed 2022-01-10 op 	AC_LIBOBJ(fmt_scaled)
129 bbcba3ed 2022-01-10 op 	AC_LIBOBJ(imsg)
130 bbcba3ed 2022-01-10 op 	AC_LIBOBJ(imsg-buffer)
131 bbcba3ed 2022-01-10 op 	AC_LIBOBJ(ohash)
132 bbcba3ed 2022-01-10 op ])
133 bbcba3ed 2022-01-10 op 
134 91cfa92a 2022-01-10 op # Check for readline
135 91cfa92a 2022-01-10 op AS_CASE([$host_os],
136 91cfa92a 2022-01-10 op 	[*openbsd*], [
137 91cfa92a 2022-01-10 op 		AC_DEFINE([HAVE_READLINE], 1, [1 if readline found])
138 91cfa92a 2022-01-10 op 		READLINE_CFLAGS=''
139 91cfa92a 2022-01-10 op 		READLINE_LIBS='-lreadline'
140 91cfa92a 2022-01-10 op 	], [
141 91cfa92a 2022-01-10 op 		PKG_CHECK_MODULES([READLINE], [readline], [
142 fa5821e5 2022-01-10 op 			AC_DEFINE([HAVE_READLINE], 1, [])
143 91cfa92a 2022-01-10 op 		], [
144 91cfa92a 2022-01-10 op 			AC_DEFINE([HAVE_READLINE], 0, [])
145 91cfa92a 2022-01-10 op 		])
146 91cfa92a 2022-01-10 op 	]
147 91cfa92a 2022-01-10 op )
148 91cfa92a 2022-01-10 op AC_SUBST(READLINE_CFLAGS)
149 91cfa92a 2022-01-10 op AC_SUBST(READLINE_LIBS)
150 91cfa92a 2022-01-10 op 
151 bbcba3ed 2022-01-10 op # Save our CFLAGS/CPPFLAGS/LDFLAGS for the Makefile and restore the old user
152 bbcba3ed 2022-01-10 op # variables.
153 bbcba3ed 2022-01-10 op AC_SUBST(AM_CPPFLAGS)
154 bbcba3ed 2022-01-10 op CPPFLAGS="$SAVED_CPPFLAGS"
155 bbcba3ed 2022-01-10 op AC_SUBST(AM_CFLAGS)
156 bbcba3ed 2022-01-10 op CFLAGS="$SAVED_CFLAGS"
157 bbcba3ed 2022-01-10 op AC_SUBST(AM_LDFLAGS)
158 bbcba3ed 2022-01-10 op LDFLAGS="$SAVED_LDFLAGS"
159 bbcba3ed 2022-01-10 op 
160 bbcba3ed 2022-01-10 op AC_CONFIG_HEADERS([config.h])
161 bbcba3ed 2022-01-10 op AC_CONFIG_FILES([
162 bbcba3ed 2022-01-10 op 	Makefile
163 bbcba3ed 2022-01-10 op 	kamictl/Makefile
164 bbcba3ed 2022-01-10 op 	kamid/Makefile
165 bbcba3ed 2022-01-10 op 	kamiftp/Makefile
166 bbcba3ed 2022-01-10 op 	kamirepl/Makefile
167 bbcba3ed 2022-01-10 op 	ninepscript/Makefile
168 bbcba3ed 2022-01-10 op ])
169 bbcba3ed 2022-01-10 op 
170 bbcba3ed 2022-01-10 op AC_OUTPUT