Menu
▾
▴
hamlib-cvs-digest
|
From: Nate B. <n0...@us...> - 2013-09-19 04:02:36
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".
The branch, master has been updated
via 9210621c756f1334e46ed508d1063d1f04f9e95b (commit)
from ef28e435d8cfbe1a14c9b4f8cfd388639153958f (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 9210621c756f1334e46ed508d1063d1f04f9e95b
Author: Nate Bargmann <n0...@n0...>
Date: Wed Sep 18 22:58:00 2013 -0500
Remove dependency on libltdl
No longer depend on libltdl from the libtool package. The
winradio/linradio/wg313api backend still depends on libdl, but since it
is only compiled on POSIX, it will use the POSIX supplied libdl.
Update documentation to remove references to libltdl.
diff --git a/.gitignore b/.gitignore
index a0c899b..51c9944 100644
--- a/.gitignore
+++ b/.gitignore
@@ -37,12 +37,9 @@ hamlib-*.tar.gz
include/config.h
include/config.h.in
include/stamp-h1
-libltdl/
-macros/argz.m4
macros/libtool.m4
macros/ltoptions.m4
macros/ltsugar.m4
-macros/ltdl.m4
macros/ltversion.m4
macros/lt~obsolete.m4
macros/pkg.m4
diff --git a/INSTALL b/INSTALL
index da5efa5..131d0af 100644
--- a/INSTALL
+++ b/INSTALL
@@ -231,11 +231,11 @@ MS Windows
==========
- Debian system with mingw32msvc cross-compiler
- ./configure --with-included-ltdl --host=i586-mingw32msvc
+ ./configure --host=i586-mingw32msvc
- Mingw compiler under Cygwin
CC="gcc -mno-cygwin" CXX="g++ -mno-cygwin" \
- ./configure --with-included-ltdl --host=i686-pc-mingw32
+ ./configure --host=i686-pc-mingw32
- Cygwin
Native Cygwin requires no special options besides regular ones.
diff --git a/Makefile.am b/Makefile.am
index 96b5ec7..8ca0bc8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,19 +9,14 @@ pkgconfig_DATA = hamlib.pc
EXTRA_DIST = PLAN TODO LICENSE hamlib.m4 hamlib.pc.in README.developer \
README.betatester README.win32 Android.mk
-SUBDIRS =
-if BUILD_LIBLTDL
-SUBDIRS += libltdl
-endif
-# SUBDIRS += macros include lib src
-SUBDIRS += macros include lib \
+SUBDIRS = macros include lib \
@BACKEND_LIST@ \
@ROT_BACKEND_LIST@ \
src \
@BINDINGS@ \
tests doc android
-DIST_SUBDIRS = libltdl macros include lib src c++ bindings tests doc \
+DIST_SUBDIRS = macros include lib src c++ bindings tests doc \
icom kenwood aor yaesu dummy pcr alinco uniden tentec kachina jrc \
winradio adat easycomm fodtrack drake rotorez \
flexradio sartek lowe rft rs tapr kit skanti prm80 wj racal tuner \
diff --git a/NEWS b/NEWS
index 090656c..4c59b1b 100644
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,12 @@ Version 3.0
HTML files are built and distributed, requires makeinfo.
* Android build system support. See android/README.android. Android
Makefile fragments are included in source tarballs.
+ * Monolithic library, thanks to Remi Chateauneu for the majority of
+ the work! This allows enabling of a single static library so
+ static libs are enabled by default. Removes dependency on libltdl.
+ * Fixes to easycomm, TNX Steve AI4QR.
+ * Fixes to port handling allowing PTT and CAT on the same port. TNX
+ Bill, G4WJS.
Version 1.2.15.3
2012-11-01
diff --git a/README.betatester b/README.betatester
index a73b399..c159988 100644
--- a/README.betatester
+++ b/README.betatester
@@ -194,7 +194,6 @@ easycomm,rotorez,
sartek, etc: rotator backends
dummy: virtual dummy rig and rotator, for testing use.
lib: library for functions missing on your system
-libltdl: wrapper for shared module loader
bindings Perl, Python, Tcl, and Visual Basic bindings
c++: C++ bindings
doc: documentation base and scripts to extract from src
diff --git a/README.developer b/README.developer
index deb28a5..85bc863 100644
--- a/README.developer
+++ b/README.developer
@@ -248,7 +248,6 @@ distributions may differ).
* autoconf 2.67 # autoconf --version
* automake 1.11 # automake --version
* libtool 2.2.6b+ # libtool --version
-* libltdl-dev 2.2.6b+
* pkg-config 0.25 # pkg-config --version
* Git for connection to git.code.sf.net/p/hamlib/code
* texinfo 4.13a # makeinfo --version
diff --git a/configure.ac b/configure.ac
index 5c18983..5854110 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,7 +112,7 @@ AM_PROG_CC_C_O
## Various parts of Hamlib need these headers ##
## ------------------------------------------ ##
-AC_CHECK_HEADERS([errno.h fcntl.h getopt.h limits.h locale.h malloc.h \
+AC_CHECK_HEADERS([dlfcn.h errno.h fcntl.h getopt.h limits.h locale.h malloc.h \
netdb.h sgtty.h stddef.h termio.h termios.h values.h \
arpa/inet.h dev/ppbus/ppbconf.hdev/ppbus/ppi.h \
linux/hidraw.h linux/ioctl.h linux/parport.h linux/ppdev.h netinet/in.h \
@@ -235,6 +235,14 @@ ioctl memchr memmove memset pow rint select setitimer setlocale sigaction \
snprintf socket sqrt strchr strdup strerror strncasecmp strrchr strstr strtol])
AC_FUNC_ALLOCA
+# Check for libdl and set DL_LIB if found
+AC_CHECK_LIB([dl],
+ [dlopen],
+ [DL_LIB="-ldl"],
+ [],
+ [])
+AC_SUBST([DL_LIB])
+
dnl AC_LIBOBJ replacement functions directory
AC_CONFIG_LIBOBJ_DIR([lib])
@@ -251,27 +259,9 @@ AC_LIBOBJ([dummy])
LT_PREREQ([2.2.6b])
-dnl Name the subdirectory that contains libltdl sources
-LT_CONFIG_LTDL_DIR([libltdl])
-
-dnl N.B. LT_INIT([dlopen], [win32-dll]) does not work for older libtool
-dnl so require new enough version above. Disable static library builds as
-dnl the frontend and backend libs are not linked. May need a recipe outside
-dnl of Libtool if these are needed.
-LT_INIT([dlopen win32-dll])
-
-dnl Enable building of the convenience libltdl library recursively
-dnl (requires --with-included-ltdl be given to configure for the included
-dnl libltdl to be used instead of an installed version), useful on systems
-dnl where libltdl-dev is not installed.
-LTDL_INIT([convenience recursive])
-
-dnl Ugly hack to work around libtool LT_CONFIG_H bug #12262
-dnl http://lists.gnu.org/archive/html/bug-libtool/2012-08/msg00007.html
-AC_CONFIG_COMMANDS_PRE([LT_CONFIG_H=`expr "$LT_CONFIG_H" : '.*/\(.*\)'`])
-
-dnl Only build libtldl if it is needed.
-AM_CONDITIONAL([BUILD_LIBLTDL], [test x"${with_included_ltdl}" = "xyes"])
+dnl N.B. LT_INIT([win32-dll]) does not work for older libtool
+dnl so require new enough version above.
+LT_INIT([win32-dll])
## -------------------------- ##
@@ -311,19 +301,6 @@ AS_CASE(["$host_os"],
## External package tests ##
## ---------------------- ##
-dnl Check whether we can actually find ltdl.h
-dnl (only needed if not using included libltdl).
-AS_IF([test x"${with_included_ltdl}" = "xno"], [
- AC_CHECK_HEADER([ltdl.h],
- [],
- [AC_MSG_ERROR([""
-"ltdl.h not found. Please install the libltdl development files package which"
-"provides /usr/include/ltdl.h (perhaps called 'libltdl-dev' or 'libltdl-devel')."
- ])
- ])
- ])
-
-
dnl Check if C99 struct initializers are supported
AC_MSG_CHECKING([whether C99 struct/array initializers are supported])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]],
@@ -683,7 +660,6 @@ AC_SUBST([AM_CXXFLAGS])
AC_CONFIG_FILES([Makefile
macros/Makefile
include/Makefile
-libltdl/Makefile
lib/Makefile
dummy/Makefile
yaesu/Makefile
@@ -752,7 +728,6 @@ echo \
With Python binding ${cf_with_python_binding}
With TCL binding ${build_tcl}
With rigmem XML support ${cf_with_xml_support}
- With included ltdl ${with_included_ltdl}
With Readline support ${cf_with_readline_support}
Enable HTML rig feature matrix ${cf_enable_html_matrix}
diff --git a/scripts/README.build-win32 b/scripts/README.build-win32
index fcb32fd..7bafd0a 100644
--- a/scripts/README.build-win32
+++ b/scripts/README.build-win32
@@ -72,17 +72,6 @@ paths):
$ build-win32.sh hamlib-3.0~git
-Note: As of 7 Oct 2012 the build should be independent of installed libtool
-versions as libltdl is included in the source tarball (enabled with the
-â--with-included-ltdlâ option to the configure script (which this script
-passes to configure)). The note below should now be obsolete.
-
-Note: At this time (18 Jun 2011) the build will fail on Debian Unstable due
-to a libtool version mismatch between libtool 2.2.6b included in the
-mingw32/gcc-mingw32 packages and the later libtool 2.4 installed on Unstable
-and Testing. Users of Debian Stable (Squeeze) and Ubuntu 10.10 (Maverick)
-should be able to build the Win32 DLLs.
-
Release Info
============
diff --git a/scripts/build-VB.NET.sh b/scripts/build-VB.NET.sh
index 3e5d915..a9b7c99 100644
--- a/scripts/build-VB.NET.sh
+++ b/scripts/build-VB.NET.sh
@@ -180,7 +180,6 @@ rm include/hamlib/rig_dll.h.orig
./configure --host=i586-mingw32msvc \
--prefix=`pwd`/mingw-inst \
--without-cxx-binding \
- --with-included-ltdl \
PKG_CONFIG_LIBDIR=${LIBUSB_WIN32_BIN_PATH}/lib/pkgconfig
make install
diff --git a/scripts/build-win32.sh b/scripts/build-win32.sh
index 49dee54..813e2db 100644
--- a/scripts/build-win32.sh
+++ b/scripts/build-win32.sh
@@ -177,7 +177,6 @@ END_OF_README
./configure --host=i586-mingw32msvc \
--prefix=`pwd`/mingw-inst \
--without-cxx-binding \
- --with-included-ltdl \
PKG_CONFIG_LIBDIR=${LIBUSB_WIN32_BIN_PATH}/lib/pkgconfig
make install
diff --git a/winradio/Makefile.am b/winradio/Makefile.am
index ec4b898..022a972 100644
--- a/winradio/Makefile.am
+++ b/winradio/Makefile.am
@@ -4,5 +4,6 @@ WRSRC = wr1000.c wr1500.c wr1550.c wr3100.c wr3150.c wr3500.c wr3700.c \
noinst_LTLIBRARIES = libhamlib-winradio.la
libhamlib_winradio_la_SOURCES = $(WRSRC)
+libhamlib_winradio_la_LDFLAGS = @DL_LIB@
EXTRA_DIST = NOTES Android.mk
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 3 --
INSTALL | 4 +-
Makefile.am | 9 +------
NEWS | 6 +++++
README.betatester | 1 -
README.developer | 1 -
configure.ac | 49 ++++++++++---------------------------------
scripts/README.build-win32 | 11 ---------
scripts/build-VB.NET.sh | 1 -
scripts/build-win32.sh | 1 -
winradio/Makefile.am | 1 +
11 files changed, 23 insertions(+), 64 deletions(-)
hooks/post-receive
--
Hamlib -- Ham radio control libraries
|
Thanks for helping keep SourceForge clean.
X