Clunk search paths

added CLUNK_ROOT support to FindClunk
fixed clunk include prefix inconsistency

cmake/FindClunk.cmake

@@ -1,7 +1,8 @@
 FIND_PATH(CLUNK_INCLUDE_DIR
   NAMES
-    clunk.h
+    clunk/clunk.h
   PATHS
+    ${CLUNK_ROOT}/include
 	/usr/include
     /usr/include/x86_64-linux-gnu
     /usr/local/include
@@ -10,14 +11,13 @@ FIND_PATH(CLUNK_INCLUDE_DIR
     /opt/local/include
     /opt/include
     /sw/include
-  PATH_SUFFIXES
-    clunk
 )
 
 FIND_LIBRARY(CLUNK_LIBRARY
   NAMES
     clunk
   PATHS
+    ${CLUNK_ROOT}/lib
     /usr/lib
     /usr/local/lib
     /opt/local/lib

lib/xsound/_xsound.h

@@ -1,7 +1,7 @@
 #ifndef __XSOUND_H
 #define __XSOUND_H
 
-#include <clunk.h>
+#include <clunk/clunk.h>
 
 
 #define DS_LOOPING			0x00000001

lib/xsound/xsound.cpp

@@ -2,7 +2,7 @@
 
 //#include "dsound.h"
 //#include <SDL_mixer.h>
-#include <clunk.h>
+#include <clunk/clunk.h>
 
 #include "xglobal.h"
 #include "xgraph.h"