From 69823b2fa4d145f6e3e978bbc37fcabe5081bbe9 Mon Sep 17 00:00:00 2001 From: "David M. Syzdek" Date: Thu, 21 Jul 2022 23:59:21 -0800 Subject: autotools: cleaning up files --- Makefile.am | 27 +++++++-------------------- autogen.sh | 8 ++++---- configure.ac | 48 +++++++++++++----------------------------------- 3 files changed, 24 insertions(+), 59 deletions(-) diff --git a/Makefile.am b/Makefile.am index d048741..c716c5c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -50,20 +50,13 @@ AM_CFLAGS = -O2 $(CFLAGS_WARNINGS) AM_CXXFLAGS = -O2 @AM_CXXFLAGS@ AM_OBJCFLAGS = -O2 @AM_OBJCFLAGS@ AM_CPPFLAGS = -O2 \ - -UPMARK \ -DHAVE_CONFIG_H=1 \ -I$(top_builddir)/include \ -I$(top_srcdir)/include \ -DSYSCONFDIR=\"$(sysconfdir)\" ACLOCAL_AMFLAGS = -I m4 -W all -W error AM_MAKEINFOFLAGS = --no-split -AM_DISTCHECK_CONFIGURE_FLAGS = --enable-strictwarnings \ - CFLAGS="$(CFLAGS)" \ - CPPFLAGS="$(CPPFLAGS)" \ - LDFLAGS="$(LDFLAGS)" -AM_YFLAGS = -d DEFS = -LDADD = # automake targets @@ -98,8 +91,7 @@ EXTRA_DIST = $(noinst_HEADERS) \ NEWS.md \ README.md \ TODO.md -CLEANFILES = \ - $(builddir)/a.out $(srcdir)/a.out \ +CLEANFILES = $(builddir)/a.out $(srcdir)/a.out \ $(builddir)/*/a.out $(srcdir)/*/a.out \ config.h.in~ $(srcdir)/config.h.in~ \ $(man_MANS) \ @@ -109,34 +101,29 @@ CLEANFILES = \ @PACKAGE_TARNAME@-*.tar.* \ @PACKAGE_TARNAME@-*.txz \ @PACKAGE_TARNAME@-*.zip -DISTCHECK_CONFIGURE_FLAGS = --enable-strictwarnings +DISTCHECK_CONFIGURE_FLAGS = --enable-strictwarnings \ + LDFLAGS="$(LDFLAGS)" \ + CFLAGS="$(CFLAGS)" \ + CPPFLAGS="$(CPPFLAGS)" # macros for src/akcom-udpecho src_akcom_udpecho_DEPENDENCIES = Makefile src_akcom_udpecho_CPPFLAGS = -DPROGRAM_NAME="\"akcom-udpecho\"" $(AM_CPPFLAGS) -src_akcom_udpecho_CFLAGS = $(AM_CFLAGS) -src_akcom_udpecho_LDFLAGS = $(AM_LDFLAGS) -src_akcom_udpecho_LDADD = $(AM_LDADD) src_akcom_udpecho_SOURCES = src/akcom-udpecho.c # macros for src/akcom-udpechod src_akcom_udpechod_DEPENDENCIES = Makefile src_akcom_udpechod_CPPFLAGS = -DPROGRAM_NAME="\"akcom-udpechod\"" $(AM_CPPFLAGS) -src_akcom_udpechod_CFLAGS = $(AM_CFLAGS) -src_akcom_udpechod_LDFLAGS = $(AM_LDFLAGS) -src_akcom_udpechod_LDADD = $(AM_LDADD) src_akcom_udpechod_SOURCES = src/akcom-udpechod.c # Makefile includes GIT_PACKAGE_VERSION_DIR=include SUBST_EXPRESSIONS = -include $(srcdir)/contrib/bindletools/build-aux/makefile-bindle.am -include $(srcdir)/contrib/bindletools/build-aux/makefile-autotools.am -include $(srcdir)/contrib/bindletools/build-aux/makefile-subst.am -include $(srcdir)/contrib/bindletools/build-aux/makefile-version.am +include contrib/bindletools/build-aux/makefile-subst.am +include contrib/bindletools/build-aux/makefile-version.am # custom targets diff --git a/autogen.sh b/autogen.sh index 9147dce..d9db5c0 100755 --- a/autogen.sh +++ b/autogen.sh @@ -62,10 +62,10 @@ if test -d ${SRCDIR}/.git || test -f ${SRCDIR}/.git;then fi -# generates files for bindletools -if test -x ${SRCDIR}/contrib/bindletools/autogen.sh;then - ${SRCDIR}/contrib/bindletools/autogen.sh || exit 1 -fi +## generates files for bindletools +#if test -x ${SRCDIR}/contrib/bindletools/autogen.sh;then +# ${SRCDIR}/contrib/bindletools/autogen.sh || exit 1 +#fi # symlinks Bindle Tools M4 macros diff --git a/configure.ac b/configure.ac index 225466d..5d5f404 100644 --- a/configure.ac +++ b/configure.ac @@ -44,11 +44,8 @@ AC_COPYRIGHT([Copyright (C) 2020 Alaska Communications]) AC_REVISION(0.1) AC_INIT([Alaska Communications UDP Echo Tools],[0.1],[david.syzdek@acsalaska.com],[akcom-udpecho]) -AC_SUBST([RELEASE_MONTH],["February 2020"]) -PACKAGE_COPYRIGHT="Copyright (C) 2020 Alaska Communications" -AC_DEFINE_UNQUOTED(PACKAGE_COPYRIGHT, ["${PACKAGE_COPYRIGHT}"], [Copyright notice.]) -AC_SUBST([PACKAGE_COPYRIGHT], [${PACKAGE_COPYRIGHT}]) +AC_SUBST([RELEASE_MONTH],["February 2020"]) # directory locations @@ -71,13 +68,13 @@ AC_PROG_CC #AC_PROG_OBJC AC_PROG_CXX AM_PROG_CC_C_O -AC_PROG_LEX -AC_PROG_YACC AC_PROG_INSTALL AC_PROG_MAKE_SET AC_USE_SYSTEM_EXTENSIONS # replaces AC_AIX AC_GNU_SOURCE AC_MINIX AC_C_BIGENDIAN AC_C_INLINE +AC_C_RESTRICT + # Version Info: # Current -- the current version number of this API @@ -101,7 +98,7 @@ AC_CHECK_TOOLS(STRIP, strip gstrip, [AC_MSG_ERROR([missing binutil "strip"]) AC_PROG_AWK AC_PROG_EGREP AC_PROG_FGREP -AM_PROG_LEX +#AM_PROG_LEX AC_PROG_LN_S AC_PROG_MKDIR_P AC_PROG_SED @@ -128,10 +125,9 @@ AC_TYPE_UINT8_T AC_TYPE_UINT16_T AC_TYPE_UINT32_T AC_TYPE_UINT64_T -#AC_CHECK_TYPES([LDAPURLDesc],, [AC_MSG_ERROR([missing required datatype])],[#include ]) + # check for required functions -AC_CHECK_FUNCS([bzero], [], [AC_MSG_ERROR([missing required functions])]) AC_CHECK_FUNCS([clock_gettime], [], [AC_MSG_ERROR([missing required functions])]) AC_CHECK_FUNCS([getpass], [], [AC_MSG_ERROR([missing required functions])]) AC_CHECK_FUNCS([gettimeofday], [], [AC_MSG_ERROR([missing required functions])]) @@ -146,42 +142,24 @@ AC_CHECK_FUNCS([strerror], [], [AC_MSG_ERROR([missing required functions]) AC_CHECK_FUNCS([strncasecmp], [], [AC_MSG_ERROR([missing required functions])]) AC_CHECK_FUNCS([strtol], [], [AC_MSG_ERROR([missing required functions])]) AC_CHECK_FUNCS([strtoul], [], [AC_MSG_ERROR([missing required functions])]) +AC_CHECK_FUNCS([strtoull], [], [AC_MSG_ERROR([missing required functions])]) -# check for required libraries -AC_SEARCH_LIBS([getopt_long], c gnugetopt,,AC_MSG_ERROR([missing required function])) -AC_SEARCH_LIBS([ldap_dn2str], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([ldap_dnfree], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([ldap_explode_dn], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([ldap_first_entry], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([ldap_free_urldesc], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([ldap_get_dn], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([ldap_initialize], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([ldap_result], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([ldap_sasl_bind_s], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([ldap_search_ext], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([ldap_set_option], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([ldap_str2dn], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([ldap_unbind_ext_s], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([ldap_url_parse], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([ldap_value_free], ldap,,AC_MSG_ERROR([missing required function]), [-llber]) -AC_SEARCH_LIBS([socket], socket,,AC_MSG_ERROR([missing required function]), [-lresolv]) # check for headers -AC_CHECK_HEADER_STDBOOL AC_CHECK_HEADERS([arpa/inet.h],, [AC_MSG_ERROR([missing required header])]) AC_CHECK_HEADERS([fcntl.h],, [AC_MSG_ERROR([missing required header])]) +AC_CHECK_HEADERS([getopt.h],, [AC_MSG_ERROR([missing required header])]) +AC_CHECK_HEADERS([inttypes.h],, [AC_MSG_ERROR([missing required header])]) AC_CHECK_HEADERS([netdb.h],, [AC_MSG_ERROR([missing required header])]) AC_CHECK_HEADERS([netinet/in.h],, [AC_MSG_ERROR([missing required header])]) -AC_CHECK_HEADERS([termios.h],, [AC_MSG_ERROR([missing required header])]) -AC_CHECK_HEADERS([ldap.h],, [AC_MSG_ERROR([missing required header])]) -AC_CHECK_HEADERS([getopt.h],, [AC_MSG_ERROR([missing required header])]) +AC_CHECK_HEADERS([stdint.h],, [AC_MSG_ERROR([missing required header])]) AC_CHECK_HEADERS([signal.h],, [AC_MSG_ERROR([missing required header])]) -AC_CHECK_HEADERS([libintl.h]) -AC_CHECK_HEADERS([malloc.h]) -AC_CHECK_HEADERS([sgtty.h]) +AC_CHECK_HEADERS([strings.h],, [AC_MSG_ERROR([missing required header])]) AC_CHECK_HEADERS([sys/socket.h],, [AC_MSG_ERROR([missing required header])]) AC_CHECK_HEADERS([syslog.h],, [AC_MSG_ERROR([missing required header])]) -AC_CHECK_HEADERS([stddef.h]) +AC_CHECK_HEADERS([termios.h],, [AC_MSG_ERROR([missing required header])]) +AC_CHECK_HEADERS([unistd.h],, [AC_MSG_ERROR([missing required header])]) + # initiates bindle tools macros AC_BINDLE(contrib/bindletools) -- cgit v1.2.3