configure runs through fine now, and allmost everything builds and runs again
git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@4552 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris
parent
860622610c
commit
af9898658c
|
|
@ -1118,7 +1118,7 @@ modules: libfreeswitch.la
|
|||
@./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)"
|
||||
@./build/addenv.sh build/freeswitch.env DYNAMIC_LIB_EXTEN "$(DYNAMIC_LIB_EXTEN)"
|
||||
@./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)"
|
||||
@./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch"
|
||||
@./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) $(MOD_LINK)"
|
||||
@./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)"
|
||||
@./build/addenv.sh build/freeswitch.env CC "$(CC)"
|
||||
@./build/addenv.sh build/freeswitch.env CFGARGS "$(AM_CFGARGS)"
|
||||
|
|
@ -1171,7 +1171,7 @@ install_mod: modules
|
|||
@./build/addenv.sh build/freeswitch.env BASE "$(switch_srcdir)"
|
||||
@./build/addenv.sh build/freeswitch.env OSARCH "$(OSARCH)"
|
||||
@./build/addenv.sh build/freeswitch.env SOLINK "$(SOLINK)"
|
||||
@./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) -lfreeswitch"
|
||||
@./build/addenv.sh build/freeswitch.env LDFLAGS "$(AM_LDFLAGS) $(MOD_LINK)"
|
||||
@./build/addenv.sh build/freeswitch.env CFLAGS "$(AM_CFLAGS)"
|
||||
@./build/addenv.sh build/freeswitch.env CC "$(CC)"
|
||||
@./build/addenv.sh build/freeswitch.env LINK "$(LINK)"
|
||||
|
|
|
|||
|
|
@ -473,6 +473,23 @@ ac_subdirs_all="$ac_subdirs_all libs/libteletone"
|
|||
ac_subdirs_all="$ac_subdirs_all libs/pcre"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/apr"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/apr-util"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/codec/g7xx"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/codec/g726"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/codec/gsm"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/codec/ilbc"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/codec/lpc10"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/curl"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/iax"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/iksemel"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/js/nsprpub"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/js"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/libdingaling"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/libetpan"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/libsndfile"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/sofia-sip"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/speex"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/xmlrpc-c"
|
||||
ac_subdirs_all="$ac_subdirs_all libs/portaudio"
|
||||
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar switch_srcdir switch_builddir CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PRTDIAG WANT_DEBUG_TRUE WANT_DEBUG_FALSE SWITCH_AM_CFLAGS SWITCH_AM_LDFLAGS SOLINK DYNAMIC_LIB_EXTEN LIBOBJS voidp_size short_value int_value long_value int64_value size_t_value ssize_t_value int64_t_fmt uint64_t_fmt ssize_t_fmt size_t_fmt CRASHPROT_TRUE CRASHPROT_FALSE ISLINUX_TRUE ISLINUX_FALSE ISMAC_TRUE ISMAC_FALSE IS64BITLINUX_TRUE IS64BITLINUX_FALSE subdirs LTLIBOBJS'
|
||||
ac_subst_files=''
|
||||
|
||||
|
|
@ -3859,7 +3876,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 3862 "configure"' > conftest.$ac_ext
|
||||
echo '#line 3879 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -5458,7 +5475,7 @@ fi
|
|||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:5461:" \
|
||||
echo "$as_me:5478:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
|
|
@ -6521,11 +6538,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:6524: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6541: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:6528: \$? = $ac_status" >&5
|
||||
echo "$as_me:6545: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -6789,11 +6806,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:6792: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6809: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:6796: \$? = $ac_status" >&5
|
||||
echo "$as_me:6813: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -6893,11 +6910,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:6896: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:6913: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:6900: \$? = $ac_status" >&5
|
||||
echo "$as_me:6917: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -9238,7 +9255,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9241 "configure"
|
||||
#line 9258 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -9338,7 +9355,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 9341 "configure"
|
||||
#line 9358 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -11678,11 +11695,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:11681: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11698: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:11685: \$? = $ac_status" >&5
|
||||
echo "$as_me:11702: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -11782,11 +11799,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:11785: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:11802: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:11789: \$? = $ac_status" >&5
|
||||
echo "$as_me:11806: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -13352,11 +13369,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13355: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13372: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:13359: \$? = $ac_status" >&5
|
||||
echo "$as_me:13376: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -13456,11 +13473,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:13459: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:13476: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:13463: \$? = $ac_status" >&5
|
||||
echo "$as_me:13480: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -15659,11 +15676,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15662: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15679: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15666: \$? = $ac_status" >&5
|
||||
echo "$as_me:15683: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -15927,11 +15944,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:15930: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:15947: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:15934: \$? = $ac_status" >&5
|
||||
echo "$as_me:15951: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -16031,11 +16048,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16034: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16051: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:16038: \$? = $ac_status" >&5
|
||||
echo "$as_me:16055: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -25036,6 +25053,76 @@ subdirs="$subdirs libs/apr"
|
|||
|
||||
subdirs="$subdirs libs/apr-util"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/codec/g7xx"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/codec/g726"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/codec/gsm"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/codec/ilbc"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/codec/lpc10"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/curl"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/iax"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/iksemel"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/js/nsprpub"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/js"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/libdingaling"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/libetpan"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/libsndfile"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/sofia-sip"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/speex"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/xmlrpc-c"
|
||||
|
||||
|
||||
|
||||
subdirs="$subdirs libs/portaudio"
|
||||
|
||||
|
||||
|
||||
ac_config_files="$ac_config_files src/include/switch_version.h"
|
||||
cat >confcache <<\_ACEOF
|
||||
# This file is a shell script that caches the results of configure
|
||||
|
|
|
|||
|
|
@ -9136,9 +9136,7 @@ echo "${ECHO_T}$ac_header_preproc" >&6
|
|||
|
||||
# So? What about this header?
|
||||
case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
|
||||
yes:no:
|
||||
fi
|
||||
|
||||
yes:no: )
|
||||
{ echo "$as_me:$LINENO: WARNING: dlfcn.h: accepted by the compiler, rejected by the preprocessor!" >&5
|
||||
echo "$as_me: WARNING: dlfcn.h: accepted by the compiler, rejected by the preprocessor!" >&2;}
|
||||
{ echo "$as_me:$LINENO: WARNING: dlfcn.h: proceeding with the compiler's result" >&5
|
||||
|
|
@ -9183,7 +9181,9 @@ if test $ac_cv_header_dlfcn_h = yes; then
|
|||
OS_LIBS="-ldl $OS_LIBS"
|
||||
fi
|
||||
|
||||
)
|
||||
|
||||
fi
|
||||
|
||||
;;
|
||||
esac
|
||||
|
||||
|
|
@ -9397,30 +9397,6 @@ darwin*)
|
|||
;;
|
||||
*)
|
||||
|
||||
echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
|
||||
echo $ECHO_N "checking for pthread_create in -lpthreads... $ECHO_C" >&6
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { return v; }
|
||||
int main() {
|
||||
pthread_t t;
|
||||
if (!pthread_create(&t, 0, &foo, 0)) {
|
||||
pthread_join(t, 0);
|
||||
}
|
||||
return 0;
|
||||
}" > dummy.c ;
|
||||
echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthreads $LDFLAGS $LIBS" 1>&5;
|
||||
${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthreads $LDFLAGS $LIBS 2>&5;
|
||||
_res=$? ;
|
||||
rm -f dummy.c dummy${ac_exeext} ;
|
||||
if test "$_res" = "0"; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
_HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads"
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
|
||||
echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
|
||||
echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
|
||||
echo "
|
||||
|
|
@ -9445,6 +9421,30 @@ echo "${ECHO_T}yes" >&6
|
|||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
|
||||
echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
|
||||
echo $ECHO_N "checking for pthread_create in -lpthreads... $ECHO_C" >&6
|
||||
echo "
|
||||
#include <pthread.h>
|
||||
void *foo(void *v) { return v; }
|
||||
int main() {
|
||||
pthread_t t;
|
||||
if (!pthread_create(&t, 0, &foo, 0)) {
|
||||
pthread_join(t, 0);
|
||||
}
|
||||
return 0;
|
||||
}" > dummy.c ;
|
||||
echo "${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthreads $LDFLAGS $LIBS" 1>&5;
|
||||
${CC-cc} -o dummy${ac_exeext} dummy.c $CFLAGS $CPPFLAGS -lpthreads $LDFLAGS $LIBS 2>&5;
|
||||
_res=$? ;
|
||||
rm -f dummy.c dummy${ac_exeext} ;
|
||||
if test "$_res" = "0"; then
|
||||
echo "$as_me:$LINENO: result: yes" >&5
|
||||
echo "${ECHO_T}yes" >&6
|
||||
_HAVE_PTHREADS=1 _PTHREAD_LDFLAGS="-lpthreads"
|
||||
else
|
||||
echo "$as_me:$LINENO: result: no" >&5
|
||||
echo "${ECHO_T}no" >&6
|
||||
|
||||
echo "$as_me:$LINENO: checking for pthread_create in -lc_r" >&5
|
||||
echo $ECHO_N "checking for pthread_create in -lc_r... $ECHO_C" >&6
|
||||
echo "
|
||||
|
|
@ -9679,11 +9679,6 @@ _ACEOF
|
|||
#define _THREAD_SAFE 1
|
||||
_ACEOF
|
||||
|
||||
if test "$ac_cv_have_dash_pthread" = "yes"; then
|
||||
_PTHREAD_LDFLAGS="-pthread"
|
||||
else
|
||||
_PTHREAD_LDFLAGS="-lc_r"
|
||||
fi
|
||||
;;
|
||||
*-netbsd*)
|
||||
if test "$ac_cv_have_dash_pthread" = "yes"; then
|
||||
|
|
|
|||
|
|
@ -223,13 +223,14 @@ NAME = dingaling
|
|||
PREFIX = $(prefix)
|
||||
AM_CFLAGS = $(new_AM_CFLAGS) -I./src -I$(prefix)/include \
|
||||
-I$(PREFIX)/include $(shell $(APR_CONFIG) --cflags --cppflags \
|
||||
--includes) $(shell $(APU_CONFIG) --includes)
|
||||
--includes) $(shell $(APU_CONFIG) --includes) \
|
||||
-I../iksemel/include
|
||||
AM_CPPFLAGS = $(AM_CFLAGS)
|
||||
AM_LDFLAGS = $(new_AM_LDFLAGS) -liksemel -L$(PREFIX)/lib $(shell \
|
||||
$(APR_CONFIG) --link-ld --libs ) $(shell $(APU_CONFIG) \
|
||||
--link-ld --libs )
|
||||
APR_CONFIG = $(prefix)/bin/apr-1-config
|
||||
APU_CONFIG = $(prefix)/bin/apu-1-config
|
||||
AM_LDFLAGS = $(new_AM_LDFLAGS) -L$(PREFIX)/lib $(shell $(APR_CONFIG) \
|
||||
--link-ld --libs ) $(shell $(APU_CONFIG) --link-ld --libs ) \
|
||||
../iksemel/src/libiksemel.la
|
||||
APR_CONFIG = $(shell which ../apr/apr-1-config || which $(prefix)/bin/apr-1-config )
|
||||
APU_CONFIG = $(shell which ../apr-util/apu-1-config || which $(prefix)/bin/apu-1-config)
|
||||
lib_LTLIBRARIES = libdingaling.la
|
||||
libdingaling_la_SOURCES = src/libdingaling.c src/sha1.c
|
||||
libdingaling_la_CFLAGS = $(AM_CFLAGS)
|
||||
|
|
|
|||
|
|
@ -5042,8 +5042,7 @@ else
|
|||
fi
|
||||
|
||||
|
||||
if test x"$enable_cplusplus" != xno; then
|
||||
ac_ext=cc
|
||||
ac_ext=cc
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
|
||||
|
|
@ -5507,7 +5506,6 @@ else
|
|||
fi
|
||||
|
||||
|
||||
fi
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
# so one script is as good as another. But avoid the broken or
|
||||
# incompatible versions:
|
||||
|
|
@ -7844,7 +7842,7 @@ ia64-*-hpux*)
|
|||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 7847 "configure"' > conftest.$ac_ext
|
||||
echo '#line 7845 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
|
|
@ -8506,7 +8504,7 @@ fi
|
|||
|
||||
|
||||
# Provide some information about the compiler.
|
||||
echo "$as_me:8509:" \
|
||||
echo "$as_me:8507:" \
|
||||
"checking for Fortran 77 compiler version" >&5
|
||||
ac_compiler=`set X $ac_compile; echo $2`
|
||||
{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
|
||||
|
|
@ -9569,11 +9567,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:9572: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:9570: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:9576: \$? = $ac_status" >&5
|
||||
echo "$as_me:9574: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -9837,11 +9835,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:9840: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:9838: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:9844: \$? = $ac_status" >&5
|
||||
echo "$as_me:9842: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -9941,11 +9939,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:9944: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:9942: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:9948: \$? = $ac_status" >&5
|
||||
echo "$as_me:9946: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -12286,7 +12284,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12289 "configure"
|
||||
#line 12287 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -12386,7 +12384,7 @@ else
|
|||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 12389 "configure"
|
||||
#line 12387 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
|
|
@ -14726,11 +14724,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14729: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14727: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:14733: \$? = $ac_status" >&5
|
||||
echo "$as_me:14731: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -14830,11 +14828,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14833: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14831: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:14837: \$? = $ac_status" >&5
|
||||
echo "$as_me:14835: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -16400,11 +16398,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16403: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16401: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:16407: \$? = $ac_status" >&5
|
||||
echo "$as_me:16405: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -16504,11 +16502,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16507: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16505: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:16511: \$? = $ac_status" >&5
|
||||
echo "$as_me:16509: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
@ -18707,11 +18705,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:18710: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18708: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:18714: \$? = $ac_status" >&5
|
||||
echo "$as_me:18712: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -18975,11 +18973,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:18978: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:18976: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:18982: \$? = $ac_status" >&5
|
||||
echo "$as_me:18980: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
|
|
@ -19079,11 +19077,11 @@ else
|
|||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:19082: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:19080: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:19086: \$? = $ac_status" >&5
|
||||
echo "$as_me:19084: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
|
|
|
|||
|
|
@ -1,16 +0,0 @@
|
|||
LDFLAGS += -L/usr/local/lib
|
||||
|
||||
all: depends $(MODNAME).$(DYNAMIC_LIB_EXTEN)
|
||||
|
||||
depends:
|
||||
|
||||
$(MODNAME).$(DYNAMIC_LIB_EXTEN): $(MODNAME).c
|
||||
$(CC) $(CFLAGS) -fPIC -c $(MODNAME).c -o $(MODNAME).o
|
||||
$(CC) $(SOLINK) -o $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(MODNAME).o $(LDFLAGS)
|
||||
|
||||
|
||||
clean:
|
||||
rm -fr *.$(DYNAMIC_LIB_EXTEN) *.o *~
|
||||
|
||||
install:
|
||||
cp -f $(MODNAME).$(DYNAMIC_LIB_EXTEN) $(PREFIX)/mod
|
||||
Loading…
Reference in New Issue