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

Set version to 1.2.13 for pending release 

git-svn-id: https://hamlib.svn.sourceforge.net/svnroot/hamlib/trunk@3068 7ae35d74-ebe9-4afe-98af-79ac388436b8
Hamlib-1.2.13
Nate Bargmann, N0NB 2011-03-12 14:30:23 +00:00
rodzic e6176ab20f
commit c59234f1c6
1 zmienionych plików z 7 dodań i 7 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

14
configure.ac
Wyświetl plik

@ -8,7 +8,7 @@ AC_PREREQ(2.59)
## Autoconf initialisation. ## ## Autoconf initialisation. ##
## ------------------------ ## ## ------------------------ ##
dnl Please do not use '-' in the version number, 'make rpm' will fail dnl Please do not use '-' in the version number, 'make rpm' will fail
AC_INIT([hamlib],[1.2.13svn],[hamlib-developer@lists.sourceforge.net]) AC_INIT([hamlib],[1.2.13],[hamlib-developer@lists.sourceforge.net])
AC_CONFIG_SRCDIR([include/hamlib/rig.h]) AC_CONFIG_SRCDIR([include/hamlib/rig.h])
AC_CONFIG_MACRO_DIR([macros]) AC_CONFIG_MACRO_DIR([macros])
@ -141,10 +141,10 @@ if test "$hl_checkBoth" = 1; then
LIBS="$LIBS -lsocket -lnsl" LIBS="$LIBS -lsocket -lnsl"
AC_CHECK_FUNC(accept, hl_checkNsl=0, [LIBS=$hl2_oldLibs]) AC_CHECK_FUNC(accept, hl_checkNsl=0, [LIBS=$hl2_oldLibs])
fi fi
AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main, AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, main,
[NET_LIBS="$NET_LIBS -lnsl"], [], [])) [NET_LIBS="$NET_LIBS -lnsl"], [], []))
# Winsock2 # Winsock2
AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(ws2_32, main, AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(ws2_32, main,
[NET_LIBS="$NET_LIBS -lws2_32"], [], [])) [NET_LIBS="$NET_LIBS -lws2_32"], [], []))
LIBS="$LIBS $NET_LIBS" LIBS="$LIBS $NET_LIBS"
HL_GETADDRINFO HL_GETADDRINFO
@ -227,7 +227,7 @@ dnl Check if libgd-dev is installed, so we can enable rigmatrix
AC_ARG_WITH(rigmatrix, AC_ARG_WITH(rigmatrix,
[ --with-rigmatrix Generate rigmatrix tool (requires libgd)], [ --with-rigmatrix Generate rigmatrix tool (requires libgd)],
[AC_CHECK_HEADERS([gd.h], [AC_CHECK_HEADERS([gd.h],
[AC_CHECK_LIB([gd],[gdImageCreate], [enable_rigmatrix=yes], [AC_CHECK_LIB([gd],[gdImageCreate], [enable_rigmatrix=yes],
[enable_rigmatrix=no],[-lz]) [enable_rigmatrix=no],[-lz])
]) ])
], ],
@ -379,7 +379,7 @@ if test "${cf_with_cxx}" = "yes" ; then
AC_MSG_RESULT($cf_with_usrp) AC_MSG_RESULT($cf_with_usrp)
if test "${cf_with_usrp}" = "yes" ; then if test "${cf_with_usrp}" = "yes" ; then
PKG_CHECK_MODULES(USRP, usrp >= 0.8, PKG_CHECK_MODULES(USRP, usrp >= 0.8,
[AC_DEFINE(HAVE_USRP,[1],[Define if usrp is available])]) [AC_DEFINE(HAVE_USRP,[1],[Define if usrp is available])])
fi fi
fi fi
@ -387,7 +387,7 @@ AM_CONDITIONAL(ENABLE_CXX, test x"${cf_with_cxx}" = "xyes")
AM_CONDITIONAL(HAVE_USRP, test x"${cf_with_usrp}" = "xyes") AM_CONDITIONAL(HAVE_USRP, test x"${cf_with_usrp}" = "xyes")
PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1, , PKG_CHECK_MODULES(LIBUSB, libusb >= 0.1, ,
[AC_MSG_WARN([libusb pkg-config not found, USB backends will be disabled])]) [AC_MSG_WARN([libusb pkg-config not found, USB backends will be disabled])])
CFLAGS="${CFLAGS} ${LIBUSB_CFLAGS}" CFLAGS="${CFLAGS} ${LIBUSB_CFLAGS}"
CXXFLAGS="${CXXFLAGS} ${LIBUSB_CFLAGS}" CXXFLAGS="${CXXFLAGS} ${LIBUSB_CFLAGS}"
@ -416,7 +416,7 @@ done
AC_CHECK_PROG(cf_with_rpcgen, rpcgen, [yes], [no]) AC_CHECK_PROG(cf_with_rpcgen, rpcgen, [yes], [no])
AC_MSG_CHECKING(whether to build rpc backends) AC_MSG_CHECKING(whether to build rpc backends)
# RPCRig must be the last one added to BACKEND_LIST # RPCRig must be the last one added to BACKEND_LIST
# because it links against other backends (build order) # because it links against other backends (build order)
if test "${ac_cv_header_rpc_rpc_h}" = "yes" -a "${cf_with_rpcgen}" = "yes"; then if test "${ac_cv_header_rpc_rpc_h}" = "yes" -a "${cf_with_rpcgen}" = "yes"; then
cf_with_rpc=yes cf_with_rpc=yes