Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-10-31 15:21:38 +01:00
Code Releases Activity

* src/aclocal.m4: Better expat and openssl detection (thanks to

Browse Source 
Anton Vanin)

* src/**/Makefile.in: Updated (thanks to Anton Vanin)
* src/configure.ac: Likewise

SVN Revision: 267
This commit is contained in:
Alexey Shchepin 2004-09-26 20:46:43 +00:00
parent 4e7e67c8b5
commit cbcb2bd3a6
11 changed files with 92 additions and 140 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2004-09-26 Alexey Shchepin <alexey@sevcom.net>
* src/aclocal.m4: Better expat and openssl detection (thanks to
Anton Vanin)
* src/**/Makefile.in: Updated (thanks to Anton Vanin)
* src/configure.ac: Likewise
2004-09-25 Alexey Shchepin <alexey@sevcom.net> 2004-09-25 Alexey Shchepin <alexey@sevcom.net>
* src/jlib.hrl: Added namespace for iq-register stream feature * src/jlib.hrl: Added namespace for iq-register stream feature

17
src/Makefile.in
View File

@ -1,10 +1,16 @@
# $Id$ # $Id$
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@ @EXPAT_CFLAGS@ CFLAGS = @CFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ @ERLANG_LIBS@ @EXPAT_LIBS@ LIBS = @LIBS@
EXPAT_CFLAGS = @EXPAT_CFLAGS@
ERLANG_CFLAGS= @ERLANG_CFLAGS@
EXPAT_LIBS = @EXPAT_LIBS@
ERLANG_LIBS = @ERLANG_LIBS@
prefix = @prefix@ prefix = @prefix@
@ -40,10 +46,9 @@ mostlyclean-recursive maintainer-clean-recursive:
$(ERLSHLIBS): %.so: %.c $(ERLSHLIBS): %.so: %.c
gcc -Wall $(CFLAGS) $(LDFLAGS) $(LIBS) \ gcc -Wall $(CFLAGS) $(LDFLAGS) $(LIBS) \
$(subst ../,,$(subst .so,.c,$@)) \ $(subst ../,,$(subst .so,.c,$@)) \
-lexpat \ $(EXPAT_LIBS) $(EXPAT_CFLAGS) \
-lerl_interface \ $(ERLANG_LIBS) $(ERLANG_CFLAGS) \
-lei \ -o $@ -fpic -shared
-o $@ -fpic -shared \
install: all install: all
install -d $(BEAMDIR) install -d $(BEAMDIR)

51
src/aclocal.m4 vendored
View File

@ -1,15 +1,14 @@
AC_DEFUN(AM_WITH_EXPAT, AC_DEFUN(AM_WITH_EXPAT,
[ AC_ARG_WITH(expat, [ AC_ARG_WITH(expat,
[ --with-expat=PREFIX prefix where EXPAT is installed], [ --with-expat=PREFIX prefix where EXPAT is installed])
, with_expat=no)
EXPAT_CFLAGS= EXPAT_CFLAGS=
EXPAT_LIBS= EXPAT_LIBS=
if test $with_expat != no; then if test x"$with_expat" != x; then
if test $with_expat != yes; then
EXPAT_CFLAGS="-I$with_expat/include" EXPAT_CFLAGS="-I$with_expat/include"
EXPAT_LIBS="-L$with_expat/lib" EXPAT_LIBS="-L$with_expat/lib"
fi fi
AC_CHECK_LIB(expat, XML_ParserCreate, AC_CHECK_LIB(expat, XML_ParserCreate,
[ EXPAT_LIBS="$EXPAT_LIBS -lexpat" [ EXPAT_LIBS="$EXPAT_LIBS -lexpat"
expat_found=yes ], expat_found=yes ],
@ -25,7 +24,6 @@ AC_DEFUN(AM_WITH_EXPAT,
AC_MSG_ERROR([Could not find expat.h]) AC_MSG_ERROR([Could not find expat.h])
fi fi
CFLAGS="$expat_save_CFLAGS" CFLAGS="$expat_save_CFLAGS"
fi
AC_SUBST(EXPAT_CFLAGS) AC_SUBST(EXPAT_CFLAGS)
AC_SUBST(EXPAT_LIBS) AC_SUBST(EXPAT_LIBS)
@ -75,7 +73,7 @@ _EOF
ERLANG_DIR=`cat conftest.out | tail -n 1` ERLANG_DIR=`cat conftest.out | tail -n 1`
ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include" ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include"
ERLANG_LIBS="-L$ERLANG_EI_DIR/lib" ERLANG_LIBS="-L$ERLANG_EI_DIR/lib -lerl_interface -lei"
AC_SUBST(ERLANG_CFLAGS) AC_SUBST(ERLANG_CFLAGS)
AC_SUBST(ERLANG_LIBS) AC_SUBST(ERLANG_LIBS)
@ -197,36 +195,31 @@ dnl <openssl>
AC_DEFUN(AM_WITH_OPENSSL, AC_DEFUN(AM_WITH_OPENSSL,
[ AC_ARG_WITH(openssl, [ AC_ARG_WITH(openssl,
[ --with-openssl=PREFIX prefix where OPENSSL is installed ]) [ --with-openssl=PREFIX prefix where OPENSSL is installed ])
unset SSL_LIBS;
unset SSL_CFLAGS;
have_openssl=no
if test x"$tls" != x; then if test x"$tls" != x; then
if test "x$with_openssl" == x; then for ssl_prefix in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
ssl_prefix=/usr printf "looking for openssl in $ssl_prefix...\n"
else
ssl_prefix=$with_openssl
fi
SSL_CFLAGS="-I$ssl_prefix/include/openssl" SSL_CFLAGS="-I$ssl_prefix/include/openssl"
SSL_LIBS="-L$ssl_prefix/lib" SSL_LIBS="-L$ssl_prefix/lib -lcrypto"
AC_CHECK_LIB(ssl, SSL_new, [ have_openssl=yes ], [ have_openssl=no ], "-lcrypto") AC_CHECK_LIB(ssl, SSL_new, [ have_openssl=yes ], [ have_openssl=no ], [ $SSL_LIBS $SSL_CFLAGS ])
if test x"$have_openssl" = xyes; then if test x"$have_openssl" = xyes; then
AC_CHECK_HEADERS(openssl/ssl.h, have_openssl_h=yes) AC_CHECK_HEADERS($ssl_prefix/include/openssl/ssl.h, have_openssl_h=yes)
if test x"$have_openssl_h" = xyes; then if test x"$have_openssl_h" = xyes; then
with_openssl=yes have_openssl=yes
SSL_LIBS="$SSL_LIBS -lssl -lcrypto" printf "openssl found in $ssl_prefix\n";
else SSL_LIBS="-L$ssl_prefix/lib -lssl -lcrypto"
unset SSL_LIBS SSL_CFLAGS="-I$ssl_prefix/include/openssl -DHAVE_SSL"
unset SSL_CFLAGS break
with_openssl=no fi
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([openssl library cannot be found. Install openssl or disable `tls' module (--disable-tls).])
fi
fi
echo -n openssl support ..... : $with_openssl
if test x"$with_openssl" != xno; then
echo , libs: $SSL_LIBS, includes: $SSL_CFLAGS
else
echo ""
fi
fi fi
AC_SUBST(SSL_LIBS) AC_SUBST(SSL_LIBS)
AC_SUBST(SSL_CFLAGS) AC_SUBST(SSL_CFLAGS)
fi
]) ])
dnl <openssl/> dnl <openssl/>

50
src/configure vendored
View File

@ -2226,7 +2226,7 @@ echo "$as_me: error: erlang program was not properly executed, (conftest.out was
ERLANG_DIR=`cat conftest.out | tail -n 1` ERLANG_DIR=`cat conftest.out | tail -n 1`
ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include" ERLANG_CFLAGS="-I$ERLANG_EI_DIR/include -I$ERLANG_DIR/usr/include"
ERLANG_LIBS="-L$ERLANG_EI_DIR/lib" ERLANG_LIBS="-L$ERLANG_EI_DIR/lib -lerl_interface -lei"
@ -2883,17 +2883,15 @@ done
if test "${with_expat+set}" = set; then if test "${with_expat+set}" = set; then
withval="$with_expat" withval="$with_expat"
else
with_expat=no
fi; fi;
EXPAT_CFLAGS= EXPAT_CFLAGS=
EXPAT_LIBS= EXPAT_LIBS=
if test $with_expat != no; then if test x"$with_expat" != x; then
if test $with_expat != yes; then
EXPAT_CFLAGS="-I$with_expat/include" EXPAT_CFLAGS="-I$with_expat/include"
EXPAT_LIBS="-L$with_expat/lib" EXPAT_LIBS="-L$with_expat/lib"
fi fi
echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5 echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5
echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6 echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6
if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then
@ -3085,7 +3083,6 @@ echo "$as_me: error: Could not find expat.h" >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
CFLAGS="$expat_save_CFLAGS" CFLAGS="$expat_save_CFLAGS"
fi
@ -3749,22 +3746,21 @@ if test "${with_openssl+set}" = set; then
withval="$with_openssl" withval="$with_openssl"
fi; fi;
unset SSL_LIBS;
unset SSL_CFLAGS;
have_openssl=no
if test x"$tls" != x; then if test x"$tls" != x; then
if test "x$with_openssl" == x; then for ssl_prefix in $withval /usr/local/ssl /usr/lib/ssl /usr/ssl /usr/pkg /usr/local /usr; do
ssl_prefix=/usr printf "looking for openssl in $ssl_prefix...\n"
else
ssl_prefix=$with_openssl
fi
SSL_CFLAGS="-I$ssl_prefix/include/openssl" SSL_CFLAGS="-I$ssl_prefix/include/openssl"
SSL_LIBS="-L$ssl_prefix/lib" SSL_LIBS="-L$ssl_prefix/lib -lcrypto"
echo "$as_me:$LINENO: checking for SSL_new in -lssl" >&5 echo "$as_me:$LINENO: checking for SSL_new in -lssl" >&5
echo $ECHO_N "checking for SSL_new in -lssl... $ECHO_C" >&6 echo $ECHO_N "checking for SSL_new in -lssl... $ECHO_C" >&6
if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then if test "${ac_cv_lib_ssl_SSL_new+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6 echo $ECHO_N "(cached) $ECHO_C" >&6
else else
ac_check_lib_save_LIBS=$LIBS ac_check_lib_save_LIBS=$LIBS
LIBS="-lssl "-lcrypto" $LIBS" LIBS="-lssl $SSL_LIBS $SSL_CFLAGS $LIBS"
cat >conftest.$ac_ext <<_ACEOF cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure" #line $LINENO "configure"
#include "confdefs.h" #include "confdefs.h"
@ -3821,7 +3817,7 @@ fi
if test x"$have_openssl" = xyes; then if test x"$have_openssl" = xyes; then
for ac_header in openssl/ssl.h for ac_header in $ssl_prefix/include/openssl/ssl.h
do do
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
if eval "test \"\${$as_ac_Header+set}\" = set"; then if eval "test \"\${$as_ac_Header+set}\" = set"; then
@ -3935,26 +3931,22 @@ fi
done done
if test x"$have_openssl_h" = xyes; then if test x"$have_openssl_h" = xyes; then
with_openssl=yes have_openssl=yes
SSL_LIBS="$SSL_LIBS -lssl -lcrypto" printf "openssl found in $ssl_prefix\n";
else SSL_LIBS="-L$ssl_prefix/lib -lssl -lcrypto"
unset SSL_LIBS SSL_CFLAGS="-I$ssl_prefix/include/openssl -DHAVE_SSL"
unset SSL_CFLAGS break
with_openssl=no fi
fi
done
if test x${have_openssl} != xyes; then
{ { echo "$as_me:$LINENO: error: openssl library cannot be found. Install openssl or disable \`tls' module (--disable-tls)." >&5 { { echo "$as_me:$LINENO: error: openssl library cannot be found. Install openssl or disable \`tls' module (--disable-tls)." >&5
echo "$as_me: error: openssl library cannot be found. Install openssl or disable \`tls' module (--disable-tls)." >&2;} echo "$as_me: error: openssl library cannot be found. Install openssl or disable \`tls' module (--disable-tls)." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi
fi
echo -n openssl support ..... : $with_openssl
if test x"$with_openssl" != xno; then
echo , libs: $SSL_LIBS, includes: $SSL_CFLAGS
else
echo ""
fi
fi fi
fi
cat >confcache <<\_ACEOF cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure # This file is a shell script that caches the results of configure

9
src/eldap/Makefile.in
View File

@ -1,18 +1,13 @@
# $Id$ # $Id$
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@ @ERLANG_LIBS@
INCLUDES = @ERLANG_CFLAGS@
LIBDIRS = @ERLANG_LIBS@
SUBDIRS = SUBDIRS =
OUTDIR = .. OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
OBJS = \ OBJS = \

20
src/mod_irc/Makefile.in
View File

@ -1,21 +1,15 @@
# $Id$ # $Id$
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@ @ERLANG_LIBS@ @LIBICONV@
INCLUDES = @ERLANG_CFLAGS@
LIBDIRS = @ERLANG_LIBS@
SUBDIRS = SUBDIRS =
ERLSHLIBS = ../iconv_erl.so ERLSHLIBS = ../iconv_erl.so
OUTDIR = .. OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
OBJS = \ OBJS = \
@ -28,17 +22,13 @@ all: $(OBJS) $(ERLSHLIBS)
$(OUTDIR)/%.beam: %.erl $(OUTDIR)/%.beam: %.erl
erlc -W $(EFLAGS) -o $(OUTDIR) $< erlc -W $(EFLAGS) -o $(OUTDIR) $<
#all: $(ERLSHLIBS) #all: $(ERLSHLIBS)
# erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt # erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
$(ERLSHLIBS): ../%.so: %.c $(ERLSHLIBS): ../%.so: %.c
$(CC) -Wall $(INCLUDES) $(CFLAGS) $(LDFLAGS) $(LIBDIRS) \ $(CC) -Wall $(INCLUDES) $(CFLAGS) $(LDFLAGS) \
$(subst ../,,$(subst .so,.c,$@)) \ $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
-lerl_interface @LIBICONV@ \ -o $@ -fpic -shared
-lei \
-o $@ -fpic -shared \
clean: clean:
rm -f $(OBJS) $(ERLSHLIBS) rm -f $(OBJS) $(ERLSHLIBS)

10
src/mod_muc/Makefile.in
View File

@ -1,18 +1,13 @@
# $Id$ # $Id$
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@ @ERLANG_LIBS@
INCLUDES = @ERLANG_CFLAGS@
LIBDIRS = @ERLANG_LIBS@
SUBDIRS = SUBDIRS =
OUTDIR = .. OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
OBJS = \ OBJS = \
@ -24,7 +19,6 @@ all: $(OBJS)
$(OUTDIR)/%.beam: %.erl $(OUTDIR)/%.beam: %.erl
erlc -W $(EFLAGS) -o $(OUTDIR) $< erlc -W $(EFLAGS) -o $(OUTDIR) $<
clean: clean:
rm -f $(OBJS) rm -f $(OBJS)

10
src/mod_pubsub/Makefile.in
View File

@ -1,18 +1,13 @@
# $Id$ # $Id$
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@ @ERLANG_LIBS@
INCLUDES = @ERLANG_CFLAGS@
LIBDIRS = @ERLANG_LIBS@
SUBDIRS = SUBDIRS =
OUTDIR = .. OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
OBJS = \ OBJS = \
@ -23,7 +18,6 @@ all: $(OBJS)
$(OUTDIR)/%.beam: %.erl $(OUTDIR)/%.beam: %.erl
erlc -W $(EFLAGS) -o $(OUTDIR) $< erlc -W $(EFLAGS) -o $(OUTDIR) $<
clean: clean:
rm -f $(OBJS) rm -f $(OBJS)

22
src/stringprep/Makefile.in
View File

@ -1,23 +1,15 @@
# $Id$ # $Id$
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@ @ERLANG_LIBS@
INCLUDES = @ERLANG_CFLAGS@
LIBDIRS = @ERLANG_LIBS@
SUBDIRS = SUBDIRS =
ERLSHLIBS = ../stringprep_drv.so ERLSHLIBS = ../stringprep_drv.so
OUTDIR = .. OUTDIR = ..
EFLAGS = -I .. -pz .. EFLAGS = -I .. -pz ..
OBJS = \ OBJS = \
@ -28,17 +20,13 @@ all: $(OBJS) $(ERLSHLIBS)
$(OUTDIR)/%.beam: %.erl $(OUTDIR)/%.beam: %.erl
erlc -W $(EFLAGS) -o $(OUTDIR) $< erlc -W $(EFLAGS) -o $(OUTDIR) $<
#all: $(ERLSHLIBS) #all: $(ERLSHLIBS)
# erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt # erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
$(ERLSHLIBS): ../%.so: %.c uni_data.c uni_norm.c $(ERLSHLIBS): ../%.so: %.c uni_data.c uni_norm.c
gcc -Wall -O2 $(INCLUDES) $(LIBDIRS) \ gcc -Wall -O2 $(CFLAGS) $(LDFLAGS) $(INCLUDES) \
$(subst ../,,$(subst .so,.c,$@)) \ $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
-lerl_interface \ -o $@ -fpic -shared
-lei \
-o $@ -fpic -shared \
clean: clean:
rm -f $(OBJS) $(ERLSHLIBS) rm -f $(OBJS) $(ERLSHLIBS)

9
src/tls/Makefile.in
View File

@ -24,11 +24,9 @@ $(OUTDIR)/%.beam: %.erl
# erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt # erl -s make all report "{outdir, \"..\"}" -noinput -s erlang halt
$(ERLSHLIBS): ../%.so: %.c $(ERLSHLIBS): ../%.so: %.c
$(CC) -Wall $(CFLAGS) $(LDFLAGS) $(LIBS) \ $(CC) -Wall $(CFLAGS) $(LDFLAGS) \
$(subst ../,,$(subst .so,.c,$@)) \ $(subst ../,,$(subst .so,.c,$@)) $(LIBS) \
-lerl_interface @LIBICONV@ \ -o $@ -fpic -shared
-lei \
-o $@ -fpic -shared \
clean: clean:
rm -f $(OBJS) $(ERLSHLIBS) rm -f $(OBJS) $(ERLSHLIBS)
@ -38,4 +36,3 @@ distclean: clean
TAGS: TAGS:
etags *.erl etags *.erl

8
src/web/Makefile.in
View File

@ -1,14 +1,10 @@
# $Id$ # $Id$
CC = @CC@ CC = @CC@
CFLAGS = @CFLAGS@ CFLAGS = @CFLAGS@ @ERLANG_CFLAGS@
CPPFLAGS = @CPPFLAGS@ CPPFLAGS = @CPPFLAGS@
LDFLAGS = @LDFLAGS@ LDFLAGS = @LDFLAGS@
LIBS = @LIBS@ LIBS = @LIBS@ @ERLANG_LIBS@
INCLUDES = @ERLANG_CFLAGS@
LIBDIRS = @ERLANG_LIBS@
SUBDIRS = SUBDIRS =