stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

change DATADIR to INSTALL_DATADIR solve mingw conflict

Browse source 
Based on work from Radu Sorici <soriciradu@gmail.com>

Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
Andy Green 2012-04-12 11:06:05 +08:00 • committed by Andy Green
parent a3147888d6
commit cce2a81e85
9 changed files with 31 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/Makefile.am
View file

@ -31,7 +31,7 @@ libwebsockets_la_LDFLAGS+= -version-info 0:3
endif
libwebsockets_la_CFLAGS+= -c \
-DDATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
-DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
libwebsockets_la_LDFLAGS+= -lz
all-local:

2
lib/Makefile.in
View file

@ -240,7 +240,7 @@ dist_libwebsockets_la_SOURCES = libwebsockets.c handshake.c parsers.c \
extension-deflate-stream.c private-libwebsockets.h \
$(am__append_1) $(am__append_2)
libwebsockets_la_CFLAGS := -Wall -std=gnu99 -pedantic $(am__append_3) \
$(am__append_5) -c -DDATADIR=\"@datadir@\" \
$(am__append_5) -c -DINSTALL_DATADIR=\"@datadir@\" \
-DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
libwebsockets_la_LDFLAGS := $(am__append_4) $(am__append_6) -lz
all: all-am

1
lib/client-handshake.c
View file

@ -1,7 +1,6 @@
#include "private-libwebsockets.h"
#include <netdb.h>
struct libwebsocket *__libwebsocket_client_connect_2(
struct libwebsocket_context *context,
struct libwebsocket *wsi

10
test-server/Makefile.am
View file

@ -26,10 +26,10 @@ libwebsockets_test_server_extpoll_CFLAGS:= -Werror
libwebsockets_test_fraggle_CFLAGS:= -Werror
endif
libwebsockets_test_server_CFLAGS+= -Wall -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
libwebsockets_test_client_CFLAGS+= -Wall -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
libwebsockets_test_server_extpoll_CFLAGS+= -Wall -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
libwebsockets_test_fraggle_CFLAGS+= -Wall -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
libwebsockets_test_server_CFLAGS+= -Wall -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
libwebsockets_test_client_CFLAGS+= -Wall -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
libwebsockets_test_server_extpoll_CFLAGS+= -Wall -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
libwebsockets_test_fraggle_CFLAGS+= -Wall -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
if NOPING
@ -37,7 +37,7 @@ else
bin_PROGRAMS+=libwebsockets-test-ping
libwebsockets_test_ping_SOURCES=test-ping.c
libwebsockets_test_ping_LDADD=-L../lib -lwebsockets
libwebsockets_test_ping_CFLAGS:= -Wall -Werror -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
libwebsockets_test_ping_CFLAGS:= -Wall -Werror -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
endif

22
test-server/Makefile.in
View file

@ -256,36 +256,40 @@ libwebsockets_test_fraggle_SOURCES = test-fraggle.c
libwebsockets_test_fraggle_LDADD = -L../lib -lwebsockets \
$(am__append_4)
@MINGW_FALSE@libwebsockets_test_server_CFLAGS := -Werror -Wall \
@MINGW_FALSE@ -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" \
@MINGW_FALSE@ -std=gnu99 -pedantic \
@MINGW_FALSE@ -DINSTALL_DATADIR=\"@datadir@\" \
@MINGW_FALSE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
@MINGW_TRUE@libwebsockets_test_server_CFLAGS := -w \
@MINGW_TRUE@ -I../win32port/win32helpers -Wall -std=gnu99 \
@MINGW_TRUE@ -pedantic -DDATADIR=\"@datadir@\" \
@MINGW_TRUE@ -pedantic -DINSTALL_DATADIR=\"@datadir@\" \
@MINGW_TRUE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
@MINGW_FALSE@libwebsockets_test_client_CFLAGS := -Werror -Wall \
@MINGW_FALSE@ -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" \
@MINGW_FALSE@ -std=gnu99 -pedantic \
@MINGW_FALSE@ -DINSTALL_DATADIR=\"@datadir@\" \
@MINGW_FALSE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
@MINGW_TRUE@libwebsockets_test_client_CFLAGS := -w \
@MINGW_TRUE@ -I../win32port/win32helpers -Wall -std=gnu99 \
@MINGW_TRUE@ -pedantic -DDATADIR=\"@datadir@\" \
@MINGW_TRUE@ -pedantic -DINSTALL_DATADIR=\"@datadir@\" \
@MINGW_TRUE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
@MINGW_FALSE@libwebsockets_test_server_extpoll_CFLAGS := -Werror -Wall \
@MINGW_FALSE@ -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" \
@MINGW_FALSE@ -std=gnu99 -pedantic \
@MINGW_FALSE@ -DINSTALL_DATADIR=\"@datadir@\" \
@MINGW_FALSE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
@MINGW_TRUE@libwebsockets_test_server_extpoll_CFLAGS := -w \
@MINGW_TRUE@ -I../win32port/win32helpers -Wall -std=gnu99 \
@MINGW_TRUE@ -pedantic -DDATADIR=\"@datadir@\" \
@MINGW_TRUE@ -pedantic -DINSTALL_DATADIR=\"@datadir@\" \
@MINGW_TRUE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
@MINGW_FALSE@libwebsockets_test_fraggle_CFLAGS := -Werror -Wall \
@MINGW_FALSE@ -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" \
@MINGW_FALSE@ -std=gnu99 -pedantic \
@MINGW_FALSE@ -DINSTALL_DATADIR=\"@datadir@\" \
@MINGW_FALSE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
@MINGW_TRUE@libwebsockets_test_fraggle_CFLAGS := -w \
@MINGW_TRUE@ -I../win32port/win32helpers -Wall -std=gnu99 \
@MINGW_TRUE@ -pedantic -DDATADIR=\"@datadir@\" \
@MINGW_TRUE@ -pedantic -DINSTALL_DATADIR=\"@datadir@\" \
@MINGW_TRUE@ -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
@NOPING_FALSE@libwebsockets_test_ping_SOURCES = test-ping.c
@NOPING_FALSE@libwebsockets_test_ping_LDADD = -L../lib -lwebsockets
@NOPING_FALSE@libwebsockets_test_ping_CFLAGS := -Wall -Werror -std=gnu99 -pedantic -DDATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
@NOPING_FALSE@libwebsockets_test_ping_CFLAGS := -Wall -Werror -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
all: all-am
.SUFFIXES:

2
test-server/test-fraggle.c
View file

@ -28,7 +28,7 @@
#include "../lib/libwebsockets.h"
#define LOCAL_RESOURCE_PATH DATADIR"/libwebsockets-test-server"
#define LOCAL_RESOURCE_PATH INSTALL_DATADIR"/libwebsockets-test-server"
static int client;
static int terminate;

2
test-server/test-server-extpoll.c
View file

@ -68,7 +68,7 @@ enum demo_protocols {
};
#define LOCAL_RESOURCE_PATH DATADIR"/libwebsockets-test-server"
#define LOCAL_RESOURCE_PATH INSTALL_DATADIR"/libwebsockets-test-server"
/* this protocol server (always the first one) just knows how to do HTTP */

2
test-server/test-server.c
View file

@ -57,7 +57,7 @@ enum demo_protocols {
};
#define LOCAL_RESOURCE_PATH DATADIR"/libwebsockets-test-server"
#define LOCAL_RESOURCE_PATH INSTALL_DATADIR"/libwebsockets-test-server"
/* this protocol server (always the first one) just knows how to do HTTP */

9
win32port/win32helpers/websock-w32.h
View file

@ -50,6 +50,13 @@ extern INT WSAAPI emulated_poll(LPWSAPOLLFD fdarray, ULONG nfds, INT timeout);
/* override configure because we are not using Makefiles */
#define LWS_NO_FORK
#define DATADIR "."
/* windows can't cope with this idea, needs assets in cwd */
#ifdef INSTALL_DATADIR
#undef INSTALL_DATADIR
#endif
#define INSTALL_DATADIR "."
#endif