Fix and cleanup compiler flags

diff --git a/etc/afpd/Makefile.am b/etc/afpd/Makefile.am
index fdd2e58aaa4dc27562a1019b1b001e8b9450aa43..85b51dc86bdca8971ecb85ce94c66c1273c28e21 100644 (file)
--- a/etc/afpd/Makefile.am
+++ b/etc/afpd/Makefile.am
@@ -45,12 +45,12 @@ afpd_SOURCES = \
 
 afpd_LDADD =  \
        $(top_builddir)/libatalk/libatalk.la \
-       @LIBGCRYPT_LIBS@ @QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@ @GSSAPI_LIBS@
+       @LIBGCRYPT_LIBS@ @QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@ @GSSAPI_LIBS@ @KRB5_LIBS@
 
 afpd_LDFLAGS = -export-dynamic
 
 afpd_CFLAGS = \
-       @ZEROCONF_CFLAGS@ @GSSAPI_CFLAGS@ \
+       @ZEROCONF_CFLAGS@ @GSSAPI_CFLAGS@ @KRB5_CFLAGS@\
        -DAPPLCNAME \
        -DSERVERTEXT=\"$(SERVERTEXT)/\" \
        -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \

diff --git a/macros/gssapi-check.m4 b/macros/gssapi-check.m4
index 9f738be994b844e7da3279bf1be45bea1ab2ab45..15c2f392f3200a7a6e5be64657fdff54b37503cf 100644 (file)
--- a/macros/gssapi-check.m4
+++ b/macros/gssapi-check.m4
@@ -14,15 +14,14 @@ AC_DEFUN([NETATALK_GSSAPI_CHECK],
         )
 
        if test x"$compilegssapi" != x"no"; then
-
-                if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto"; then
-                       GSSAPI_CFLAGS="-I$withval/include"
-                       GSSAPI_CPPFLAGS="-I$withval/include"
-                       GSSAPI_LDFLAGS="-L$withval/${atalk_libname}"
-                       FOUND_GSSAPI=yes
+        if test "x$compilegssapi" != "xyes" -a "x$compilegssapi" != "xauto"; then
+            GSSAPI_CFLAGS="-I$withval/include"
+            GSSAPI_CPPFLAGS="-I$withval/include"
+            GSSAPI_LDFLAGS="-L$withval/${atalk_libname}"
+            FOUND_GSSAPI=yes
                        AC_MSG_CHECKING([checking for GSSAPI support in])
                        AC_MSG_RESULT([$compilegssapi])
-                fi
+        fi
 
 
          # Do no harm to the values of CFLAGS and LIBS while testing for
@@ -39,22 +38,20 @@ AC_DEFUN([NETATALK_GSSAPI_CHECK],
          AC_PATH_PROG(KRB5_CONFIG, krb5-config)
          AC_MSG_CHECKING(for working krb5-config)
          if test -x "$KRB5_CONFIG"; then
+        CFLAGS=""; export CFLAGS
+           LDFLAGS=""; export LDFLAGS
            TEMP="`$KRB5_CONFIG --libs gssapi`"
         if test $? -eq 0 ; then
-               save_CFLAGS=$CFLAGS
-               CFLAGS="";export CFLAGS
-               save_LDFLAGS=$LDFLAGS
-               LDFLAGS="";export LDFLAGS
                GSSAPI_CFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
                GSSAPI_CPPFLAGS="`$KRB5_CONFIG --cflags | sed s/@INCLUDE_des@//`"
             GSSAPI_LIBS="$TEMP"
-               CFLAGS=$save_CFLAGS;export CFLAGS
-               LDFLAGS=$save_LDFLAGS;export LDFLAGS
                FOUND_GSSAPI=yes
                AC_MSG_RESULT(yes)
         else
                AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
         fi
+           CFLAGS=$save_CFLAGS; export CFLAGS
+           LDFLAGS=$save_LDFLAGS; export LDFLAGS
          else
            AC_MSG_RESULT(no. Fallback to previous krb5 detection strategy)
          fi
@@ -96,11 +93,10 @@ AC_DEFUN([NETATALK_GSSAPI_CHECK],
          fi
        fi
 
-       CFLAGS="$CFLAGS $GSSAPI_CFLAGS"
-       CPPFLAGS="$CPPFLAGS $GSSAPI_CPPFLAGS"
-       LDFLAGS="$LDFLAGS $GSSAPI_LDFLAGS"
-       LIBS="$LIBS $GSSAPI_LIBS"
-
+       CFLAGS="$GSSAPI_CFLAGS"
+       CPPFLAGS="$GSSAPI_CPPFLAGS"
+       LDFLAGS="$GSSAPI_LDFLAGS"
+       LIBS="$GSSAPI_LIBS"
 
        # check for gssapi headers
 
@@ -132,7 +128,7 @@ AC_DEFUN([NETATALK_GSSAPI_CHECK],
        if test x"$ac_cv_func_gss_acquire_cred" = x"yes"; then
                AC_DEFINE(HAVE_GSSAPI,1,[Whether to enable GSSAPI support])
                AC_MSG_RESULT([yes])
-               GSSAPI_LIBS="$LDFLAGS $LIBS"
+#              GSSAPI_LIBS="$LDFLAGS $LIBS"
        else
                AC_MSG_RESULT([no])
                if test x"$compilegssapi" = x"yes"; then

diff --git a/macros/netatalk.m4 b/macros/netatalk.m4
index 611a8b4c49fa0dcd2adfe9a86e53b141fbd17160..151be9956b6e7f81131ae98b4b4035c9c16262ae 100644 (file)
--- a/macros/netatalk.m4
+++ b/macros/netatalk.m4
@@ -512,6 +512,9 @@ fi
 AM_CONDITIONAL(USE_GSSAPI, test x"$netatalk_cv_build_krb5_uam" = x"yes")
 ])
 
+dnl Check if we can directly use Kerberos 5 API, used for reading keytabs
+dnl and automatically construction DirectoryService names from that, instead
+dnl of requiring special configuration in afp.conf
 AC_DEFUN([AC_NETATALK_KERBEROS], [
 AC_MSG_CHECKING([for Kerberos 5 (necessary for GetSrvrInfo:DirectoryNames support)])
 AC_ARG_WITH([kerberos],
@@ -531,8 +534,10 @@ if test x"$with_kerberos" != x"no"; then
    AC_MSG_CHECKING([for krb5-config])
    if test -x "$KRB5_CONFIG"; then
       AC_MSG_RESULT([$KRB5_CONFIG])
-      CFLAGS="$CFLAGS `$KRB5_CONFIG --cflags krb5`"
-      LIBS="$LIBS `$KRB5_CONFIG --libs krb5`"
+      KRB5_CFLAGS="`$KRB5_CONFIG --cflags krb5`"
+      KRB5_LIBS="`$KRB5_CONFIG --libs krb5`"
+      AC_SUBST(KRB5_CFLAGS)
+      AC_SUBST(KRB5_LIBS)
       with_kerberos="yes"
    else
       AC_MSG_RESULT([not found])

diff --git a/test/afpd/Makefile.am b/test/afpd/Makefile.am
index cb870d0c06813c0b561cc2b5307ae5fe9434ccb6..033c9e1d3784c3b4c0651100d0243c2aa02bf84f 100644 (file)
--- a/test/afpd/Makefile.am
+++ b/test/afpd/Makefile.am
@@ -52,7 +52,7 @@ test_CFLAGS = \
        -I$(top_srcdir)/etc/afpd \
        -I$(top_srcdir)/include \
        -I$(top_srcdir)/sys \
-       @ZEROCONF_CFLAGS@ @GSSAPI_CFLAGS@ \
+       @ZEROCONF_CFLAGS@ @GSSAPI_CFLAGS@ @KRB5_CFLAGS@\
        -DAPPLCNAME \
        -DSERVERTEXT=\"$(SERVERTEXT)/\" \
        -D_PATH_AFPDPWFILE=\"$(pkgconfdir)/afppasswd\" \
@@ -62,6 +62,6 @@ test_CFLAGS = \
 
 test_LDADD = \
        $(top_builddir)/libatalk/libatalk.la \
-       @LIBGCRYPT_LIBS@ @QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@ @GSSAPI_LIBS@
+       @LIBGCRYPT_LIBS@ @QUOTA_LIBS@ @WRAP_LIBS@ @LIBADD_DL@ @ACL_LIBS@ @ZEROCONF_LIBS@ @PTHREAD_LIBS@ @GSSAPI_LIBS@ @KRB5_LIBS@
 
 test_LDFLAGS = -export-dynamic