fix libwebsocket build

bootstrap.sh

@@ -9,7 +9,7 @@ VERBOSE=false
 BASEDIR=`pwd`;
 LIBDIR=${BASEDIR}/libs;
 SUBDIRS="apr \
-  libzrtp ilbc curl iksemel js js/nsprpub ldns libdingaling libedit libsndfile pcre sofia-sip \
+  libzrtp ilbc curl iksemel js js/nsprpub ldns libdingaling libedit libsndfile pcre sofia-sip libwebsockets \
   speex sqlite srtp openzap freetdm spandsp libg722_1 portaudio unimrcp tiff-3.8.2 broadvoice silk libcodec2 \
   fs";
 

libs/libwebsockets/configure.ac

 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_PREREQ([2.66])
+
 AC_INIT(libwebsockets, 0.3, andy@warmcat.com)
+AM_INIT_AUTOMAKE(libwebsockets,0.3)
 AC_CONFIG_SRCDIR([test-server/test-server.c])
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
-LT_INIT(shared)
+#LT_INIT(shared)
 
 #AX_PTHREAD
 
@@ -16,7 +16,7 @@ AC_PROG_CC
 AC_PROG_INSTALL
 AC_PROG_MAKE_SET
 AC_CONFIG_MACRO_DIR([m4])
-
+AC_PROG_LIBTOOL
 
 #
 #

libs/libwebsockets/lib/Makefile.am

@@ -19,8 +19,8 @@ else
 dist_libwebsockets_la_SOURCES += md5.c sha-1.c
 endif
 
-libwebsockets_la_CFLAGS:=-Wall -std=gnu99 -pedantic
-libwebsockets_la_LDFLAGS:=
+libwebsockets_la_CFLAGS=-Wall -std=gnu99 -pedantic
+libwebsockets_la_LDFLAGS=
 
 if MINGW
 libwebsockets_la_CFLAGS+= -w -I../win32port/win32helpers -I ../win32port/zlib/

libs/libwebsockets/test-server/Makefile.am

@@ -9,10 +9,10 @@ libwebsockets_test_fraggle_SOURCES=test-fraggle.c
 libwebsockets_test_fraggle_LDADD=-L../lib -lwebsockets -lz
  
 if MINGW                                                                        
-libwebsockets_test_server_CFLAGS:= -w  -I../win32port/win32helpers
-libwebsockets_test_client_CFLAGS:= -w   -I../win32port/win32helpers
-libwebsockets_test_server_extpoll_CFLAGS:= -w  -I../win32port/win32helpers
-libwebsockets_test_fraggle_CFLAGS:= -w   -I../win32port/win32helpers
+libwebsockets_test_server_CFLAGS= -w  -I../win32port/win32helpers
+libwebsockets_test_client_CFLAGS= -w   -I../win32port/win32helpers
+libwebsockets_test_server_extpoll_CFLAGS= -w  -I../win32port/win32helpers
+libwebsockets_test_fraggle_CFLAGS= -w   -I../win32port/win32helpers
 
 libwebsockets_test_server_LDADD+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lws2_32 -lz
 libwebsockets_test_client_LDADD+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lws2_32 -lz 
@@ -20,10 +20,10 @@ libwebsockets_test_server_extpoll_LDADD+= -lm -luser32 -ladvapi32 -lkernel32 -lg
 libwebsockets_test_fraggle_LDADD+= -lm -luser32 -ladvapi32 -lkernel32 -lgcc -lws2_32 -lz
 
 else
-libwebsockets_test_server_CFLAGS:= -Werror
-libwebsockets_test_client_CFLAGS:= -Werror
-libwebsockets_test_server_extpoll_CFLAGS:= -Werror
-libwebsockets_test_fraggle_CFLAGS:= -Werror
+libwebsockets_test_server_CFLAGS= -Werror
+libwebsockets_test_client_CFLAGS= -Werror
+libwebsockets_test_server_extpoll_CFLAGS= -Werror
+libwebsockets_test_fraggle_CFLAGS= -Werror
 endif   
 
 libwebsockets_test_server_CFLAGS+= -Wall -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
@@ -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 -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
+libwebsockets_test_ping_CFLAGS= -Wall -Werror -std=gnu99 -pedantic -DINSTALL_DATADIR=\"@datadir@\" -DLWS_OPENSSL_CLIENT_CERTS=\"@clientcertdir@\"
 endif