Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-20 16:15:59 +01:00
Code Releases Activity

Rename aclocal.m4 to acinclude.m4 (thanks to Andreas Köhler)

Browse Source 
Also fixed minor typos, added the compiled aclocal.m4 to gitignore.
As the 2.1.x branch includes the 'configure' script, it isn't needed
to document here how to build it, only in the master branch.

Related documentation:
http://www.gnu.org/software/hello/manual/automake/Local-Macros.html#Local-Macros
http://www.gnu.org/software/hello/manual/automake/Invoking-aclocal.html#Invoking-aclocal
This commit is contained in:
Badlop 2010-10-15 16:29:47 +02:00
parent 2d08dcf11a
commit 76f7548935
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -23,6 +23,7 @@
/src/XmppAddr.asn1db /src/XmppAddr.asn1db
/src/XmppAddr.erl /src/XmppAddr.erl
/src/XmppAddr.hrl /src/XmppAddr.hrl
/src/aclocal.m4
/src/autom4te.cache /src/autom4te.cache
/src/config.log /src/config.log
/src/config.status /src/config.status

12
src/aclocal.m4 → src/acinclude.m4
View File

@ -1,4 +1,4 @@
AC_DEFUN(AM_WITH_EXPAT, AC_DEFUN([AM_WITH_EXPAT],
[ AC_ARG_WITH(expat, [ AC_ARG_WITH(expat,
[AC_HELP_STRING([--with-expat=PREFIX], [prefix where EXPAT is installed])]) [AC_HELP_STRING([--with-expat=PREFIX], [prefix where EXPAT is installed])])
@ -32,7 +32,7 @@ AC_DEFUN(AM_WITH_EXPAT,
AC_SUBST(EXPAT_LIBS) AC_SUBST(EXPAT_LIBS)
]) ])
AC_DEFUN(AM_WITH_ZLIB, 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])])
@ -68,7 +68,7 @@ if test x"$ejabberd_zlib" != x; then
fi 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 if test x"$pam" != x; then
@ -103,7 +103,7 @@ if test x"$pam" != x; then
fi fi
]) ])
AC_DEFUN(AM_WITH_ERLANG, AC_DEFUN([AM_WITH_ERLANG],
[ AC_ARG_WITH(erlang, [ AC_ARG_WITH(erlang,
[AC_HELP_STRING([--with-erlang=PREFIX], [path to erlc and erl])]) [AC_HELP_STRING([--with-erlang=PREFIX], [path to erlc and erl])])
@ -199,7 +199,7 @@ _EOF
AC_SUBST(ERL) AC_SUBST(ERL)
]) ])
AC_DEFUN(AC_MOD_ENABLE, AC_DEFUN([AC_MOD_ENABLE],
[ [
$1= $1=
make_$1= make_$1=
@ -309,7 +309,7 @@ size_t iconv();
]) ])
dnl <openssl> dnl <openssl>
AC_DEFUN(AM_WITH_OPENSSL, AC_DEFUN([AM_WITH_OPENSSL],
[ AC_ARG_WITH(openssl, [ AC_ARG_WITH(openssl,
[AC_HELP_STRING([--with-openssl=PREFIX], [prefix where OPENSSL is installed])]) [AC_HELP_STRING([--with-openssl=PREFIX], [prefix where OPENSSL is installed])])
unset SSL_LIBS; unset SSL_LIBS;