OTHER: Redo pkg-config handling once again.

lib/lib.pro

@@ -1,8 +1,12 @@
 TEMPLATE = lib
 CONFIG += static
 include (../config.pri)
+
+PKGCONFIG += xmms2-client-cpp
 load (../features/pkgconfig.prf)
 
+!xmms2-client-cpp:error (Please install the xmms2 c++ client library)
+
 MOC_DIR     = .moc
 OBJECTS_DIR = .obj
 
@@ -25,27 +29,8 @@ HEADERS += xclient.h \
 		   xmmsqt4.h \
 		   debug.h
 
-
-
-;RESOURCES = promoe.qrc
-;macx:RC_FILE = promoe.icns
-;macx:INCLUDEPATH = /sw/include
-
 QT += network
-;macx:QTPLUGIN += qjpeg
 QMAKE_LFLAGS += -L$$[QT_INSTALL_PLUGINS]/imageformats
 
-
 QMAKE_CXXFLAGS += -g
-;CONFIG += debug warn_on
 QMAKE_CXXFLAGS_WARN_ON += -Wno-unused-parameter
-
-XMMSCLIENTPKG += xmms2-client-cpp
-pkgconfig_exists ($$XMMSCLIENTPKG) {
-	QMAKE_CXXFLAGS  += $$pkgconfig_cflags($$XMMSCLIENTPKG)
-	LIBS += $$pkgconfig_libs($$XMMSCLIENTPKG)
-} else {
-	error (Please install the xmms2 c++ client library)
-}
-;CONFIG += avahi
-