allow compilation on OS where the cache server can't be built (like Windows...)

git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/evas@40570 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33

diff --git a/src/bin/evas_cserve_main.c b/src/bin/evas_cserve_main.c
index 1005ff3..264c71e 100644 (file)
--- a/src/bin/evas_cserve_main.c
+++ b/src/bin/evas_cserve_main.c
@@ -1,5 +1,7 @@
-#include "Evas.h"
-#include "evas_cs.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <signal.h>
 #include <sys/time.h>
 #include <time.h>
@@ -7,6 +9,9 @@
 # include <windows.h>
 #endif
 
+#include "Evas.h"
+#include "evas_cs.h"
+
 // fixme:'s
 // 
 // preload - make it work (both)

diff --git a/src/bin/evas_cserve_tool.c b/src/bin/evas_cserve_tool.c
index b5c56c8..fd5f71c 100644 (file)
--- a/src/bin/evas_cserve_tool.c
+++ b/src/bin/evas_cserve_tool.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "evas_cs.h"
 
 int

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 4e30556..4b22a87 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -24,13 +24,19 @@ include_HEADERS = Evas.h Evas_Data.h
 
 libevas_la_SOURCES = main.c
 
+if EVAS_CSERVE
+
+libevas_cserve_la = cserve/libevas_cserve.la
+
+endif
+
 libevas_la_LIBADD = \
 canvas/libevas_canvas.la \
 data/libevas_data.la \
 file/libevas_file.la \
 cache/libevas_cache.la \
 imaging/libevas_imaging.la \
-cserve/libevas_cserve.la \
+$(libevas_cserve_la) \
 engines/common/libevas_engine_common.la \
 @dlopen_libs@ \
 @FREETYPE_LIBS@ \
@@ -42,13 +48,12 @@ engines/common/libevas_engine_common.la \
 -lm
 
 libevas_la_DEPENDENCIES = \
-$(top_builddir)/config.h \
 canvas/libevas_canvas.la \
 data/libevas_data.la \
 file/libevas_file.la \
 cache/libevas_cache.la \
 imaging/libevas_imaging.la \
-cserve/libevas_cserve.la \
+$(libevas_cserve_la) \
 engines/common/libevas_engine_common.la
 
 if BUILD_ENGINE_SOFTWARE_16

diff --git a/src/lib/cserve/Makefile.am b/src/lib/cserve/Makefile.am
index 98e0c5b..5d33c81 100644 (file)
--- a/src/lib/cserve/Makefile.am
+++ b/src/lib/cserve/Makefile.am
@@ -15,7 +15,12 @@ AM_CPPFLAGS = \
 @FONTCONFIG_CFLAGS@ \
 @pthread_cflags@
 
+if EVAS_CSERVE
+
 noinst_LTLIBRARIES = libevas_cserve.la
+
+endif
+
 libevas_cserve_la_SOURCES = \
 evas_cs.h \
 evas_cs_main.c \

diff --git a/src/lib/cserve/evas_cs.h b/src/lib/cserve/evas_cs.h
index 0262091..574e04a 100644 (file)
--- a/src/lib/cserve/evas_cs.h
+++ b/src/lib/cserve/evas_cs.h
@@ -1,6 +1,8 @@
 #ifndef EVAS_CS_H
 #define EVAS_CS_H 1
 
+#ifdef EVAS_CSERVE
+
 #include <sys/select.h>
 #include <sys/time.h>
 #include <sys/types.h>
@@ -47,8 +49,6 @@
 # endif
 #endif /* ! _WIN32 */
 
-#ifdef EVAS_CSERVE
-
 #define LENGTH_OF_SOCKADDR_UN(s) (strlen((s)->sun_path) + (size_t)(((struct sockaddr_un *)NULL)->sun_path))
 
 typedef struct _Server Server;

diff --git a/src/lib/cserve/evas_cs_client.c b/src/lib/cserve/evas_cs_client.c
index 7403a21..257b4cd 100644 (file)
--- a/src/lib/cserve/evas_cs_client.c
+++ b/src/lib/cserve/evas_cs_client.c
@@ -1,6 +1,11 @@
-#include "evas_cs.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <signal.h>
 
+#include "evas_cs.h"
+
 #ifdef EVAS_CSERVE
 
 static Server *cserve = NULL;

diff --git a/src/lib/cserve/evas_cs_main.c b/src/lib/cserve/evas_cs_main.c
index 7bb2978..e8282aa 100644 (file)
--- a/src/lib/cserve/evas_cs_main.c
+++ b/src/lib/cserve/evas_cs_main.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "evas_cs.h"
 
 #ifdef EVAS_CSERVE

diff --git a/src/lib/cserve/evas_cs_mem.c b/src/lib/cserve/evas_cs_mem.c
index 59f3460..1fff9ba 100644 (file)
--- a/src/lib/cserve/evas_cs_mem.c
+++ b/src/lib/cserve/evas_cs_mem.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "evas_cs.h"
 
 #ifdef EVAS_CSERVE

diff --git a/src/lib/cserve/evas_cs_server.c b/src/lib/cserve/evas_cs_server.c
index 8f4e7b8..072e945 100644 (file)
--- a/src/lib/cserve/evas_cs_server.c
+++ b/src/lib/cserve/evas_cs_server.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include "evas_cs.h"
 
 #ifdef EVAS_CSERVE