commit 58deb342d35a767340f14d4faf0a8041f4b04152
Author: phantomjinx <[email protected]>
Date: Tue Jun 22 21:20:03 2010 +0100
Output result of webkit test in configure script
TODO | 21 +++++++++++++++++++
configure.in | 62 +++++++++++++++++++++++++++++++++------------------------
2 files changed, 57 insertions(+), 26 deletions(-)
---
diff --git a/TODO b/TODO
index bcd7c98..105fcd9 100644
--- a/TODO
+++ b/TODO
@@ -74,4 +74,25 @@ display_photo.*
# info.* / infodlg.*
# help.*
+Notes on trial build using ubuntu 910
+1) Install git (git-core, gitk)
+2) Install libglade2-dev
+3) Install/build libgpod -> libgpod-dev
+4) Install flex
+5) Install id3tag
+7) Install anjuta-dev - not good enough as only 2.28. Need 2.30.0
+8) Build anjuta
+ - Install gnome-common
+ - Install gtk-doc-tools
+ - Install libunique-dev
+ - Install libdbus-glib-1-dev
+ - Install libvte-dev
+ - Install libgdl-1-dev
+ - Install libxslt-dev
+ - Install libgda-4.0-dev
+
+
+- Investigate the lack of ltmain.sh
+- Change configure.in to signal at the bottom status of webkit
+- pkconfig.pc for libgtkpod
diff --git a/configure.in b/configure.in
index cfc69c7..7c6a30b 100644
--- a/configure.in
+++ b/configure.in
@@ -174,6 +174,30 @@ else
have_gio="*no -- will build without iPod autodetection support"
fi
+dnl Check for webkit
+dnl -------------------------------------------------------------
+
+AC_ARG_ENABLE(plugin-coverweb,
+ AC_HELP_STRING([--disable-plugin-coverweb],[Disable coverweb plugin for
finding coverart in gtkpod]),
+ [ if test "$enableval" = "no"; then
+ user_disabled_coverweb=1
+ fi ],
+ [ user_disabled_coverweb=0 ])
+AC_MSG_CHECKING(if coverweb plugin is disabled)
+if test "$user_disabled_coverweb" = 1; then
+ AC_MSG_RESULT(yes)
+ coverweb="no"
+else
+ AC_MSG_RESULT(no)
+
+ PKG_CHECK_MODULES(WEBKIT,
+ [webkit-1.0 >= 1.1],
+ [coverweb="yes"],
+ [coverweb="no"])
+fi
+
+AM_CONDITIONAL(HAVE_PLUGIN_COVERWEB, [test x$coverweb = xyes])
+
dnl Check for libvorbisfile and libvorbis
AC_ARG_WITH(ogg, AC_HELP_STRING([--without-ogg], [Disable Ogg/Vorbis support]))
if test "x$with_ogg" != "xno"; then
@@ -245,31 +269,6 @@ AC_CHECK_HEADERS(linux/cdrom.h scsi/sg.h scsi/scsi.h
scsi/scsi_ioctl.h)
libgpod_version=`$PKG_CONFIG libgpod-1.0 --modversion`
AC_DEFINE_UNQUOTED(LIBGPOD_VERSION, "${libgpod_version}", [Set this to the
libgpod version])
-dnl Check for webkit
-dnl -------------------------------------------------------------
-
-AC_ARG_ENABLE(plugin-coverweb,
- AC_HELP_STRING([--disable-plugin-coverweb],[Disable browser plugin for
finding coverart in gtkpod]),
- [ if test "$enableval" = "no"; then
- user_disabled_coverweb=1
- fi ],
- [ user_disabled_coverweb=0 ])
-
-AC_MSG_CHECKING(if coverweb plugin is disabled)
-if test "$user_disabled_coverweb" = 1; then
- AC_MSG_RESULT(yes)
- coverweb="no"
-else
- AC_MSG_RESULT(no)
-
- PKG_CHECK_MODULES(PLUGIN_COVERWEB,
- [webkit-1.0 >= 1.1],
- [coverweb="yes"],
- [coverweb="no"])
-fi
-
-AM_CONDITIONAL(HAVE_PLUGIN_COVERWEB, [test x$coverweb = xyes])
-
dnl Setup Plugin directories
dnl ------------------------
gtkpod_plugin_dir='$(libdir)/$(PACKAGE)'
@@ -378,7 +377,7 @@ plugins/coverweb/icons/Makefile
])
echo "
-Configuration for $PACKAGE $VERSION :
+Core Configuration for $PACKAGE $VERSION :
--------------------------------
Host System Type .....: $host
@@ -393,7 +392,18 @@ Configuration for $PACKAGE $VERSION :
Preprocessor .........: $CC $CPPFLAGS
Compiler .............: $CC $CFLAGS
Linker ...............: $CC $LDFLAGS $LIBS
+"
+
+echo "
+Plugin Configuration :
+---------------------------------"
+if [ $HAVE_PLUGIN_COVERWEB ]; then
+ echo " CoverWeb Browser .....: Yes"
+else
+ echo " CoverWeb Browser .....: No"
+fi
+echo "
Now type 'make' to build $PACKAGE $VERSION,
and then 'make install' for installation.
"
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
