aide-ac_fix.patch

   1 diff -Nur old/configure.in new/configure.in
   2 --- old/configure.in    2003-12-13 19:43:39.000000000 +0000
   3 +++ new/configure.in    2003-12-15 02:30:53.000000000 +0000
   4 @@ -187,11 +187,11 @@
   5  AC_CHECK_FUNCS(readdir readdir_r stricmp ustat)
   6  AC_ARG_WITH(mmap,
   7         [--without-mmap    Don't use mmap. Useful on some platforms with slow mmap],
   8 -       if test "x$withval" = "xyes"; then
   9 +       [if test "x$withval" = "xyes"; then
  10                 AC_CHECK_FUNCS(mmap)
  11 -       fi
  12 +       fi]
  13         ,
  14 -       AC_CHECK_FUNCS(mmap)
  15 +       [AC_CHECK_FUNCS(mmap)]
  16  )
  17  AC_CHECK_FUNC(vsnprintf,,
  18         [AC_MSG_ERROR([Must have a system that supports vsnprintf.])]
  19 @@ -241,12 +241,12 @@
  20  AC_MSG_CHECKING(for acl-support)
  21  AC_ARG_WITH(sun-acl,
  22    [--with-sun-acl      use ACL on solaris (no checking)],
  23 -  AC_DEFINE(WITH_SUN_ACL)
  24 +  [AC_DEFINE(WITH_SUN_ACL)
  25    AC_DEFINE(WITH_ACL)
  26    ACLLIB="-lsec"
  27 -  AC_MSG_RESULT(yes)
  28 +  AC_MSG_RESULT(yes)]
  29    ,
  30 -  AC_MSG_RESULT(no)
  31 +  [AC_MSG_RESULT(no)]
  32    )
  33
  34  AC_SUBST(ACLLIB)
  35 @@ -258,9 +258,10 @@
  36  AC_EGREP_CPP(sunisdefined,
  37      [#ifdef sun
  38         sunisdefined
  39 -    #endif],
  40 -    AC_CHECK_FUNC(lstat64,
  41 -       AC_CHECK_FUNC(stat64,
  42 +    #endif
  43 +    ],
  44 +    [AC_CHECK_FUNC(lstat64,
  45 +       [AC_CHECK_FUNC(stat64,
  46                 AC_DEFINE_UNQUOTED(AIDE_LSTAT_FUNC,lstat64)
  47                 AC_DEFINE_UNQUOTED(AIDE_STAT_FUNC,stat64)
  48                 AC_DEFINE_UNQUOTED(AIDE_FSTAT_FUNC,fstat64)
  49 @@ -285,9 +286,9 @@
  50                 AC_DEFINE_UNQUOTED(AIDE_DIRENT_TYPE,dirent)
  51                 compoptionstring="${compoptionstring}WITH_LSTAT\\n"
  52                 compoptionstring="${compoptionstring}WITH_READDIR\\n"
  53 -               )
  54 +               )]
  55         ,
  56 -       AC_DEFINE_UNQUOTED(AIDE_LSTAT_FUNC,lstat)
  57 +       [AC_DEFINE_UNQUOTED(AIDE_LSTAT_FUNC,lstat)
  58         AC_DEFINE_UNQUOTED(AIDE_STAT_FUNC,stat)
  59         AC_DEFINE_UNQUOTED(AIDE_FSTAT_FUNC,fstat)
  60         AC_DEFINE_UNQUOTED(AIDE_STAT_TYPE,stat)
  61 @@ -298,10 +299,10 @@
  62         AC_DEFINE_UNQUOTED(AIDE_READDIR_R_FUNC,readdir_r)
  63         AC_DEFINE_UNQUOTED(AIDE_DIRENT_TYPE,dirent)
  64         compoptionstring="${compoptionstring}WITH_LSTAT\\n"
  65 -       compoptionstring="${compoptionstring}WITH_READDIR\\n"
  66 -       )
  67 +       compoptionstring="${compoptionstring}WITH_READDIR\\n"]
  68 +       )]
  69    ,
  70 -  AC_DEFINE_UNQUOTED(AIDE_LSTAT_FUNC,lstat)
  71 +  [AC_DEFINE_UNQUOTED(AIDE_LSTAT_FUNC,lstat)
  72    AC_DEFINE_UNQUOTED(AIDE_STAT_FUNC,stat)
  73    AC_DEFINE_UNQUOTED(AIDE_FSTAT_FUNC,fstat)
  74    AC_DEFINE_UNQUOTED(AIDE_STAT_TYPE,stat)
  75 @@ -312,7 +313,7 @@
  76    AC_DEFINE_UNQUOTED(AIDE_READDIR_FUNC,readdir)
  77    AC_DEFINE_UNQUOTED(AIDE_READDIR_R_FUNC,readdir_r)
  78    AC_DEFINE_UNQUOTED(AIDE_DIRENT_TYPE,dirent)
  79 -  compoptionstring="${compoptionstring}WITH_READDIR\\n"
  80 +  compoptionstring="${compoptionstring}WITH_READDIR\\n"]
  81    )
  82
  83
  84 @@ -365,32 +366,29 @@
  85  fi
  86
  87  AC_ARG_WITH([gnu-regexp],
  88 -  [--with-gnu-regexp  use the bundled GNU regexp(use only if necessary)],
  89 -  [AC_DEFINE(REGEX, 1)]
  90 -,
  91 -  [AC_CHECK_FUNCS(regexec regcomp,,
  92 -       [AC_DEFINE(REGEX,1)])]
  93 +  [--with-gnu-regexp  use the bundled GNU regexp (use only if necessary)],
  94 +  [AC_DEFINE(REGEX, 1)],
  95 +  [AC_CHECK_FUNCS(regexec regcomp,, [AC_DEFINE(REGEX,1)])]
  96  )
  97
  98 -AC_ARG_WITH(gcrypt,
  99 -  [--with-gcrypt  use gcrypt library],
 100 -  AC_DEFINE(WITH_GCRYPT)
 101 +AC_ARG_WITH(gcrypt,  [--with-gcrypt  use gcrypt library],
 102 +  [AC_DEFINE(WITH_GCRYPT)
 103    AC_CHECK_HEADER(gcrypt.h,,
 104 -       AC_MSG_ERROR(You don't have libgcrypt properly installed.
 105 -Install it if you need one.)
 106 +       [AC_MSG_ERROR(You don't have libgcrypt properly installed.
 107 +Install it if you need one.)]
 108  )
 109    CRYPTLIB="-lgcrypt"
 110 -  compoptionstring="${compoptionstring}WITH_GCRYPT\\n"
 111 +  compoptionstring="${compoptionstring}WITH_GCRYPT\\n"]
 112    ,
 113    [with_gcrypt=no])
 114
 115 -AC_CHECK_LIB(mhash,mhash_get_block_size,
 116 +#AC_CHECK_LIB(mhash,mhash_get_block_size,
 117    CRYPTLIB="-lmhash"
 118    compoptionstring="${compoptionstring}WITH_MHASH\\n"
 119    AC_DEFINE(WITH_MHASH)
 120 -,
 121 -       AC_MSG_ERROR(You must have libmhash properly installed.)
 122 -)
 123 +#,
 124 +#      AC_MSG_ERROR(You must have libmhash properly installed.)
 125 +#)
 126
 127  AC_SUBST(CRYPTLIB)
 128
 129 @@ -400,12 +398,11 @@
 130    if test "x$withval" = "xmd5" ;then
 131        AC_DEFINE(CONFIGHMACTYPE,MHASH_MD5)
 132    else
 133 -  if test "x$withval" = "xsha1" ;then
 134 -      AC_DEFINE(CONFIGHMACTYPE,MHASH_SHA1)
 135 -  else
 136 -      echo "Valid parameters for --with-confighmactype are md5, sha1"
 137 -      exit 1
 138 -  fi
 139 +    if test "x$withval" = "xsha1" ;then
 140 +        AC_DEFINE(CONFIGHMACTYPE,MHASH_SHA1)
 141 +    else
 142 +        AC_MSG_ERROR(Valid parameters for --with-confighmactype are md5, sha1)
 143 +    fi
 144    fi
 145  ,
 146  )
 147 @@ -447,12 +444,11 @@
 148    if test "x$withval" = "xmd5" ;then
 149        AC_DEFINE(DBHMACTYPE,MHASH_MD5)
 150    else
 151 -  if test "x$withval" = "xsha1" ;then
 152 -      AC_DEFINE(DBHMACTYPE,MHASH_SHA1)
 153 -  else
 154 -      echo "Valid parameters for --with-dbhmactype are md5, sha1"
 155 -      exit 1
 156 -  fi
 157 +    if test "x$withval" = "xsha1" ;then
 158 +        AC_DEFINE(DBHMACTYPE,MHASH_SHA1)
 159 +    else
 160 +        AC_MSG_ERROR(Valid parameters for --with-dbhmactype are md5, sha1)
 161 +    fi
 162    fi
 163  ,
 164  )
 165 @@ -532,6 +528,10 @@
 166
 167  AC_DEFINE_UNQUOTED(AIDECOMPILEOPTIONS, "${compoptionstring}")
 168
 169 -AC_OUTPUT(Makefile src/Makefile intl/Makefile po/Makefile.in doc/Makefile doc/aide.conf
 170 -aide.spec)
 171 +AC_OUTPUT([
 172 +           Makefile
 173 +           src/Makefile
 174 +           doc/Makefile
 175 +           doc/aide.conf
 176 +           aide.spec])
 177