Skip to content

Commit 9155cff

Browse files
author
Sebastiano Merlino
committed
Modified in order to solve perl wrapping problems
1 parent bae8e01 commit 9155cff

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

configure.ac

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ if test x$perl = xtrue; then
199199
AC_MSG_ERROR(perl interpreter not found)
200200
fi
201201
PERLINCLUDES="$PERLINCLUDES -I`perl -e 'use Config; print $Config{archlib};'`/CORE"
202-
PERLDEFINES="-Dbool=char -D_GNU_SOURCE"
202+
PERLDEFINES="-D_GNU_SOURCE"
203203
AC_SUBST(PERLINCLUDES)
204204
AC_SUBST(PERLDEFINES)
205205
AC_SUBST_FILE([PERL_AUTOGENERATION])

src/perl/Makefile.am

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ lib_LTLIBRARIES = libhttpserver_perl.la
2323
libhttpserver_perl_la_LIBADD = -lmicrohttpd
2424
libhttpserver_perl_la_SOURCES = WebserverWrap.cpp $(top_srcdir)/src/Webserver.cpp $(top_srcdir)/src/HttpUtils.cpp $(top_srcdir)/src/HttpEndpoint.cpp $(top_srcdir)/src/HttpResource.cpp $(top_srcdir)/src/HttpRequest.cpp $(top_srcdir)/src/HttpResponse.cpp $(top_srcdir)/src/string_utilities.cpp
2525
libhttpserver_perl_la_includedir =
26-
libhttpserver_perl_la_include_HEADERS = libhttpserver_perl.pl
26+
libhttpserver_perl_la_include_HEADERS =
2727

2828
language=perl
2929
swigoptions=-Wall

src/ruby/Makefile.am

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@
1818

1919
METASOURCES = AUTO
2020
lib_LTLIBRARIES = libhttpserver_ruby.la
21-
noinst_LIBRARIES = libHttpEndpoint.a libstring_utilities.a
22-
libHttpEndpoint_a_SOURCES = $(top_srcdir)/src/HttpEndpoint.cpp
23-
libHttpEndpoint_a_CPPFLAGS = -I../ -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver
24-
libstring_utilities_a_SOURCES = $(top_srcdir)/src/string_utilities.cpp
25-
libstring_utilities_a_CPPFLAGS = -I../ -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver
26-
libhttpserver_ruby_la_LIBADD = -lmicrohttpd libHttpEndpoint.a libstring_utilities.a
21+
noinst_LIBRARIES = libsupport.a
22+
libsupport_a_SOURCES = $(top_srcdir)/src/HttpEndpoint.cpp $(top_srcdir)/src/string_utilities.cpp
23+
libsupport_a_CPPFLAGS = -I../ -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver
24+
libhttpserver_ruby_la_LIBADD = -lmicrohttpd libsupport.a
2725
libhttpserver_ruby_la_SOURCES = WebserverWrap.cpp $(top_srcdir)/src/Webserver.cpp $(top_srcdir)/src/HttpUtils.cpp $(top_srcdir)/src/HttpResource.cpp $(top_srcdir)/src/HttpRequest.cpp $(top_srcdir)/src/HttpResponse.cpp
2826
libhttpserver_ruby_la_CPPFLAGS = -I../ -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver $(RUBYINCLUDES) $(RUBYDEFINES)
2927
libhttpserver_ruby_la_includedir =

0 commit comments

Comments
 (0)