mirror of
https://gitlab.freedesktop.org/libbsd/libbsd.git
synced 2025-05-11 18:39:00 +02:00
build: Conditionalize only id-from-name functions not the entire pwcache
On macOS the name-from-id functions are present, but not the id-from-name ones, so we want to provide those instead of suppressing the entire file.
This commit is contained in:
parent
edc746ea7b
commit
dc1bd1a2cb
@ -325,7 +325,7 @@ need_md5=yes
|
|||||||
need_nlist=yes
|
need_nlist=yes
|
||||||
need_strl=yes
|
need_strl=yes
|
||||||
need_strmode=yes
|
need_strmode=yes
|
||||||
need_pwcache=yes
|
need_id_from_name=yes
|
||||||
need_fpurge=yes
|
need_fpurge=yes
|
||||||
need_funopen=yes
|
need_funopen=yes
|
||||||
AS_CASE([$host_os],
|
AS_CASE([$host_os],
|
||||||
@ -355,7 +355,7 @@ AS_CASE([$host_os],
|
|||||||
need_nlist=no
|
need_nlist=no
|
||||||
need_strl=no
|
need_strl=no
|
||||||
need_strmode=no
|
need_strmode=no
|
||||||
need_pwcache=no
|
need_id_from_name=no
|
||||||
need_fpurge=no
|
need_fpurge=no
|
||||||
# On macOS we do not have fopencookie(), and cannot implement it.
|
# On macOS we do not have fopencookie(), and cannot implement it.
|
||||||
need_funopen=no
|
need_funopen=no
|
||||||
@ -372,7 +372,7 @@ AM_CONDITIONAL([NEED_MD5], [test "x$need_md5" = "xyes"])
|
|||||||
AM_CONDITIONAL([NEED_NLIST], [test "x$need_nlist" = "xyes"])
|
AM_CONDITIONAL([NEED_NLIST], [test "x$need_nlist" = "xyes"])
|
||||||
AM_CONDITIONAL([NEED_STRL], [test "x$need_strl" = "xyes"])
|
AM_CONDITIONAL([NEED_STRL], [test "x$need_strl" = "xyes"])
|
||||||
AM_CONDITIONAL([NEED_STRMODE], [test "x$need_strmode" = "xyes"])
|
AM_CONDITIONAL([NEED_STRMODE], [test "x$need_strmode" = "xyes"])
|
||||||
AM_CONDITIONAL([NEED_PWCACHE], [test "x$need_pwcache" = "xyes"])
|
AM_CONDITIONAL([NEED_ID_FROM_NAME], [test "x$need_id_from_name" = "xyes"])
|
||||||
AM_CONDITIONAL([NEED_FPURGE], [test "x$need_fpurge" = "xyes"])
|
AM_CONDITIONAL([NEED_FPURGE], [test "x$need_fpurge" = "xyes"])
|
||||||
AM_CONDITIONAL([NEED_FUNOPEN], [test "x$need_funopen" = "xyes"])
|
AM_CONDITIONAL([NEED_FUNOPEN], [test "x$need_funopen" = "xyes"])
|
||||||
AS_IF([test "x$need_funopen" = "xno" && \
|
AS_IF([test "x$need_funopen" = "xno" && \
|
||||||
|
@ -180,6 +180,7 @@ dist_man_MANS = \
|
|||||||
getbsize.3bsd \
|
getbsize.3bsd \
|
||||||
getmode.3bsd \
|
getmode.3bsd \
|
||||||
getpeereid.3bsd \
|
getpeereid.3bsd \
|
||||||
|
group_from_gid.3bsd \
|
||||||
heapsort.3bsd \
|
heapsort.3bsd \
|
||||||
humanize_number.3bsd \
|
humanize_number.3bsd \
|
||||||
le16dec.3bsd \
|
le16dec.3bsd \
|
||||||
@ -195,6 +196,7 @@ dist_man_MANS = \
|
|||||||
pidfile_open.3bsd \
|
pidfile_open.3bsd \
|
||||||
pidfile_remove.3bsd \
|
pidfile_remove.3bsd \
|
||||||
pidfile_write.3bsd \
|
pidfile_write.3bsd \
|
||||||
|
pwcache.3bsd \
|
||||||
queue.3bsd \
|
queue.3bsd \
|
||||||
radixsort.3bsd \
|
radixsort.3bsd \
|
||||||
readpassphrase.3bsd \
|
readpassphrase.3bsd \
|
||||||
@ -234,6 +236,7 @@ dist_man_MANS = \
|
|||||||
timeval.3bsd \
|
timeval.3bsd \
|
||||||
tree.3bsd \
|
tree.3bsd \
|
||||||
unvis.3bsd \
|
unvis.3bsd \
|
||||||
|
user_from_uid.3bsd \
|
||||||
vis.3bsd \
|
vis.3bsd \
|
||||||
wcslcat.3bsd \
|
wcslcat.3bsd \
|
||||||
wcslcpy.3bsd \
|
wcslcpy.3bsd \
|
||||||
@ -271,13 +274,10 @@ dist_man_MANS += \
|
|||||||
# EOL
|
# EOL
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if NEED_PWCACHE
|
if NEED_ID_FROM_NAME
|
||||||
dist_man_MANS += \
|
dist_man_MANS += \
|
||||||
pwcache.3bsd \
|
|
||||||
uid_from_user.3bsd \
|
uid_from_user.3bsd \
|
||||||
user_from_uid.3bsd \
|
|
||||||
gid_from_group.3bsd \
|
gid_from_group.3bsd \
|
||||||
group_from_gid.3bsd \
|
|
||||||
# EOL
|
# EOL
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -96,6 +96,7 @@ libbsd_la_SOURCES = \
|
|||||||
merge.c \
|
merge.c \
|
||||||
pidfile.c \
|
pidfile.c \
|
||||||
progname.c \
|
progname.c \
|
||||||
|
pwcache.c \
|
||||||
radixsort.c \
|
radixsort.c \
|
||||||
readpassphrase.c \
|
readpassphrase.c \
|
||||||
reallocarray.c \
|
reallocarray.c \
|
||||||
@ -163,12 +164,6 @@ libbsd_la_SOURCES += \
|
|||||||
# EOL
|
# EOL
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if NEED_PWCACHE
|
|
||||||
libbsd_la_SOURCES += \
|
|
||||||
pwcache.c \
|
|
||||||
# EOL
|
|
||||||
endif
|
|
||||||
|
|
||||||
if NEED_FPURGE
|
if NEED_FPURGE
|
||||||
libbsd_la_SOURCES += \
|
libbsd_la_SOURCES += \
|
||||||
fpurge.c \
|
fpurge.c \
|
||||||
|
@ -41,6 +41,7 @@ check_PROGRAMS = \
|
|||||||
fgetln \
|
fgetln \
|
||||||
fparseln \
|
fparseln \
|
||||||
proctitle-init \
|
proctitle-init \
|
||||||
|
pwcache \
|
||||||
setmode \
|
setmode \
|
||||||
strnstr \
|
strnstr \
|
||||||
strtonum \
|
strtonum \
|
||||||
@ -64,10 +65,6 @@ if NEED_STRMODE
|
|||||||
check_PROGRAMS += strmode
|
check_PROGRAMS += strmode
|
||||||
endif
|
endif
|
||||||
|
|
||||||
if NEED_PWCACHE
|
|
||||||
check_PROGRAMS += pwcache
|
|
||||||
endif
|
|
||||||
|
|
||||||
if NEED_FPURGE
|
if NEED_FPURGE
|
||||||
check_PROGRAMS += fpurge
|
check_PROGRAMS += fpurge
|
||||||
endif
|
endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user