mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

check CXX presence, compile .cc files conditionaly (usrp_impl.cc) 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@2746 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.10
Stéphane Fillod, F8CFE 2009-11-01 14:45:59 +00:00
rodzic a1dc81cd61
commit e6321b99ad
2 zmienionych plików z 8 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
configure.ac
Wyświetl plik

@ -248,11 +248,9 @@ BINDING_LIB_TARGETS=""
dnl Check if cxx-binding not wanted, default is to build it dnl Check if cxx-binding not wanted, default is to build it
if test x"${CXX}" = x; then # TODO: check whether CXX is functional
cf_with_cxx=no AC_CHECK_PROG(cf_with_cxx, "${CXX}", [yes], [no])
else
cf_with_cxx=yes
fi
AC_MSG_CHECKING(whether to build C++ binding and demo) AC_MSG_CHECKING(whether to build C++ binding and demo)
AC_ARG_WITH(cxx-binding, AC_ARG_WITH(cxx-binding,
[ --without-cxx-binding do not build C++ binding and demo], [ --without-cxx-binding do not build C++ binding and demo],
@ -379,6 +377,7 @@ if test "${cf_with_cxx}" = "yes" ; then
[AC_DEFINE(HAVE_USRP,[1],[Define if usrp is available])]) [AC_DEFINE(HAVE_USRP,[1],[Define if usrp is available])])
fi fi
fi fi
AM_CONDITIONAL(ENABLE_CXX, test x"${cf_with_cxx}" = "xyes")
PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1, , PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1, ,

5
kit/Makefile.am
Wyświetl plik

@ -2,8 +2,11 @@ AM_CFLAGS = @LIBUSB_CFLAGS@
AM_CXXFLAGS = @USRP_CFLAGS@ AM_CXXFLAGS = @USRP_CFLAGS@
# FIXME: compile usrp only if CXX available # FIXME: compile usrp only if CXX available
KITSRCLIST = elektor304.c drt1.c dwt.c usrp.c usrp_impl.cc elektor507.c \ KITSRCLIST = elektor304.c drt1.c dwt.c usrp.c elektor507.c \
dds60.c miniVNA.c si570avrusb.c dds60.c miniVNA.c si570avrusb.c
if ENABLE_CXX
KITSRCLIST += usrp_impl.cc
endif
KITROTSRCLIST = pcrotor.c KITROTSRCLIST = pcrotor.c