diff options
| author | teuf <teuf@f01d2545-417e-4e96-918e-98f8d0dbbcb6> | 2008-07-09 19:34:26 +0000 |
|---|---|---|
| committer | teuf <teuf@f01d2545-417e-4e96-918e-98f8d0dbbcb6> | 2008-07-09 19:34:26 +0000 |
| commit | 8eaf8010ede82d0067e4d9d1cab4663b01b197cd (patch) | |
| tree | 79b3497b449e279dd50fae92285801e842869f62 | |
| parent | aaf9d48ca87f9149fca513f9ea4ae16a9dad2c68 (diff) | |
| download | libgpod-8eaf8010ede82d0067e4d9d1cab4663b01b197cd.tar.gz libgpod-8eaf8010ede82d0067e4d9d1cab4663b01b197cd.tar.xz libgpod-8eaf8010ede82d0067e4d9d1cab4663b01b197cd.zip | |
* configure.ac: properly detect newer libsgutils (the so name was
changed)
* tools/ipod-scsi-inquiry.c: add missing include
Based on a patch from Dan Horák (dan@danny.cz)
git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@2045 f01d2545-417e-4e96-918e-98f8d0dbbcb6
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | tools/ipod-scsi-inquiry.c | 1 |
3 files changed, 16 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2008-07-09 Christophe Fergeau <teuf@gnome.org> + + * configure.ac: properly detect newer libsgutils (the so name was + changed) + * tools/ipod-scsi-inquiry.c: add missing include + Based on a patch from Dan Horák (dan@danny.cz) + 2008-07-06 Christophe Fergeau <teuf@gnome.org> * src/itdb_device.c: fix model number information grabbed from diff --git a/configure.ac b/configure.ac index 03e3b6c..2120a96 100644 --- a/configure.ac +++ b/configure.ac @@ -98,9 +98,14 @@ AM_CONDITIONAL(WITH_INTERNAL_GCHECKSUM, test "x$with_internal_gchecksum" = "xyes dnl ************************************************** dnl * sgutils is necessary to get the xml device file from the ipod dnl ************************************************** -AC_CHECK_LIB(sgutils, sg_ll_inquiry, - [SGUTILS_LIBS="-lsgutils"; have_sgutils=yes], - have_sgutils=no) +AC_CHECK_LIB(sgutils2, sg_ll_inquiry, + [SGUTILS_LIBS="-lsgutils2"; have_sgutils=yes], + have_sgutils=no) +if test "x$have_sgutils" != xyes; then + AC_CHECK_LIB(sgutils, sg_ll_inquiry, + [SGUTILS_LIBS="-lsgutils"; have_sgutils=yes], + have_sgutils=no) +fi AC_SUBST(SGUTILS_LIBS) AM_CONDITIONAL(HAVE_SGUTILS, test x"$have_sgutils" = xyes) diff --git a/tools/ipod-scsi-inquiry.c b/tools/ipod-scsi-inquiry.c index 3bc88f2..d4bee4a 100644 --- a/tools/ipod-scsi-inquiry.c +++ b/tools/ipod-scsi-inquiry.c @@ -30,6 +30,7 @@ #include <fcntl.h> #include <stdio.h> #include <stdlib.h> +#include <stdint.h> #include <string.h> #include <unistd.h> #include <scsi/sg_cmds.h> |