Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[2.2] Do not install at.h when glibc header is present #414

Merged
merged 1 commit into from
Aug 27, 2023
Merged

[2.2] Do not install at.h when glibc header is present #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 6 additions & 0 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,11 @@ dnl AC_COMPILE_IFELSE([
AC_MSG_RESULT([no])
])

dnl ----- Use the glibc at.h header if found -----
AC_CHECK_HEADER([netatalk/at.h], [
use_glibc_at_header=yes
])

if test "x$ac_have_atalk_addr" = "xyes"; then
AC_DEFINE(HAVE_ATALK_ADDR, 1, [set if struct at_addr is called atalk_addr])
fi
Expand Down Expand Up @@ -1320,6 +1325,7 @@ AM_CONDITIONAL(USE_BDB, test x$bdb_required = xyes)
AM_CONDITIONAL(USE_APPLETALK, test x$netatalk_cv_ddp_enabled = xyes)
AM_CONDITIONAL(HAVE_ATFUNCS, test x"$ac_neta_haveatfuncs" = x"yes")
AM_CONDITIONAL(USE_INSTALL_PRIVILEGED, test x"$install_privileged" = x"yes")
AM_CONDITIONAL(USE_GLIBC_AT_HEADER, test x$use_glibc_at_header = xyes)

dnl Enable silent Automake rules if present
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
Expand Down
6 changes: 6 additions & 0 deletions sys/netatalk/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
# Makefile.am for sys/netatalk/

# Install at.h only on systems that don't use glibc
if USE_GLIBC_AT_HEADER
pkginclude_HEADERS = aarp.h at_var.h ddp.h ddp_var.h endian.h phase2.h
noinst_HEADERS = at.h
else
pkginclude_HEADERS = aarp.h at.h at_var.h ddp.h ddp_var.h endian.h phase2.h
endif

SOURCES = aarp.c at_control.c at_proto.c ddp_input.c ddp_output.c ddp_usrreq.c

Expand Down