mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-08 21:43:07 +02:00
* src/aclocal.m4: Fixes in configure script: fix
disable-disable_zlib and disable-pam; in case of problems, PAM verification aborts with error instead of warning. (EJAB-787) * src/configure.ac: Likewise * src/configure: Likewise SVN Revision: 1754
This commit is contained in:
parent
919914d8ac
commit
3a3a89007a
|
@ -1,3 +1,11 @@
|
||||||
|
2008-12-24 Badlop <badlop@process-one.net>
|
||||||
|
|
||||||
|
* src/aclocal.m4: Fixes in configure script: fix
|
||||||
|
disable-disable_zlib and disable-pam; in case of problems, PAM
|
||||||
|
verification aborts with error instead of warning. (EJAB-787)
|
||||||
|
* src/configure.ac: Likewise
|
||||||
|
* src/configure: Likewise
|
||||||
|
|
||||||
2008-12-23 Badlop <badlop@process-one.net>
|
2008-12-23 Badlop <badlop@process-one.net>
|
||||||
|
|
||||||
* src/acl.erl: New ACL: shared_group (thanks to Maxim Ryazanov)
|
* src/acl.erl: New ACL: shared_group (thanks to Maxim Ryazanov)
|
||||||
|
|
17
src/aclocal.m4
vendored
17
src/aclocal.m4
vendored
|
@ -15,7 +15,7 @@ AC_DEFUN(AM_WITH_EXPAT,
|
||||||
[ expat_found=no ],
|
[ expat_found=no ],
|
||||||
"$EXPAT_LIBS")
|
"$EXPAT_LIBS")
|
||||||
if test $expat_found = no; then
|
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
|
fi
|
||||||
expat_save_CFLAGS="$CFLAGS"
|
expat_save_CFLAGS="$CFLAGS"
|
||||||
CFLAGS="$CFLAGS $EXPAT_CFLAGS"
|
CFLAGS="$CFLAGS $EXPAT_CFLAGS"
|
||||||
|
@ -36,6 +36,7 @@ AC_DEFUN(AM_WITH_ZLIB,
|
||||||
[ AC_ARG_WITH(zlib,
|
[ AC_ARG_WITH(zlib,
|
||||||
[AC_HELP_STRING([--with-zlib=PREFIX], [prefix where zlib is installed])])
|
[AC_HELP_STRING([--with-zlib=PREFIX], [prefix where zlib is installed])])
|
||||||
|
|
||||||
|
if test x"$ejabberd_zlib" != x; then
|
||||||
ZLIB_CFLAGS=
|
ZLIB_CFLAGS=
|
||||||
ZLIB_LIBS=
|
ZLIB_LIBS=
|
||||||
if test x"$with_zlib" != x; then
|
if test x"$with_zlib" != x; then
|
||||||
|
@ -49,7 +50,7 @@ AC_DEFUN(AM_WITH_ZLIB,
|
||||||
[ zlib_found=no ],
|
[ zlib_found=no ],
|
||||||
"$ZLIB_LIBS")
|
"$ZLIB_LIBS")
|
||||||
if test $zlib_found = no; then
|
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
|
fi
|
||||||
zlib_save_CFLAGS="$CFLAGS"
|
zlib_save_CFLAGS="$CFLAGS"
|
||||||
CFLAGS="$CFLAGS $ZLIB_CFLAGS"
|
CFLAGS="$CFLAGS $ZLIB_CFLAGS"
|
||||||
|
@ -57,19 +58,20 @@ AC_DEFUN(AM_WITH_ZLIB,
|
||||||
CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
|
CPPFLAGS="$CPPFLAGS $ZLIB_CFLAGS"
|
||||||
AC_CHECK_HEADERS(zlib.h, , zlib_found=no)
|
AC_CHECK_HEADERS(zlib.h, , zlib_found=no)
|
||||||
if test $zlib_found = no; then
|
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
|
fi
|
||||||
CFLAGS="$zlib_save_CFLAGS"
|
CFLAGS="$zlib_save_CFLAGS"
|
||||||
CPPFLAGS="$zlib_save_CPPFLAGS"
|
CPPFLAGS="$zlib_save_CPPFLAGS"
|
||||||
|
|
||||||
AC_SUBST(ZLIB_CFLAGS)
|
AC_SUBST(ZLIB_CFLAGS)
|
||||||
AC_SUBST(ZLIB_LIBS)
|
AC_SUBST(ZLIB_LIBS)
|
||||||
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN(AM_WITH_PAM,
|
AC_DEFUN(AM_WITH_PAM,
|
||||||
[ AC_ARG_WITH(pam,
|
[ AC_ARG_WITH(pam,
|
||||||
[AC_HELP_STRING([--with-pam=PREFIX], [prefix where PAM is installed])])
|
[AC_HELP_STRING([--with-pam=PREFIX], [prefix where PAM is installed])])
|
||||||
|
if test x"$pam" != x; then
|
||||||
PAM_CFLAGS=
|
PAM_CFLAGS=
|
||||||
PAM_LIBS=
|
PAM_LIBS=
|
||||||
if test x"$with_pam" != x; then
|
if test x"$with_pam" != x; then
|
||||||
|
@ -83,7 +85,7 @@ AC_DEFUN(AM_WITH_PAM,
|
||||||
[ pam_found=no ],
|
[ pam_found=no ],
|
||||||
"$PAM_LIBS")
|
"$PAM_LIBS")
|
||||||
if test $pam_found = no; then
|
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
|
fi
|
||||||
pam_save_CFLAGS="$CFLAGS"
|
pam_save_CFLAGS="$CFLAGS"
|
||||||
CFLAGS="$CFLAGS $PAM_CFLAGS"
|
CFLAGS="$CFLAGS $PAM_CFLAGS"
|
||||||
|
@ -91,13 +93,14 @@ AC_DEFUN(AM_WITH_PAM,
|
||||||
CPPFLAGS="$CPPFLAGS $PAM_CFLAGS"
|
CPPFLAGS="$CPPFLAGS $PAM_CFLAGS"
|
||||||
AC_CHECK_HEADERS(security/pam_appl.h, , pam_found=no)
|
AC_CHECK_HEADERS(security/pam_appl.h, , pam_found=no)
|
||||||
if test $pam_found = no; then
|
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
|
fi
|
||||||
CFLAGS="$pam_save_CFLAGS"
|
CFLAGS="$pam_save_CFLAGS"
|
||||||
CPPFLAGS="$pam_save_CPPFLAGS"
|
CPPFLAGS="$pam_save_CPPFLAGS"
|
||||||
|
|
||||||
AC_SUBST(PAM_CFLAGS)
|
AC_SUBST(PAM_CFLAGS)
|
||||||
AC_SUBST(PAM_LIBS)
|
AC_SUBST(PAM_LIBS)
|
||||||
|
fi
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN(AM_WITH_ERLANG,
|
AC_DEFUN(AM_WITH_ERLANG,
|
||||||
|
@ -337,7 +340,7 @@ if test x"$tls" != x; then
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
if test x${have_openssl} != xyes; then
|
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
|
fi
|
||||||
AC_SUBST(SSL_LIBS)
|
AC_SUBST(SSL_LIBS)
|
||||||
AC_SUBST(SSL_CFLAGS)
|
AC_SUBST(SSL_CFLAGS)
|
||||||
|
|
1223
src/configure
vendored
1223
src/configure
vendored
File diff suppressed because it is too large
Load Diff
|
@ -18,10 +18,6 @@ AM_WITH_ERLANG
|
||||||
AM_ICONV
|
AM_ICONV
|
||||||
#locating libexpat
|
#locating libexpat
|
||||||
AM_WITH_EXPAT
|
AM_WITH_EXPAT
|
||||||
#locating zlib
|
|
||||||
AM_WITH_ZLIB
|
|
||||||
#locating PAM
|
|
||||||
AM_WITH_PAM
|
|
||||||
|
|
||||||
# Checks for typedefs, structures, and compiler characteristics.
|
# Checks for typedefs, structures, and compiler characteristics.
|
||||||
AC_C_CONST
|
AC_C_CONST
|
||||||
|
@ -36,16 +32,22 @@ AC_PREFIX_DEFAULT(/)
|
||||||
AC_FUNC_MALLOC
|
AC_FUNC_MALLOC
|
||||||
AC_HEADER_STDC
|
AC_HEADER_STDC
|
||||||
|
|
||||||
AC_MOD_ENABLE(mod_pubsub, yes)
|
|
||||||
AC_MOD_ENABLE(mod_irc, yes)
|
AC_MOD_ENABLE(mod_irc, yes)
|
||||||
AC_MOD_ENABLE(mod_muc, yes)
|
AC_MOD_ENABLE(mod_muc, yes)
|
||||||
AC_MOD_ENABLE(mod_proxy65, yes)
|
AC_MOD_ENABLE(mod_proxy65, yes)
|
||||||
|
AC_MOD_ENABLE(mod_pubsub, yes)
|
||||||
AC_MOD_ENABLE(eldap, yes)
|
AC_MOD_ENABLE(eldap, yes)
|
||||||
AC_MOD_ENABLE(pam, no)
|
|
||||||
AC_MOD_ENABLE(web, yes)
|
|
||||||
AC_MOD_ENABLE(tls, yes)
|
|
||||||
AC_MOD_ENABLE(odbc, no)
|
AC_MOD_ENABLE(odbc, no)
|
||||||
|
AC_MOD_ENABLE(tls, yes)
|
||||||
|
AC_MOD_ENABLE(web, yes)
|
||||||
|
|
||||||
AC_MOD_ENABLE(ejabberd_zlib, yes)
|
AC_MOD_ENABLE(ejabberd_zlib, yes)
|
||||||
|
#locating zlib
|
||||||
|
AM_WITH_ZLIB
|
||||||
|
|
||||||
|
AC_MOD_ENABLE(pam, no)
|
||||||
|
#locating PAM
|
||||||
|
AM_WITH_PAM
|
||||||
|
|
||||||
AC_ARG_ENABLE(hipe,
|
AC_ARG_ENABLE(hipe,
|
||||||
[AC_HELP_STRING([--enable-hipe], [compile natively with HiPE, not recommended (default: no)])],
|
[AC_HELP_STRING([--enable-hipe], [compile natively with HiPE, not recommended (default: no)])],
|
||||||
|
|
Loading…
Reference in New Issue
Block a user