aide-ac_fix.patch

   1 --- ./configure.in.org  Mon Jul 22 10:46:22 2002
   2 +++ ./configure.in      Mon Jul 22 12:35:12 2002
   3 @@ -193,9 +193,7 @@
   4         ,
   5         AC_CHECK_FUNCS(mmap)
   6  )
   7 -AC_CHECK_FUNC(vsnprintf,,
   8 -       echo "Must have a system that supports vsnprintf"
   9 -       exit 1)
  10 +AC_CHECK_FUNC(vsnprintf,, AC_MSG_ERROR(Must have a system that supports vsnprintf))
  11
  12  AC_CHECK_HEADERS(syslog.h ustat.h)
  13
  14 @@ -324,61 +322,49 @@
  15
  16  if test x$with_zlib = xyes; then
  17    AC_CHECK_HEADERS(zlib.h,,
  18 -       echo "You don't have zlib properly installed."
  19 -       echo "Install it or try --without-zlib."
  20 -       exit 1)
  21 +              AC_MSG_ERROR(You don't have zlib properly installed. Install it or try --without-zlib.))
  22    save_LDFLAGS=$LDFLAGS
  23    LDFLAGS="$LDFLAGS $LD_STATIC_FLAG"
  24 -  AC_CHECK_LIB(z,gzdopen,,
  25 -       echo "You don't have zlib properly installed."
  26 -       echo "Install it or try --without-zlib."
  27 -       exit 1)
  28 +  AC_CHECK_LIB(z,gzdopen,,
  29 +              AC_MSG_ERROR(You don't have zlib properly installed. Install it or try --without-zlib.))
  30    LDFLAGS=$save_LDFLAGS
  31    AC_DEFINE(WITH_ZLIB,1)
  32  fi
  33
  34  AC_ARG_WITH(gnu-regexp,
  35 -  "--with-gnu-regexp  use the bundled GNU regexp (use only if necessary)",
  36 -  [AC_DEFINE(REGEX, 1)],
  37 -  [AC_CHECK_FUNCS(regexec regcomp,,
  38 -       [AC_DEFINE(REGEX,1)]
  39 -  )]
  40 +           [--with-gnu-regexp  use the bundled GNU regexp (use only if necessary)],
  41 +           [AC_DEFINE(REGEX, 1)],
  42 +           [AC_CHECK_FUNCS(regexec regcomp, , [AC_DEFINE(REGEX,1)] )]
  43  )
  44
  45 -AC_ARG_WITH(gcrypt,
  46 -  [--with-gcrypt  use gcrypt library],
  47 -  AC_DEFINE(WITH_GCRYPT)
  48 -  AC_CHECK_HEADER(gcrypt.h,,
  49 -       echo "You don't have libgcrypt properly installed."
  50 -       echo "Install it if you need one."
  51 -       exit 1)
  52 -  CRYPTLIB="-lgcrypt"
  53 -  compoptionstring="${compoptionstring}WITH_GCRYPT\\n"
  54 -  ,
  55 -  [with_gcrypt=no])
  56 -
  57 -AC_CHECK_LIB(mhash,mhash_get_block_size,
  58 -  CRYPTLIB="-lmhash"
  59 -  compoptionstring="${compoptionstring}WITH_MHASH\\n"
  60 -  AC_DEFINE(WITH_MHASH)
  61 -,
  62 -       echo "You must have libmhash properly installed."
  63 -       exit 1)
  64 +AC_ARG_WITH(gcrypt,  [--with-gcrypt  use gcrypt library],
  65 +           [AC_DEFINE(WITH_GCRYPT)
  66 +           AC_CHECK_HEADER(gcrypt.h, [],
  67 +                           [AC_MSG_ERROR([You don't have libgcrypt properly installed. Install it if you need one.])])
  68 +           CRYPTLIB="-lgcrypt"
  69 +           compoptionstring="${compoptionstring}WITH_GCRYPT\\n" ],
  70 +           [with_gcrypt=no])
  71 +
  72 +#AC_CHECK_LIB(mhash,mhash_get_block_size,
  73 +            CRYPTLIB="-lmhash"
  74 +            compoptionstring="${compoptionstring}WITH_MHASH\\n"
  75 +            AC_DEFINE(WITH_MHASH)
  76 +#           ,
  77 +#           AC_MSG_ERROR(You must have libmhash properly installed.))
  78
  79  AC_SUBST(CRYPTLIB)
  80
  81  AC_ARG_WITH(confighmactype,
  82    [--with-confighmactype=TYPE Hash type to use for checking config.
  83                               Valid values are md5 and sha1.],
  84 -  if test "x$withval" = "xmd5" ;then
  85 -      AC_DEFINE(CONFIGHMACTYPE,MHASH_MD5)
  86 +  if test "x$withval" = "xmd5" ; then
  87 +         AC_DEFINE(CONFIGHMACTYPE,MHASH_MD5)
  88    else
  89 -  if test "x$withval" = "xsha1" ;then
  90 -      AC_DEFINE(CONFIGHMACTYPE,MHASH_SHA1)
  91 -  else
  92 -      echo "Valid parameters for --with-confighmactype are md5, sha1"
  93 -      exit 1
  94 -  fi
  95 +         if test "x$withval" = "xsha1" ;then
  96 +                 AC_DEFINE(CONFIGHMACTYPE,MHASH_SHA1)
  97 +         else
  98 +                 AC_MSG_ERROR(Valid parameters for --with-confighmactype are md5, sha1)
  99 +       fi
 100    fi
 101  ,
 102  )
 103 @@ -418,14 +404,13 @@
 104    [--with-dbhmactype=TYPE Hash type to use for checking db.
 105                           Valid values are md5 and sha1.],
 106    if test "x$withval" = "xmd5" ;then
 107 -      AC_DEFINE(DBHMACTYPE,MHASH_MD5)
 108 +         AC_DEFINE(DBHMACTYPE,MHASH_MD5)
 109    else
 110 -  if test "x$withval" = "xsha1" ;then
 111 -      AC_DEFINE(DBHMACTYPE,MHASH_SHA1)
 112 -  else
 113 -      echo "Valid parameters for --with-dbhmactype are md5, sha1"
 114 -      exit 1
 115 -  fi
 116 +         if test "x$withval" = "xsha1" ;then
 117 +                 AC_DEFINE(DBHMACTYPE,MHASH_SHA1)
 118 +         else
 119 +                 AC_MSG_ERROR(Valid parameters for --with-dbhmactype are md5, sha1)
 120 +         fi
 121    fi
 122  ,
 123  )
 124 @@ -485,9 +470,7 @@
 125  AC_ARG_WITH(psql,
 126    [--with-psql   use postgres sql library for storing databases],
 127    AC_DEFINE(WITH_PSQL)
 128 -  AC_CHECK_LIB(pq,PQclear,,
 129 -       echo "You must postgres sql library installed."
 130 -       exit 1)
 131 +  AC_CHECK_LIB(pq,PQclear,, AC_MSG_ERROR(You must postgres sql library installed.))
 132    PSQLLIB="-lpq"
 133    compoptionstring="${compoptionstring}WITH_PSQL\\n"
 134    AC_MSG_RESULT(yes)
 135 @@ -505,6 +488,12 @@
 136
 137  AC_DEFINE_UNQUOTED(AIDECOMPILEOPTIONS, "${compoptionstring}")
 138
 139 -AC_OUTPUT(Makefile src/Makefile intl/Makefile po/Makefile.in doc/Makefile doc/aide.conf
 140 -aide.spec)
 141 +AC_OUTPUT([
 142 +          Makefile
 143 +          src/Makefile
 144 +          intl/Makefile
 145 +          po/Makefile.in
 146 +          doc/Makefile
 147 +          doc/aide.conf
 148 +          aide.spec])
 149