enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

fix autofoo build to match e auth patch backport 

the autofoo wasnt updated with the patch and peolpe are using the
autotools build thus this btoke e lockscreen auth but not building the
binary.
This commit is contained in:
Carsten Haitzler 2018-03-22 12:11:23 +09:00
parent 3c5b541385
commit 0d9a763165
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@ -116,6 +116,8 @@ fi
AC_SUBST([fnmatch_libs])
CKPASSWD_LIBS=""
have_pam=no
AC_ARG_ENABLE(pam,
AS_HELP_STRING([--enable-pam], [enable PAM support @<:@default=detect@:>@]),
@ -125,6 +127,7 @@ AC_ARG_ENABLE(pam,
if test "x$want_pam" != "xno" ; then
AC_CHECK_HEADERS(security/pam_appl.h, [
LIBS="$LIBS -lpam"
CKPASSWD_LIBS="$CKPASSWD_LIBS -lpam"
have_pam=yes
AC_DEFINE(HAVE_PAM, 1, [PAM Authentication Support])])
if test "x$want_pam$have_pam" = "xyesno" ; then
@ -1029,6 +1032,7 @@ SUID_CFLAGS=
SUID_LDFLAGS=
case "$host_os" in
freebsd*|pcbsd*)
CKPASSWD_LIBS="$CKPASSWD_LIBS -lcrypt"
;;
*)
if test -n "$GCC"; then
@ -1051,6 +1055,7 @@ case "$host_os" in
fi
;;
esac
AC_SUBST([CKPASSWD_LIBS])
AC_SUBST([SUID_CFLAGS])
AC_SUBST([SUID_LDFLAGS])

8
src/bin/Makefile.mk
View File

@ -54,9 +54,7 @@ src/bin/enlightenment_elm_cfgtool \
src/bin/enlightenment_static_grabber \
src/bin/enlightenment_alert
if HAVE_FREEBSD
internal_bin_PROGRAMS += src/bin/enlightenment_ckpasswd
endif
ENLIGHTENMENTHEADERS = \
src/bin/efx/e_Efx.h \
@ -530,13 +528,11 @@ src/bin/e_backlight_main.c
src_bin_enlightenment_backlight_CPPFLAGS = @SUID_CFLAGS@ @EEZE_CFLAGS@
src_bin_enlightenment_backlight_LDADD = @SUID_LDFLAGS@ @EEZE_LIBS@
if HAVE_FREEBSD
src_bin_enlightenment_ckpasswd_SOURCES = \
src/bin/e_ckpasswd_main.c
src_bin_enlightenment_ckpasswd_CPPFLAGS = @SUID_CFLAGS@
src_bin_enlightenment_ckpasswd_LDADD = @SUID_LDFLAGS@ -lcrypt
endif
src_bin_enlightenment_ckpasswd_LDADD = @SUID_LDFLAGS@ @CKPASSWD_LIBS@
src_bin_enlightenment_alert_SOURCES = \
src/bin/e_alert_main.c
@ -568,9 +564,7 @@ setuid_root_mode = a=rx,u+xs
enlightenment-sys-install-data-hook:
@chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_sys$(EXEEXT) || true
@chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_backlight$(EXEEXT) || true
if HAVE_FREEBSD
@chmod $(setuid_root_mode) $(DESTDIR)$(libdir)/enlightenment/utils/enlightenment_ckpasswd$(EXEEXT) || true
endif
installed_headersdir = $(prefix)/include/enlightenment
installed_headers_DATA = $(ENLIGHTENMENTHEADERS) src/bin/e_fm_shared_types.h
INSTALL_DATA_HOOKS += enlightenment-sys-install-data-hook