enable Perl's strict and warnings in make-release

[openafs.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index c040b74..aed59c1 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,15 +16,14 @@ LINUX_PKGREL=1.1
 dnl Debian wants the release candidate version in the main upstream version,
 dnl and wants ~ before it.
 DEB_PKGVER=m4_esyscmd([build-tools/git-version .])
-if echo "$LINUX_PKGREL" | grep pre >/dev/null 2>/dev/null ; then
-    DEB_PKGVER="$DEB_PKGVER"`echo "$LINUX_PKGREL" | sed 's/0.pre/~rc/'`
-fi
+AS_IF([echo "$LINUX_PKGREL" | grep pre >/dev/null 2>/dev/null],
+    [DEB_PKGVER="$DEB_PKGVER"`echo "$LINUX_PKGREL" | sed 's/0.pre/~rc/'`])
 
 AC_SUBST([MACOS_VERSION])
 AC_SUBST([DEB_PKGVER])
 
 dnl If the user hasn't specified CFLAGS don't let configure pick -g -O2
-AS_IF([test -z "$CFLAGS"], [CFLAGS=" "], [])
+AS_IF([test -z "$CFLAGS"], [CFLAGS=" "])
 
 AC_USE_SYSTEM_EXTENSIONS
 
@@ -60,28 +59,32 @@ AS_IF([test x"$KRB5_LIBS" != x],
      MAKE_KRB5=
      RRA_LIB_KRB5_SWITCH
      AC_CHECK_FUNCS([add_error_table \
-        add_to_error_table \
-        encode_krb5_enc_tkt_part \
-        encode_krb5_ticket \
+       add_to_error_table \
+       encode_krb5_enc_tkt_part \
+       encode_krb5_ticket \
        krb5_524_conv_principal \
-        krb5_allow_weak_crypto \
-        krb5_c_encrypt \
-        krb5_decode_ticket \
-        krb5_enctype_enable \
-        krb5_get_init_creds_opt_alloc \
-        krb5_get_prompt_types \
-        krb5_princ_size \
-        krb5_principal_get_comp_string])
+       krb5_allow_weak_crypto \
+       krb5_c_encrypt \
+       krb5_decode_ticket \
+       krb5_enctype_enable \
+       krb5_get_init_creds_opt_alloc \
+       krb5_get_prompt_types \
+       krb5_princ_size \
+       krb5_principal_get_comp_string])
      AC_CHECK_FUNCS([krb5_524_convert_creds], [],
-        [AC_CHECK_FUNCS([krb524_convert_creds_kdc], [],
-             [AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc],
-                 [LIBS="-lkrb524 $LIBS"
-                  KRB5_LIBS="-lkrb524 $KRB5_LIBS"
-                 AC_CHECK_LIB([krb524], [krb5_524_conv_principal],
-                 [AC_DEFINE([HAVE_KRB5_524_CONV_PRINCIPAL], 1,
-                    [Define to 1 if you have the `krb5_524_conv_principal' function.])])
-                  AC_DEFINE([HAVE_KRB524_CONVERT_CREDS_KDC], 1,
-                     [Define to 1 if you have the `krb524_convert_creds_kdc' function.])])])])
+       [AC_CHECK_FUNCS([krb524_convert_creds_kdc], [],
+           [AC_CHECK_LIB([krb524], [krb524_convert_creds_kdc],
+               [LIBS="-lkrb524 $LIBS"
+                KRB5_LIBS="-lkrb524 $KRB5_LIBS"
+                AC_CHECK_LIB([krb524], [krb5_524_conv_principal],
+                    [AC_DEFINE([HAVE_KRB5_524_CONV_PRINCIPAL], [1],
+                        [Define to 1 if you have the `krb5_524_conv_principal' function.])
+                ])
+                AC_DEFINE([HAVE_KRB524_CONVERT_CREDS_KDC], [1],
+                    [Define to 1 if you have the `krb524_convert_creds_kdc' function.])
+           ])
+       ])
+     ])
      AC_CHECK_HEADERS([kerberosIV/krb.h])
      AC_CHECK_HEADERS([kerberosV/heim_err.h])
      AC_CHECK_MEMBERS([krb5_creds.keyblock, krb5_creds.keyblock.enctype, krb5_creds.session,
@@ -91,9 +94,11 @@ dnl If we're using heimdal, aklog needs libasn1 for encode_EncTicketPart and a
 dnl few other functions. But just aklog; not any of the other stuff that uses
 dnl krb5.
      AS_IF([test x"$ac_cv_member_krb5_creds_session" = xyes],
-           [AC_CHECK_LIB([asn1], [encode_EncTicketPart],
-                       [AKLOG_KRB5_LIBS="-lasn1"])])
-     RRA_LIB_KRB5_RESTORE])
+          [AC_CHECK_LIB([asn1], [encode_EncTicketPart],
+              [AKLOG_KRB5_LIBS="-lasn1"])
+     ])
+     RRA_LIB_KRB5_RESTORE
+])
 AC_SUBST([BUILD_KRB5])
 AC_SUBST([MAKE_KRB5])
 AC_SUBST([AKLOG_KRB5_LIBS])
@@ -101,36 +106,24 @@ AC_SUBST([AKLOG_KRB5_LIBS])
 dnl Probe for GSSAPI
 RRA_LIB_GSSAPI
 
-if test -d 'doc/man-pages' ; then
-    MAN_MAKEFILE="doc/man-pages/Makefile doc/man-pages/install-man"
-else
-    MAN_MAKEFILE=
-fi
-if test -f 'doc/xml/AdminGuide/Makefile.in' ; then
-   ADMINGUIDE_MAKEFILE="doc/xml/AdminGuide/Makefile"
-else
-   ADMINGUIDE_MAKEFILE=
-fi
-if test -f 'doc/xml/QuickStartUnix/Makefile.in' ; then
-   QSUNIX_MAKEFILE="doc/xml/QuickStartUnix/Makefile"
-else
-   QSUNIX_MAKEFILE=
-fi
-if test -f 'doc/xml/UserGuide/Makefile.in' ; then
-   USERGUIDE_MAKEFILE="doc/xml/UserGuide/Makefile"
-else
-   USERGUIDE_MAKEFILE=
-fi
-if test -f 'doc/xml/AdminRef/Makefile.in' ; then
-   ADMINREF_MAKEFILE="doc/xml/AdminRef/Makefile"
-else
-   ADMINREF_MAKEFILE=
-fi
-if test -f 'doc/xml/mobi-fixup.xsl.in' ; then
-   MOBI_FIXUP_XSL="doc/xml/mobi-fixup.xsl"
-else
-   MOBI_FIXUP_XSL=
-fi
+AS_IF([test -d 'doc/man-pages'],
+    [MAN_MAKEFILE="doc/man-pages/Makefile doc/man-pages/install-man"],
+    [MAN_MAKEFILE=])
+AS_IF([test -f 'doc/xml/AdminGuide/Makefile.in'],
+    [ADMINGUIDE_MAKEFILE="doc/xml/AdminGuide/Makefile"],
+    [ADMINGUIDE_MAKEFILE=])
+AS_IF([test -f 'doc/xml/QuickStartUnix/Makefile.in'],
+    [QSUNIX_MAKEFILE="doc/xml/QuickStartUnix/Makefile"],
+    [QSUNIX_MAKEFILE=])
+AS_IF([test -f 'doc/xml/UserGuide/Makefile.in'],
+    [USERGUIDE_MAKEFILE="doc/xml/UserGuide/Makefile"],
+    [USERGUIDE_MAKEFILE=])
+AS_IF([test -f 'doc/xml/AdminRef/Makefile.in'],
+    [ADMINREF_MAKEFILE="doc/xml/AdminRef/Makefile"],
+    [ADMINREF_MAKEFILE=])
+AS_IF([test -f 'doc/xml/mobi-fixup.xsl.in'],
+    [MOBI_FIXUP_XSL="doc/xml/mobi-fixup.xsl"],
+    [MOBI_FIXUP_XSL=])
 
 AC_OUTPUT([
     Makefile