Missing quotes and typo

diff --git a/libatalk/acl/Makefile.am b/libatalk/acl/Makefile.am
index 52a409eba311a8e9029f9e042c77f06af84d9cd4..0e75ee9ee420ff98c151043d533ab13c2f1150be 100644 (file)
--- a/libatalk/acl/Makefile.am
+++ b/libatalk/acl/Makefile.am
@@ -4,12 +4,14 @@ noinst_HEADERS = aclldap.h cache.h
 
 noinst_LTLIBRARIES = libacl.la
 libacl_la_SOURCES = cache.c unix.c uuid.c
+libacl_la_CFLAGS =
 libacl_la_LDFLAGS =
 libacl_la_LIBADD  =
 
 if HAVE_LDAP
 libacl_la_SOURCES += ldap.c ldap_config.c
+libacl_la_CFLAGS  += @LDAP_CFLAGS@
 libacl_la_LIBADD  += @LDAP_LIBS@
-libacl_la_LDFLAGS += @LDAP_LDLFLAGS@
+libacl_la_LDFLAGS += @LDAP_LDFLAGS@
 endif
 

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 32ccd9e67c74fe1d6c8e0e1ea7dad6818d9d0867..5b00dd5843238ac1282ad3cfa4ebb7c065a9e2e3 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -575,15 +575,15 @@ AC_ARG_WITH(ldap,
         )
 AC_MSG_RESULT($netatalk_cv_ldap)
 
-save_CFLAGS=$CFLAGS
-save_LDLFLAGS=$LDLFLAGS
+save_CFLAGS="$CFLAGS"
+save_LDLFLAGS="$LDLFLAGS"
 CFLAGS=""
 LDLFLAGS=""
 
 if test x"$netatalk_cv_ldap" != x"no" ; then
    if test x"$netatalk_cv_ldap" != x"yes" -a x"$netatalk_cv_ldap" != x"auto"; then
-       CFLAGS=-I$netatalk_cv_ldap/include
-       LDLFLAGS=-L$netatalk_cv_ldap/lib
+       CFLAGS="-I$netatalk_cv_ldap/include"
+       LDFLAGS="-L$netatalk_cv_ldap/lib"
    fi
        AC_CHECK_HEADER([ldap.h], netatalk_cv_ldap=yes,
         [ if test x"$netatalk_cv_ldap" = x"yes" ; then
@@ -600,17 +600,17 @@ if test x"$netatalk_cv_ldap" != x"no" ; then
 fi
 
 if test x"$netatalk_cv_ldap" = x"yes"; then
-    LDAP_CFLAGS=$CFLAGS
-    LDAP_LDLFLAGS=$LDLFLAGS
-    LDAP_LIBS=-lldap
+    LDAP_CFLAGS="$CFLAGS"
+    LDAP_LDLFLAGS="$LDLFLAGS"
+    LDAP_LIBS="-lldap"
        AC_DEFINE(HAVE_LDAP,1,[Whether LDAP is available])
     AC_SUBST(LDAP_CFLAGS)
     AC_SUBST(LDAP_LDLFLAGS)
     AC_SUBST(LDAP_LIBS)
 fi
 
-CFLAGS=$save_CFLAGS
-LDLFLAGS=$save_LDLFLAGS
+CFLAGS="$save_CFLAGS"
+LDLFLAGS="$save_LDLFLAGS"
 ])
 
 dnl Check for ACL support