configure.in (msktutil-1.1.tar.bz2) | : | configure.in (msktutil-1.2.1) | ||
---|---|---|---|---|
# Process this file with autoconf to produce a configure script. | # Process this file with autoconf to produce a configure script. | |||
AC_PREREQ(2.53) | AC_PREREQ(2.53) | |||
AC_INIT(msktutil, 1.1) | AC_INIT(msktutil, 1.2.1) | |||
AC_CONFIG_HEADER([config.h]) | AC_CONFIG_HEADER([config.h]) | |||
PACKAGE_DATE="June 25, 2018" | PACKAGE_DATE="2022-11-24" | |||
PACKAGE_AUTHOR="Mark Pröhl, Olaf Flebbe, Daniel Kobras, Michael Osipov" | PACKAGE_AUTHOR="Mark Pröhl, Olaf Flebbe, Daniel Kobras, Michael Osipov" | |||
AC_SUBST(PACKAGE_DATE) | AC_SUBST(PACKAGE_DATE) | |||
AC_SUBST(PACKAGE_AUTHOR) | AC_SUBST(PACKAGE_AUTHOR) | |||
# Checks for programs. | # Checks for programs. | |||
AC_PROG_CC | AC_PROG_CC | |||
AC_PROG_CXX | AC_PROG_CXX | |||
AC_LANG(C++) | AC_LANG(C++) | |||
AC_PATH_PROGS(INSTALL, install) | AC_PATH_PROGS(INSTALL, install) | |||
AC_PATH_PROGS(CAT, cat) | AC_PATH_PROGS(CAT, cat) | |||
AC_PATH_PROGS(RM, rm) | AC_PATH_PROGS(RM, rm) | |||
AC_PATH_PROGS(CP, cp) | AC_PATH_PROGS(CP, cp) | |||
AC_PATH_PROGS(ECHO, echo) | AC_PATH_PROGS(ECHO, echo) | |||
AC_PATH_PROGS(SED, sed) | AC_PATH_PROGS(SED, sed) | |||
AC_PATH_PROGS(MKDIR, mkdir) | AC_PATH_PROGS(MKDIR, mkdir) | |||
AC_PATH_PROGS(TAR, gnutar gtar tar) | ||||
AC_SUBST(WARNFLAGS) | AC_SUBST(WARNFLAGS) | |||
AC_ARG_WITH(mandir, | AC_ARG_WITH(mandir, | |||
[ --with-mandir=DIR Where to put man pages ($mandir)], | [ --with-mandir=DIR Where to put man pages ($mandir)], | |||
[ mandir="$withval" ]) | [ mandir="$withval" ]) | |||
AC_ARG_WITH(krb5, | AC_ARG_WITH(krb5, | |||
[ --with-krb5=<auto/mit/heimdal> | [ --with-krb5=<auto/mit/heimdal> | |||
Which krb5 implementation to use (default: auto-detect )], | Which krb5 implementation to use (default: auto-detect )], | |||
[ krb5="$withval" ], [ krb5="auto" ] ) | [ krb5="$withval" ], [ krb5="auto" ] ) | |||
skipping to change at line 214 | skipping to change at line 215 | |||
# linking dynamically. This is taken care of by actually including the | # linking dynamically. This is taken care of by actually including the | |||
# right headers and trying again. | # right headers and trying again. | |||
AC_MSG_CHECKING([for ns_initparse]) | AC_MSG_CHECKING([for ns_initparse]) | |||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[ | AC_LINK_IFELSE([AC_LANG_PROGRAM([[ | |||
#include <netinet/in.h> | #include <netinet/in.h> | |||
#include <arpa/nameser.h> | #include <arpa/nameser.h> | |||
#include <resolv.h> | #include <resolv.h> | |||
]],[[ | ]],[[ | |||
ns_initparse(0, 0, 0); | ns_initparse(0, 0, 0); | |||
]])], | ]])], | |||
AC_MSG_RESULT([yes]), [ | [AC_DEFINE(HAVE_NS_INITPARSE,1) | |||
AC_MSG_RESULT([yes])], [ | ||||
# now try libresolv again | # now try libresolv again | |||
AC_MSG_RESULT([no]) | AC_MSG_RESULT([no]) | |||
saved_LIBS="$LIBS" | saved_LIBS="$LIBS" | |||
LIBS="$LIBS -lresolv" | LIBS="$LIBS -lresolv" | |||
AC_MSG_CHECKING([for ns_initparse in -lresolv]) | AC_MSG_CHECKING([for ns_initparse in -lresolv]) | |||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[ | AC_LINK_IFELSE([AC_LANG_PROGRAM([[ | |||
#include <netinet/in.h> | #include <netinet/in.h> | |||
#include <arpa/nameser.h> | #include <arpa/nameser.h> | |||
#include <resolv.h> | #include <resolv.h> | |||
]],[[ | ]],[[ | |||
ns_initparse(0, 0, 0); | ns_initparse(0, 0, 0); | |||
]])], | ]])], | |||
[ AC_DEFINE(HAVE_NS_INITPARSE,1) | [AC_DEFINE(HAVE_NS_INITPARSE,1) | |||
AC_MSG_RESULT([yes])], [ | AC_MSG_RESULT([yes])], [ | |||
# glibc versions prior to 2.9 include ns_initparse in | # glibc versions prior to 2.9 include ns_initparse in | |||
# libresolve but do not export it. Try to circumvent | # libresolve but do not export it. Try to circumvent | |||
# this restriction by linking the missing bits statically . | # this restriction by linking the missing bits statically . | |||
AC_MSG_RESULT([no]) | AC_MSG_RESULT([no]) | |||
LIBS="$saved_LIBS -lresolv -Wl,-Bstatic -lresolv -Wl,-Bdy namic" | LIBS="$saved_LIBS -lresolv -Wl,-Bstatic -lresolv -Wl,-Bdy namic" | |||
AC_MSG_CHECKING([for ns_initparse in statically linked -l resolv]) | AC_MSG_CHECKING([for ns_initparse in statically linked -l resolv]) | |||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[ | AC_LINK_IFELSE([AC_LANG_PROGRAM([[ | |||
#include <netinet/in.h> | #include <netinet/in.h> | |||
#include <arpa/nameser.h> | #include <arpa/nameser.h> | |||
#include <resolv.h> | #include <resolv.h> | |||
]],[[ | ]],[[ | |||
ns_initparse(0, 0, 0); | ns_initparse(0, 0, 0); | |||
]])], | ]])], | |||
[AC_DEFINE(HAVE_NS_INITPARSE,1) | [AC_DEFINE(HAVE_NS_INITPARSE,1) | |||
AC_MSG_RESULT([yes])], | AC_MSG_RESULT([yes])], [ | |||
[LIBS="$saved_LIBS" | LIBS="$saved_LIBS" | |||
AC_MSG_RESULT([no])])])])]) | AC_MSG_RESULT([no])])])])]) | |||
# finally check if res_search is present as well just as a sanity check | # finally check if res_search is present as well just as a sanity check | |||
AC_MSG_CHECKING([for res_search]) | AC_MSG_CHECKING([for res_search]) | |||
AC_LINK_IFELSE([AC_LANG_PROGRAM([[ | AC_LINK_IFELSE([AC_LANG_PROGRAM([[ | |||
#include <netinet/in.h> | #include <netinet/in.h> | |||
#include <arpa/nameser.h> | #include <arpa/nameser.h> | |||
#include <resolv.h> | #include <resolv.h> | |||
]],[[ | ]],[[ | |||
res_search(0, 0, 0, 0, 0); | res_search(0, 0, 0, 0, 0); | |||
skipping to change at line 308 | skipping to change at line 310 | |||
error_message(0); | error_message(0); | |||
} | } | |||
])], [AC_MSG_RESULT(yes); com_err_needs_extern_c=yes], [AC_MSG_ERROR([Couldn't g et error_message to work.])])]) | ])], [AC_MSG_RESULT(yes); com_err_needs_extern_c=yes], [AC_MSG_ERROR([Couldn't g et error_message to work.])])]) | |||
if test "$com_err_needs_extern_c=yes"; then | if test "$com_err_needs_extern_c=yes"; then | |||
AC_DEFINE(COM_ERR_NEEDS_EXTERN_C, 1, [Does com_err.h need extern "C" around it ?]) | AC_DEFINE(COM_ERR_NEEDS_EXTERN_C, 1, [Does com_err.h need extern "C" around it ?]) | |||
fi | fi | |||
fi | fi | |||
# Check for functions | # Check for functions | |||
AC_CHECK_FUNCS(vasprintf vsnprintf setenv strtoll ldap_initialize) | AC_CHECK_FUNCS(vasprintf vsnprintf setenv strtoll ldap_initialize krb5_get_etype _info) | |||
# Check that the AES enctypes are found | # Check that the AES enctypes are found | |||
AC_CHECK_DECLS([ENCTYPE_AES256_CTS_HMAC_SHA1_96, ENCTYPE_AES128_CTS_HMAC_SHA1_96 ], [], [], [[#include <krb5.h>]]) | AC_CHECK_DECLS([ENCTYPE_AES256_CTS_HMAC_SHA1_96, ENCTYPE_AES128_CTS_HMAC_SHA1_96 ], [], [], [[#include <krb5.h>]]) | |||
AC_CONFIG_FILES([Makefile]) | AC_CONFIG_FILES([Makefile msktutil.1]) | |||
AC_OUTPUT | AC_OUTPUT | |||
End of changes. 8 change blocks. | ||||
8 lines changed or deleted | 10 lines changed or added |