Modified in order to solve perl wrapping problems

Sebastiano Merlino · Sebastiano Merlino · commit 9155cff72816 · 2012-03-03T23:17:45.000+01:00
diff --git a/configure.ac b/configure.ac
@@ -199,7 +199,7 @@ if test x$perl = xtrue; then
 		AC_MSG_ERROR(perl interpreter not found)
 	fi
 	PERLINCLUDES="$PERLINCLUDES -I`perl -e 'use Config; print $Config{archlib};'`/CORE"
-    PERLDEFINES="-Dbool=char -D_GNU_SOURCE"
+    PERLDEFINES="-D_GNU_SOURCE"
     AC_SUBST(PERLINCLUDES)
     AC_SUBST(PERLDEFINES)
 	AC_SUBST_FILE([PERL_AUTOGENERATION])
diff --git a/src/perl/Makefile.am b/src/perl/Makefile.am
@@ -23,7 +23,7 @@ lib_LTLIBRARIES = libhttpserver_perl.la
 libhttpserver_perl_la_LIBADD = -lmicrohttpd
 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
 libhttpserver_perl_la_includedir = 
-libhttpserver_perl_la_include_HEADERS = libhttpserver_perl.pl
+libhttpserver_perl_la_include_HEADERS =
 
 language=perl
 swigoptions=-Wall
diff --git a/src/ruby/Makefile.am b/src/ruby/Makefile.am
@@ -18,12 +18,10 @@
 
 METASOURCES = AUTO
 lib_LTLIBRARIES = libhttpserver_ruby.la
-noinst_LIBRARIES = libHttpEndpoint.a libstring_utilities.a
-libHttpEndpoint_a_SOURCES = $(top_srcdir)/src/HttpEndpoint.cpp
-libHttpEndpoint_a_CPPFLAGS = -I../ -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver
-libstring_utilities_a_SOURCES = $(top_srcdir)/src/string_utilities.cpp
-libstring_utilities_a_CPPFLAGS = -I../ -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver
-libhttpserver_ruby_la_LIBADD = -lmicrohttpd libHttpEndpoint.a libstring_utilities.a
+noinst_LIBRARIES = libsupport.a
+libsupport_a_SOURCES = $(top_srcdir)/src/HttpEndpoint.cpp $(top_srcdir)/src/string_utilities.cpp
+libsupport_a_CPPFLAGS = -I../ -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver
+libhttpserver_ruby_la_LIBADD = -lmicrohttpd libsupport.a
 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
 libhttpserver_ruby_la_CPPFLAGS = -I../ -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver $(RUBYINCLUDES) $(RUBYDEFINES)
 libhttpserver_ruby_la_includedir = 
