commit 0c53fbbc913c98b15c5f654d8abe10270dc1ee05
Author: Christophe Fergeau <t...@gnome.org>
Date: Tue Jul 19 22:31:40 2011 +0200
remove internal GChecksum copy
GLib 2.16 has been out for more than 3 years now, we should no
longer need this workaround.
configure.ac | 19 +-
src/Makefile.am | 5 -
src/db-artwork-writer.c | 4 -
src/gchecksum.c | 1411 -----------------------------------------------
src/gchecksum.h | 72 ---
5 files changed, 1 insertions(+), 1510 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5c59a8c..a6f7c9c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -42,24 +42,7 @@ AC_CHECK_FUNCS([localtime_r])
AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include <time.h>])
dnl sqlite3 is needed for newer ipod models (nano5g), and libplist is needed
dnl by libgpod sqlite code
-PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.8.0 gobject-2.0 sqlite3 libplist >=
1.0 gmodule-2.0)
-
-dnl **************************************************
-dnl we've copied gchecksum from glib 2.16. Only use the
-dnl copy if the version of glib on the system does not
-dnl provide it.
-dnl **************************************************
-
-AC_ARG_WITH(internal-gchecksum,
- AS_HELP_STRING([--with-internal-gchecksum],[Build using internal
copy of gchecksum]),,
- with_internal_gchecksum=no)
-
-if test "x$with_internal_gchecksum" = "xno"; then
- PKG_CHECK_MODULES(GLIB, glib-2.0 >= 2.16.0, with_internal_gchecksum=no,
- with_internal_gchecksum=yes)
-fi
-
-AM_CONDITIONAL(WITH_INTERNAL_GCHECKSUM, test "x$with_internal_gchecksum" =
"xyes")
+PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist >=
1.0 gmodule-2.0)
dnl **************************************************
dnl * sgutils is necessary to get the xml device file
diff --git a/src/Makefile.am b/src/Makefile.am
index 59ae346..26fd515 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -28,11 +28,6 @@ libgpod_la_SOURCES = \
rijndael.c
libgpod_la_CFLAGS =
-if WITH_INTERNAL_GCHECKSUM
-libgpod_la_SOURCES += gchecksum.c gchecksum.h
-libgpod_la_CFLAGS += -DWITH_INTERNAL_GCHECKSUM
-endif
-
libgpod_la_LDFLAGS = -version-info $(LIBGPOD_SO_VERSION) -no-undefined
libgpod_la_CPPFLAGS = -DLIBGPOD_BLOB_DIR=\"$(LIBGPOD_BLOB_DIR)\"
diff --git a/src/db-artwork-writer.c b/src/db-artwork-writer.c
index c19f481..824b502 100644
--- a/src/db-artwork-writer.c
+++ b/src/db-artwork-writer.c
@@ -48,10 +48,6 @@
#include <stdio.h>
#include <sys/types.h>
-#ifdef WITH_INTERNAL_GCHECKSUM
-#include "gchecksum.h"
-#endif
-
#define DEFAULT_GSTRING_SIZE 128*1024
struct iPodSharedDataBuffer {
------------------------------------------------------------------------------
Storage Efficiency Calculator
This modeling tool is based on patent-pending intellectual property that
has been used successfully in hundreds of IBM storage optimization engage-
ments, worldwide. Store less, Store more with what you own, Move data to
the right place. Try It Now! http://www.accelacomm.com/jaw/sfnl/114/51427378/
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
