diff options
| -rw-r--r-- | camlibs/ptp2/ptpip.c | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | libgphoto2/gphoto2-camera.c | 2 | ||||
| -rw-r--r-- | libgphoto2_port/configure.ac | 8 |
4 files changed, 10 insertions, 6 deletions
diff --git a/camlibs/ptp2/ptpip.c b/camlibs/ptp2/ptpip.c index 39e528e65..e4d25fa8f 100644 --- a/camlibs/ptp2/ptpip.c +++ b/camlibs/ptp2/ptpip.c @@ -35,7 +35,9 @@ #include <time.h> #include <errno.h> #include <sys/types.h> +#ifdef HAVE_SYS_SELECT_H #include <sys/select.h> +#endif #include <sys/socket.h> #include <netinet/in.h> diff --git a/configure.ac b/configure.ac index bcb4d5015..305f8b788 100644 --- a/configure.ac +++ b/configure.ac @@ -297,7 +297,7 @@ AC_HEADER_DIRENT # before _HEADER_STDC AC_HEADER_STDC # after _HEADER_STDC -AC_CHECK_HEADERS([sys/param.h locale.h memory.h getopt.h unistd.h mcheck.h limits.h sys/time.h]) +AC_CHECK_HEADERS([sys/param.h sys/select.h locale.h memory.h getopt.h unistd.h mcheck.h limits.h sys/time.h]) AC_C_INLINE([]) AC_C_CONST([]) dnl FIXME: AC_STRUCT_TIMEZONE @@ -441,7 +441,7 @@ if test "x${utilsdir}" = "x"; then utilsdir="\${libdir}/\${PACKAGE_TARNAME}"; fi AC_ARG_VAR([utilsdir],[Directory where utilities like print-camera-list will be installed]) AC_SUBST([utilsdir]) -GP_UDEV +GP_UDEV([true]) dnl --------------------------------------------------------------------------- diff --git a/libgphoto2/gphoto2-camera.c b/libgphoto2/gphoto2-camera.c index 8e5afa8fe..666fb8080 100644 --- a/libgphoto2/gphoto2-camera.c +++ b/libgphoto2/gphoto2-camera.c @@ -433,8 +433,8 @@ gp_camera_get_port_info (Camera *camera, GPPortInfo *info) int gp_camera_set_port_info (Camera *camera, GPPortInfo info) { - CHECK_NULL (camera); char *name, *path; + CHECK_NULL (camera); /* * If the camera is currently initialized, terminate that connection. diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac index 0187d63f2..bb8a233a8 100644 --- a/libgphoto2_port/configure.ac +++ b/libgphoto2_port/configure.ac @@ -95,8 +95,6 @@ AC_DEFINE_UNQUOTED(HAVE_CC,"$CC",[The C compiler we're using]) AM_CPPFLAGS="$CPPFLAGS" AM_CPPFLAGS="$AM_CPPFLAGS -I\$(top_srcdir)" -GP_UDEV - # ---------------------------------------------------------------------- # References to external resources (web sites, mailing listes, etc.) @@ -362,11 +360,15 @@ GP_CHECK_LIBRARY([LIBUSB],[libusb],[>= 0.1.5], [http://libusb.sourceforge.net/] ) +dnl depends on libusb's availability +GP_UDEV([test "x$have_LIBUSB" = xyes]) + + dnl --------------------------------------------------------------------------- dnl disk - hal and various stuff dnl --------------------------------------------------------------------------- AC_ARG_WITH([hal], - AS_HELP_STRING([--without-hal], [wether to enable HAL disk autodetection]), + AS_HELP_STRING([--without-hal], [whether to enable HAL disk autodetection]), ,with_hal=yes) if test "x$with_hal" = "xyes"; then |