Revision: 2045
http://gtkpod.svn.sourceforge.net/gtkpod/?rev=2045&view=rev
Author: teuf
Date: 2008-07-09 12:34:26 -0700 (Wed, 09 Jul 2008)
Log Message:
-----------
* 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?\195?\161k ([EMAIL PROTECTED])
Modified Paths:
--------------
libgpod/trunk/ChangeLog
libgpod/trunk/configure.ac
libgpod/trunk/tools/ipod-scsi-inquiry.c
Modified: libgpod/trunk/ChangeLog
===================================================================
--- libgpod/trunk/ChangeLog 2008-07-06 18:33:44 UTC (rev 2044)
+++ libgpod/trunk/ChangeLog 2008-07-09 19:34:26 UTC (rev 2045)
@@ -1,3 +1,10 @@
+2008-07-09 Christophe Fergeau <[EMAIL PROTECTED]>
+
+ * 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 ([EMAIL PROTECTED])
+
2008-07-06 Christophe Fergeau <[EMAIL PROTECTED]>
* src/itdb_device.c: fix model number information grabbed from
Modified: libgpod/trunk/configure.ac
===================================================================
--- libgpod/trunk/configure.ac 2008-07-06 18:33:44 UTC (rev 2044)
+++ libgpod/trunk/configure.ac 2008-07-09 19:34:26 UTC (rev 2045)
@@ -98,9 +98,14 @@
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)
Modified: libgpod/trunk/tools/ipod-scsi-inquiry.c
===================================================================
--- libgpod/trunk/tools/ipod-scsi-inquiry.c 2008-07-06 18:33:44 UTC (rev
2044)
+++ libgpod/trunk/tools/ipod-scsi-inquiry.c 2008-07-09 19:34:26 UTC (rev
2045)
@@ -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>
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Sponsored by: SourceForge.net Community Choice Awards: VOTE NOW!
Studies have shown that voting for your favorite open source project,
along with a healthy diet, reduces your potential for chronic lameness
and boredom. Vote Now at http://www.sourceforge.net/community/cca08
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
