[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/multimedia/amarok
From:       Martin Aumüller <aumuell () reserv ! at>
Date:       2006-01-11 23:29:26
Message-ID: 1137022166.758042.29515.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 497111 by aumuell:

actually try to use g_object_get when detected in libgobject, arch users please test


 M  +5 -3      configure.in.in  


--- trunk/extragear/multimedia/amarok/configure.in.in #497110:497111
@@ -873,8 +873,12 @@
             AC_CHECK_FUNCS(g_object_get, have_gobject_get=yes, have_gobject_get=no)
 	    if test "x$have_gobject_get" = "xno"; then
                PKG_CHECK_MODULES([GOBJECT], gobject-2.0, have_gobject=yes,have_gobject=no)
+               CPPFLAGS="$CPPFLAGS $GOBJECT_INCLUDES"
+               LDFLAGS="$LDFLAGS $GOBJECT_LIBS"
+               unset ac_cv_func_g_object_get # clear cached result
+               AC_CHECK_FUNCS(g_object_get, have_gobject_get=yes, have_gobject_get=no)
 	    fi
-            if test "x$have_gobject_get" = "xyes" -o "x$have_gobject" = "xyes"; then
+            if test "x$have_gobject_get" = "xyes"; then
                 AC_CHECK_FUNCS(itdb_track_set_thumbnails, have_libgpod_artwork=yes)
             fi
             CPPFLAGS=$ac_cppflags_save
@@ -882,8 +886,6 @@
         fi
     fi
 fi
-AC_SUBST(LIBGPOD_INCLUDES)
-AC_SUBST(LIBGPOD_LIBS)
 
 AM_CONDITIONAL(with_libgpod, [test x$have_libgpod = xyes])
 
[prev in list] [next in list] [prev in thread] [next in thread]