diff options
| author | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2021-10-19 05:05:46 +0200 |
|---|---|---|
| committer | Hans Ulrich Niedermann <hun@n-dimensional.de> | 2021-10-19 05:11:44 +0200 |
| commit | a2edf33210799af6b6b3edffb0871ab626932b7c (patch) | |
| tree | 339d6d7ba9572dd1e44efbcabf3a0e8d3a9ae0ba /gphoto-m4 | |
| parent | 334dd3132e9e8c6aa29e30653b406d9a907a3e4a (diff) | |
| download | libgphoto2-a2edf33210799af6b6b3edffb0871ab626932b7c.tar.gz | |
Remove unused remnants of convenience libltdl
Not that its presence hurt anything, but we could
have removed the libltdlc.la stuff some time in
the 2000s.
Diffstat (limited to 'gphoto-m4')
| -rw-r--r-- | gphoto-m4/Makefile-files | 1 | ||||
| -rw-r--r-- | gphoto-m4/gp-dynamic-libraries.m4 | 60 |
2 files changed, 0 insertions, 61 deletions
diff --git a/gphoto-m4/Makefile-files b/gphoto-m4/Makefile-files index f0f4c4708..2a89dd2d8 100644 --- a/gphoto-m4/Makefile-files +++ b/gphoto-m4/Makefile-files @@ -12,7 +12,6 @@ EXTRA_DIST += %reldir%/gp-check-shell-environment.m4 EXTRA_DIST += %reldir%/gp-config-msg.m4 EXTRA_DIST += %reldir%/gp-documentation.m4 EXTRA_DIST += %reldir%/gp-driverdir.m4 -EXTRA_DIST += %reldir%/gp-dynamic-libraries.m4 EXTRA_DIST += %reldir%/gp-gettext-hack.m4 EXTRA_DIST += %reldir%/gp-internal-docs.m4 EXTRA_DIST += %reldir%/gp-libltdl.m4 diff --git a/gphoto-m4/gp-dynamic-libraries.m4 b/gphoto-m4/gp-dynamic-libraries.m4 deleted file mode 100644 index a83fc0f79..000000000 --- a/gphoto-m4/gp-dynamic-libraries.m4 +++ /dev/null @@ -1,60 +0,0 @@ -AC_DEFUN([GP_DYNAMIC_LIBRARIES],[dnl -dnl We require either of those -dnl AC_REQUIRE([AC_LIBTTDL_INSTALLABLE])dnl -dnl AC_REQUIRE([AC_LIBLTDL_CONVENIENCE])dnl -AC_REQUIRE([AC_LIBTOOL_DLOPEN])dnl -AC_REQUIRE([AC_PROG_LIBTOOL])dnl -dnl --------------------------------------------------------------------------- -dnl Check for libltdl: -dnl - lt_dlforeachfile has been introduced in libtool-1.4. -dnl - However, there are still systems out there running libtool-1.3. -dnl For those, we will use our shipped libltdl. This has the welcome -dnl side effect that we don't have to distinguish between libltdl 1.3 with -dnl and without the notorious segfault bug. -dnl - FIXME: In case we're using our own version, we have to check whether -dnl -ldl is required? -dnl --------------------------------------------------------------------------- -# $0 -ltdl_msg="no (not found or too old)" -have_ltdl=false -LIBS_save="$LIBS" -LIBS="$LIBLTDL" -AC_CHECK_LIB([ltdl], [lt_dlforeachfile],[ - CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS="$LTDLINCL" - AC_CHECK_HEADER([ltdl.h],[ - AC_DEFINE([HAVE_LTDL],1,[whether we use libltdl]) - ltdl_msg="yes (from system)" - have_ltdl=: - ]) - CPPFLAGS="$CPPFLAGS_save" -]) -LIBS="$LIBS_save" -if "$have_ltdl"; then :; else - AC_MSG_CHECKING([for included libltdl]) - if test -d "$srcdir/libltdl"; then - LIBLTDL="\$(top_builddir)/libltdl/libltdlc.la" - LTDLINCL="-I\$(top_srcdir)/libltdl" - have_ltdl=: - ltdl_msg="yes (included)" - AC_MSG_RESULT([yes]) - else - AC_MSG_RESULT([no]) - AC_MSG_ERROR([ -*** Could not detect or configure libltdl. -]) - fi -fi -GP_CONFIG_MSG([libltdl],["${ltdl_msg}"]) -])dnl -dnl -dnl #################################################################### -dnl -dnl Please do not remove this: -dnl filetype: 2b993145-3256-47b4-84fd-ec4dcdf4fdf9 -dnl I use this to find all the different instances of this file which -dnl are supposed to be synchronized. -dnl -dnl Local Variables: -dnl mode: autoconf -dnl End: |