Merge branch 'v3-cleanup' into tmp/v3.0.2-alex

[netatalk.git] / bin / afppasswd / Makefile.am

diff --git a/bin/afppasswd/Makefile.am b/bin/afppasswd/Makefile.am
index daff8d41b8edd4e5ba288a3941c47833a972aaf7..cab2df66125687dc2014435fd59fac1cd28fea43 100644 (file)
--- a/bin/afppasswd/Makefile.am
+++ b/bin/afppasswd/Makefile.am
@@ -1,28 +1,20 @@
 # Makefile.am for bin/afppasswd/
 
-pkgconfdir = $(PKGCONFDIR)
+pkgconfdir = @PKGCONFDIR@
 
-if USE_DHX
+if HAVE_OPENSSL
 bin_PROGRAMS = afppasswd
 else
 bin_PROGRAMS =
 endif
 
-if HAVE_GCRYPT
-CRYPT_CFLAGS = $(GCRYPT_CFLAGS)
-CRYPT_LIBS = $(GCRYPT_LIBS)
-else
-CRYPT_CFLAGS = $(SSL_CFLAGS)
-CRYPT_LIBS = $(SSL_LIBS)
-endif
-
 afppasswd_SOURCES = afppasswd.c
-afppasswd_LDADD = $(top_builddir)/libatalk/libatalk.la $(CRYPT_LIBS)
+afppasswd_LDADD = $(top_builddir)/libatalk/libatalk.la @SSL_LIBS@
 
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/sys $(CRYPT_CFLAGS) \
-       -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\"
+AM_CFLAGS = @SSL_CFLAGS@ -I$(top_srcdir)/sys \
+    -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\"
 
 install-exec-hook:
-if USE_DHX
+if HAVE_OPENSSL
        chmod u+s $(DESTDIR)$(bindir)/afppasswd
 endif