Re-indent krb5 section after pkg-config addition.

diff --git a/configure.ac b/configure.ac
index a79be8157c615830b6fe896260372f8d07ed5f7e..83719193d24a0a5fe8b4527f9cf3d72690e224e7 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4618,82 +4618,82 @@ AC_ARG_WITH([kerberos5],
                                [AC_MSG_RESULT([no])
                        ])
                else
-               AC_PATH_TOOL([KRB5CONF], [krb5-config],
-                            [$KRB5ROOT/bin/krb5-config],
-                            [$KRB5ROOT/bin:$PATH])
-               if test -x $KRB5CONF ; then
-                       K5CFLAGS="`$KRB5CONF --cflags`"
-                       K5LIBS="`$KRB5CONF --libs`"
-                       CPPFLAGS="$CPPFLAGS $K5CFLAGS"
-
-                       AC_MSG_CHECKING([for gssapi support])
-                       if $KRB5CONF | grep gssapi >/dev/null ; then
-                               AC_MSG_RESULT([yes])
-                               AC_DEFINE([GSSAPI], [1],
-                                       [Define this if you want GSSAPI
-                                       support in the version 2 protocol])
-                               GSSCFLAGS="`$KRB5CONF --cflags gssapi`"
-                               GSSLIBS="`$KRB5CONF --libs gssapi`"
-                               CPPFLAGS="$CPPFLAGS $GSSCFLAGS"
-                       else
-                               AC_MSG_RESULT([no])
-                       fi
-                       AC_MSG_CHECKING([whether we are using Heimdal])
-                       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <krb5.h>
-                               ]], [[ char *tmp = heimdal_version; ]])],
-                               [ AC_MSG_RESULT([yes])
-                               AC_DEFINE([HEIMDAL], [1],
-                               [Define this if you are using the Heimdal
-                               version of Kerberos V5]) ],
-                               [AC_MSG_RESULT([no])
-                       ])
-               else
-                       CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
-                       LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
-                       AC_MSG_CHECKING([whether we are using Heimdal])
-                       AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <krb5.h>
-                               ]], [[ char *tmp = heimdal_version; ]])],
+                       AC_PATH_TOOL([KRB5CONF], [krb5-config],
+                                    [$KRB5ROOT/bin/krb5-config],
+                                    [$KRB5ROOT/bin:$PATH])
+                       if test -x $KRB5CONF ; then
+                               K5CFLAGS="`$KRB5CONF --cflags`"
+                               K5LIBS="`$KRB5CONF --libs`"
+                               CPPFLAGS="$CPPFLAGS $K5CFLAGS"
+
+                               AC_MSG_CHECKING([for gssapi support])
+                               if $KRB5CONF | grep gssapi >/dev/null ; then
+                                       AC_MSG_RESULT([yes])
+                                       AC_DEFINE([GSSAPI], [1],
+                                               [Define this if you want GSSAPI
+                                               support in the version 2 protocol])
+                                       GSSCFLAGS="`$KRB5CONF --cflags gssapi`"
+                                       GSSLIBS="`$KRB5CONF --libs gssapi`"
+                                       CPPFLAGS="$CPPFLAGS $GSSCFLAGS"
+                               else
+                                       AC_MSG_RESULT([no])
+                               fi
+                               AC_MSG_CHECKING([whether we are using Heimdal])
+                               AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <krb5.h>
+                                       ]], [[ char *tmp = heimdal_version; ]])],
                                        [ AC_MSG_RESULT([yes])
-                                        AC_DEFINE([HEIMDAL])
-                                        K5LIBS="-lkrb5"
-                                        K5LIBS="$K5LIBS -lcom_err -lasn1"
-                                        AC_CHECK_LIB([roken], [net_write],
-                                          [K5LIBS="$K5LIBS -lroken"])
-                                        AC_CHECK_LIB([des], [des_cbc_encrypt],
-                                          [K5LIBS="$K5LIBS -ldes"])
-                                      ], [ AC_MSG_RESULT([no])
-                                        K5LIBS="-lkrb5 -lk5crypto -lcom_err"
-                       ])
-                       AC_SEARCH_LIBS([dn_expand], [resolv])
+                                       AC_DEFINE([HEIMDAL], [1],
+                                       [Define this if you are using the Heimdal
+                                       version of Kerberos V5]) ],
+                                       [AC_MSG_RESULT([no])
+                               ])
+                       else
+                               CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include"
+                               LDFLAGS="$LDFLAGS -L${KRB5ROOT}/lib"
+                               AC_MSG_CHECKING([whether we are using Heimdal])
+                               AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <krb5.h>
+                                       ]], [[ char *tmp = heimdal_version; ]])],
+                                               [ AC_MSG_RESULT([yes])
+                                                AC_DEFINE([HEIMDAL])
+                                                K5LIBS="-lkrb5"
+                                                K5LIBS="$K5LIBS -lcom_err -lasn1"
+                                                AC_CHECK_LIB([roken], [net_write],
+                                                  [K5LIBS="$K5LIBS -lroken"])
+                                                AC_CHECK_LIB([des], [des_cbc_encrypt],
+                                                  [K5LIBS="$K5LIBS -ldes"])
+                                              ], [ AC_MSG_RESULT([no])
+                                                K5LIBS="-lkrb5 -lk5crypto -lcom_err"
+                               ])
+                               AC_SEARCH_LIBS([dn_expand], [resolv])
 
-                       AC_CHECK_LIB([gssapi_krb5], [gss_init_sec_context],
-                               [ AC_DEFINE([GSSAPI])
-                                 GSSLIBS="-lgssapi_krb5" ],
-                               [ AC_CHECK_LIB([gssapi], [gss_init_sec_context],
+                               AC_CHECK_LIB([gssapi_krb5], [gss_init_sec_context],
                                        [ AC_DEFINE([GSSAPI])
-                                         GSSLIBS="-lgssapi" ],
-                                       [ AC_CHECK_LIB([gss], [gss_init_sec_context],
+                                         GSSLIBS="-lgssapi_krb5" ],
+                                       [ AC_CHECK_LIB([gssapi], [gss_init_sec_context],
                                                [ AC_DEFINE([GSSAPI])
-                                                 GSSLIBS="-lgss" ],
-                                               AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]))
+                                                 GSSLIBS="-lgssapi" ],
+                                               [ AC_CHECK_LIB([gss], [gss_init_sec_context],
+                                                       [ AC_DEFINE([GSSAPI])
+                                                         GSSLIBS="-lgss" ],
+                                                       AC_MSG_WARN([Cannot find any suitable gss-api library - build may fail]))
+                                               ])
                                        ])
-                               ])
 
-                       AC_CHECK_HEADER([gssapi.h], ,
-                               [ unset ac_cv_header_gssapi_h
-                                 CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
-                                 AC_CHECK_HEADERS([gssapi.h], ,
-                                       AC_MSG_WARN([Cannot find any suitable gss-api header - build may fail])
-                                 )
-                               ]
-                       )
+                               AC_CHECK_HEADER([gssapi.h], ,
+                                       [ unset ac_cv_header_gssapi_h
+                                         CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
+                                         AC_CHECK_HEADERS([gssapi.h], ,
+                                               AC_MSG_WARN([Cannot find any suitable gss-api header - build may fail])
+                                         )
+                                       ]
+                               )
 
-                       oldCPP="$CPPFLAGS"
-                       CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
-                       AC_CHECK_HEADER([gssapi_krb5.h], ,
-                                       [ CPPFLAGS="$oldCPP" ])
+                               oldCPP="$CPPFLAGS"
+                               CPPFLAGS="$CPPFLAGS -I${KRB5ROOT}/include/gssapi"
+                               AC_CHECK_HEADER([gssapi_krb5.h], ,
+                                               [ CPPFLAGS="$oldCPP" ])
 
-               fi
+                       fi
                fi
                if test -n "${rpath_opt}" ; then
                        LDFLAGS="$LDFLAGS ${rpath_opt}${KRB5ROOT}/lib"