diff options
Diffstat (limited to 'src/aclocal.m4')
| -rw-r--r-- | src/aclocal.m4 | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/aclocal.m4 b/src/aclocal.m4 index a1c9416ba..79b0e3ec7 100644 --- a/src/aclocal.m4 +++ b/src/aclocal.m4 @@ -15,7 +15,7 @@ AC_DEFUN(AM_WITH_EXPAT, [ expat_found=no ], "$EXPAT_LIBS") if test $expat_found = no; then - AC_MSG_ERROR([Could not find the Expat library]) + AC_MSG_ERROR([Could not find development files of Expat library]) fi expat_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $EXPAT_CFLAGS" @@ -36,6 +36,7 @@ AC_DEFUN(AM_WITH_ZLIB, [ AC_ARG_WITH(zlib, [AC_HELP_STRING([--with-zlib=PREFIX], [prefix where zlib is installed])]) +if test x"$ejabberd_zlib" != x; then ZLIB_CFLAGS= ZLIB_LIBS= if test x"$with_zlib" != x; then @@ -49,7 +50,7 @@ AC_DEFUN(AM_WITH_ZLIB, [ zlib_found=no ], "$ZLIB_LIBS") if test $zlib_found = no; then - AC_MSG_ERROR([Could not find the zlib library]) + AC_MSG_ERROR([Could not find development files of zlib library. Install them or disable `ejabberd_zlib' with: --disable-ejabberd_zlib]) fi zlib_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $ZLIB_CFLAGS" @@ -57,19 +58,20 @@ AC_DEFUN(AM_WITH_ZLIB, CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS" AC_CHECK_HEADERS(zlib.h, , zlib_found=no) if test $zlib_found = no; then - AC_MSG_ERROR([Could not find zlib.h]) + AC_MSG_ERROR([Could not find zlib.h. Install it or disable `ejabberd_zlib' with: --disable-ejabberd_zlib]) fi CFLAGS="$zlib_save_CFLAGS" CPPFLAGS="$zlib_save_CPPFLAGS" AC_SUBST(ZLIB_CFLAGS) AC_SUBST(ZLIB_LIBS) +fi ]) AC_DEFUN(AM_WITH_PAM, [ AC_ARG_WITH(pam, [AC_HELP_STRING([--with-pam=PREFIX], [prefix where PAM is installed])]) - +if test x"$pam" != x; then PAM_CFLAGS= PAM_LIBS= if test x"$with_pam" != x; then @@ -83,7 +85,7 @@ AC_DEFUN(AM_WITH_PAM, [ pam_found=no ], "$PAM_LIBS") if test $pam_found = no; then - AC_MSG_WARN([Could not find the PAM library]) + AC_MSG_ERROR([Could not find development files of PAM library. Install them or disable `pam' with: --disable-pam]) fi pam_save_CFLAGS="$CFLAGS" CFLAGS="$CFLAGS $PAM_CFLAGS" @@ -91,13 +93,14 @@ AC_DEFUN(AM_WITH_PAM, CPPFLAGS="$CPPFLAGS $PAM_CFLAGS" AC_CHECK_HEADERS(security/pam_appl.h, , pam_found=no) if test $pam_found = no; then - AC_MSG_WARN([Could not find security/pam_appl.h]) + AC_MSG_ERROR([Could not find security/pam_appl.h. Install it or disable `pam' with: --disable-pam]) fi CFLAGS="$pam_save_CFLAGS" CPPFLAGS="$pam_save_CPPFLAGS" AC_SUBST(PAM_CFLAGS) AC_SUBST(PAM_LIBS) +fi ]) AC_DEFUN(AM_WITH_ERLANG, @@ -337,7 +340,7 @@ if test x"$tls" != x; then fi done if test x${have_openssl} != xyes; then - AC_MSG_ERROR([openssl library cannot be found. Install openssl or disable `tls' module (--disable-tls).]) + AC_MSG_ERROR([Could not find development files of OpenSSL library. Install them or disable `tls' with: --disable-tls]) fi AC_SUBST(SSL_LIBS) AC_SUBST(SSL_CFLAGS) |