Solaris share reservation cross platform locking

[netatalk.git] / macros / netatalk.m4

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 5aa460d95127a57700d4dbd70fe1a3d40d9aefd9..7da9e64b4facf1e11ae7869f3cc5514041204e51 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -575,15 +575,20 @@ AC_ARG_WITH(ldap,
         )
 AC_MSG_RESULT($netatalk_cv_ldap)
 
-save_CFLAGS=$CFLAGS
-save_LIBS=$LIBS
+save_CFLAGS="$CFLAGS"
+save_LDFLAGS="$LDFLAGS"
+save_LIBS="$LIBS"
 CFLAGS=""
+LDFLAGS=""
 LIBS=""
+LDAP_CFLAGS=""
+LDAP_LDFLAGS=""
+LDAP_LIBS=""
 
 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=$netatalk_cv_ldap/include
-       LIBS=$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,15 +605,18 @@ if test x"$netatalk_cv_ldap" != x"no" ; then
 fi
 
 if test x"$netatalk_cv_ldap" = x"yes"; then
-    LDAP_CFLAGS=$CFLAGS
-    LDAP_LIBS=$LIBS
+    LDAP_CFLAGS="$CFLAGS"
+    LDAP_LDFLAGS="$LDFLAGS"
+    LDAP_LIBS="-lldap"
        AC_DEFINE(HAVE_LDAP,1,[Whether LDAP is available])
-    AC_SUBST(LDAP_CFLAGS)
-    AC_SUBST(LDAP_LIBS)
 fi
 
-CFLAGS=$save_CFLAGS
-LIBS=$save_LIBS
+AC_SUBST(LDAP_CFLAGS)
+AC_SUBST(LDAP_LDFLAGS)
+AC_SUBST(LDAP_LIBS)
+CFLAGS="$save_CFLAGS"
+LDLFLAGS="$save_LDLFLAGS"
+LIBS="$save_LIBS"
 ])
 
 dnl Check for ACL support