Fixed building IAX from a vpath. Improved cross-compile compatibility.
git-svn-id: http://yate.null.ro/svn/yate/trunk@106 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
parent
3db7ff5a7d
commit
fc3d3c0df5
|
@ -7,7 +7,7 @@ DESTDIR :=
|
||||||
# override DEBUG at compile time to enable full debug or remove it all
|
# override DEBUG at compile time to enable full debug or remove it all
|
||||||
DEBUG :=
|
DEBUG :=
|
||||||
|
|
||||||
CC := g++ -Wall
|
CC := @CXX@ -Wall
|
||||||
SED := sed
|
SED := sed
|
||||||
DEFS :=
|
DEFS :=
|
||||||
LIBAUX:= -ldl
|
LIBAUX:= -ldl
|
||||||
|
|
|
@ -311,9 +311,9 @@ AC_ARG_WITH(libIAX2,AC_HELP_STRING([--with-libiax2=DIR],[use IAX 2 from DIR (def
|
||||||
if [[ "x$ac_cv_use_libiax2" = "xincluded" ]]; then
|
if [[ "x$ac_cv_use_libiax2" = "xincluded" ]]; then
|
||||||
AC_MSG_CHECKING([for IAX 2 in contrib])
|
AC_MSG_CHECKING([for IAX 2 in contrib])
|
||||||
inci2="contrib/iax"
|
inci2="contrib/iax"
|
||||||
if [[ -f "$inci2/iax2.h" ]]; then
|
if [[ -f "$srcdir/$inci2/iax2.h" ]]; then
|
||||||
HAVE_IAX2=yes
|
HAVE_IAX2=yes
|
||||||
IAX2_INC="-I../$inci2"
|
IAX2_INC="-I$srcdir/../$inci2"
|
||||||
IAX2_DEP="../$inci2/libiax.a"
|
IAX2_DEP="../$inci2/libiax.a"
|
||||||
ac_cv_use_libiax2="no"
|
ac_cv_use_libiax2="no"
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Makefile
|
# Makefile
|
||||||
# This file holds the make rules for the libiax2 - Yate version
|
# This file holds the make rules for the libiax2 - Yate version
|
||||||
|
|
||||||
CC := gcc -Wall
|
CC := @CC@ -Wall
|
||||||
AR := ar
|
AR := ar
|
||||||
RANLIB:= ranlib
|
RANLIB:= ranlib
|
||||||
SED := sed
|
SED := sed
|
||||||
|
|
|
@ -7,7 +7,7 @@ DESTDIR :=
|
||||||
# override DEBUG at compile time to enable full debug or remove it all
|
# override DEBUG at compile time to enable full debug or remove it all
|
||||||
DEBUG :=
|
DEBUG :=
|
||||||
|
|
||||||
CC := g++ -Wall
|
CC := @CXX@ -Wall
|
||||||
SED := sed
|
SED := sed
|
||||||
DEFS :=
|
DEFS :=
|
||||||
INCLUDES := -I@top_srcdir@
|
INCLUDES := -I@top_srcdir@
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Makefile
|
# Makefile
|
||||||
# This file holds the make rules for the Telephony Engine test cases
|
# This file holds the make rules for the Telephony Engine test cases
|
||||||
|
|
||||||
CC := g++ -Wall
|
CC := @CXX@ -Wall
|
||||||
SED := sed
|
SED := sed
|
||||||
DEFS :=
|
DEFS :=
|
||||||
INCLUDES := -I@top_srcdir@
|
INCLUDES := -I@top_srcdir@
|
||||||
|
|
Loading…
Reference in New Issue