diff options
| -rw-r--r-- | CHANGES | 3 | ||||
| -rw-r--r-- | libgphoto2/gphoto2-abilities-list.c | 6 | ||||
| -rw-r--r-- | libgphoto2/gphoto2-camera.c | 6 | ||||
| -rw-r--r-- | libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c | 4 | ||||
| -rw-r--r-- | libgphoto2_port/libgphoto2_port/gphoto2-port.c | 4 |
5 files changed, 4 insertions, 19 deletions
@@ -3,11 +3,12 @@ libgphoto2 CVS HEAD (2.2) Build system (packagers beware!): - * now requires libltdl + * now requires libltdl (from system or shipped with tarball) * works with contemporary build tools * new ./configure parameter set * no more accidentally building without libusb (use --without-libusb if you insist on that) + * camlibs and iolibs are now installed into new directories libgphoto2: diff --git a/libgphoto2/gphoto2-abilities-list.c b/libgphoto2/gphoto2-abilities-list.c index e4fd967ef..cf5193739 100644 --- a/libgphoto2/gphoto2-abilities-list.c +++ b/libgphoto2/gphoto2-abilities-list.c @@ -25,11 +25,7 @@ #include <stdio.h> #include <string.h> -#ifdef HAVE_LTDL -# include <ltdl.h> -#else -# error libltdl required! -#endif +#include <ltdl.h> #include "gphoto2-result.h" #include "gphoto2-port-log.h" diff --git a/libgphoto2/gphoto2-camera.c b/libgphoto2/gphoto2-camera.c index 63b9792ed..372824564 100644 --- a/libgphoto2/gphoto2-camera.c +++ b/libgphoto2/gphoto2-camera.c @@ -29,11 +29,7 @@ #include <stdarg.h> #include <stdio.h> -#ifdef HAVE_LTDL -# include <ltdl.h> -#else -# error libltdl required! -#endif +#include <ltdl.h> #include "gphoto2-context.h" #include "gphoto2-result.h" diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c b/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c index 3b0506aba..88de507d2 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c @@ -30,11 +30,7 @@ #error We need regex.h, but it has not been detected. #endif -#ifdef HAVE_LTDL #include <ltdl.h> -#else -#error libltdl required! -#endif #include <gphoto2-port-result.h> #include <gphoto2-port-library.h> diff --git a/libgphoto2_port/libgphoto2_port/gphoto2-port.c b/libgphoto2_port/libgphoto2_port/gphoto2-port.c index 6da85378a..a9a45b82b 100644 --- a/libgphoto2_port/libgphoto2_port/gphoto2-port.c +++ b/libgphoto2_port/libgphoto2_port/gphoto2-port.c @@ -28,11 +28,7 @@ #include <stdio.h> #include <string.h> -#ifdef HAVE_LTDL #include <ltdl.h> -#else -#error libltdl required! -#endif #include "gphoto2-port-result.h" #include "gphoto2-port-info-list.h" |