提交 b3686949 authored 作者: David Yat Sin's avatar David Yat Sin

freetdm: Fix for ftmod_wanpipe failing to compile because some structures are not

	compatible with std=c99
上级 58759052
...@@ -49,6 +49,7 @@ if HAVE_SNG_ISDN ...@@ -49,6 +49,7 @@ if HAVE_SNG_ISDN
INCS += -I/usr/include/sng_isdn INCS += -I/usr/include/sng_isdn
endif endif
FTDM_COMPAT_CFLAGS = $(INCS) -DFTDM_CONFIG_DIR=\"@confdir@\" -DFTDM_MOD_DIR=\"$(moddir)\" @COMP_VENDOR_COMPAT_CFLAGS@ @DEFS@
FTDM_CFLAGS = $(INCS) -DFTDM_CONFIG_DIR=\"@confdir@\" -DFTDM_MOD_DIR=\"$(moddir)\" @COMP_VENDOR_CFLAGS@ @DEFS@ FTDM_CFLAGS = $(INCS) -DFTDM_CONFIG_DIR=\"@confdir@\" -DFTDM_MOD_DIR=\"$(moddir)\" @COMP_VENDOR_CFLAGS@ @DEFS@
COMPILE = $(CC) $(FTDM_CFLAGS) COMPILE = $(CC) $(FTDM_CFLAGS)
LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE) LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(COMPILE)
...@@ -186,7 +187,9 @@ ftmod_analog_em_la_LIBADD = libfreetdm.la ...@@ -186,7 +187,9 @@ ftmod_analog_em_la_LIBADD = libfreetdm.la
if HAVE_LIBSANGOMA if HAVE_LIBSANGOMA
mod_LTLIBRARIES += ftmod_wanpipe.la mod_LTLIBRARIES += ftmod_wanpipe.la
ftmod_wanpipe_la_SOURCES = $(SRC)/ftmod/ftmod_wanpipe/ftmod_wanpipe.c ftmod_wanpipe_la_SOURCES = $(SRC)/ftmod/ftmod_wanpipe/ftmod_wanpipe.c
ftmod_wanpipe_la_CFLAGS = $(AM_CFLAGS) $(FTDM_CFLAGS) -D__LINUX__ -I/usr/include/wanpipe #some structures within Wanpipe drivers are not c99 compatible, so we need to compile ftmod_wanpipe
#without c99 flags
ftmod_wanpipe_la_CFLAGS = $(AM_CFLAGS) $(FTDM_COMPAT_CFLAGS) -D__LINUX__ -I/usr/include/wanpipe
ftmod_wanpipe_la_LDFLAGS = -shared -module -avoid-version -lsangoma ftmod_wanpipe_la_LDFLAGS = -shared -module -avoid-version -lsangoma
ftmod_wanpipe_la_LIBADD = libfreetdm.la ftmod_wanpipe_la_LIBADD = libfreetdm.la
endif endif
......
...@@ -77,11 +77,14 @@ sun) ...@@ -77,11 +77,14 @@ sun)
fi fi
;; ;;
*) *)
COMP_VENDOR_CFLAGS="-std=c99 -Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes" COMP_VENDOR_COMPAT_CFLAGS="-Wall -Wunused-variable -Wwrite-strings -Wstrict-prototypes -Wmissing-prototypes"
COMP_VENDOR_CFLAGS="-std=c99 $COMP_VENDOR_COMPAT_CFLAGS"
;; ;;
esac esac
AC_SUBST([COMP_VENDOR_COMPAT_CFLAGS])
AC_SUBST([COMP_VENDOR_CFLAGS]) AC_SUBST([COMP_VENDOR_CFLAGS])
# Enable debugging # Enable debugging
AC_ARG_ENABLE([debug], AC_ARG_ENABLE([debug],
[AC_HELP_STRING([--enable-debug], [build with debug information])], [AC_HELP_STRING([--enable-debug], [build with debug information])],
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论