Adjusted in order to avoid errors in building swig

Added partial GUILE language support
Modified doxygen documentation layout

Author: Sebastiano Merlino

Diff for: Makefile.am

@@ -20,8 +20,8 @@
 # have all needed files, that a GNU package needs
 AUTOMAKE_OPTIONS = foreign 1.4
 
-SUBDIRS = src $(PYTHON_DIR) $(JAVA_DIR) $(PHP_DIR) $(LUA_DIR) $(PERL_DIR) $(RUBY_DIR)
-DIST_SUBDIRS = src $(PYTHON_DIR) $(JAVA_DIR) $(PHP_DIR) $(LUA_DIR) $(PERL_DIR) $(RUBY_DIR)
+SUBDIRS = src $(PYTHON_DIR) $(JAVA_DIR) $(PHP_DIR) $(LUA_DIR) $(PERL_DIR) $(RUBY_DIR) $(GUILE_DIR)
+DIST_SUBDIRS = src $(PYTHON_DIR) $(JAVA_DIR) $(PHP_DIR) $(LUA_DIR) $(PERL_DIR) $(RUBY_DIR) $(GUILE_DIR)
 EXTRA_DIST = libhttpserver.pc.in
 
 pkgconfigdir = $(libdir)/pkgconfig
@@ -50,3 +50,7 @@ endif
 if RUBY
 RUBY_DIR = src/ruby
 endif
+
+if GUILE
+GUILE_DIR = src/guile
+endif

Diff for: configure.ac

@@ -51,23 +51,23 @@ LHT_LIBDEPS="-lmicrohttpd"
 
 AC_ARG_WITH([python],
      [  --with-python    Compile PYTHON libraries],
-     [python=true])
+     [python=true; swig=true])
 
 AC_ARG_WITH([php],
      [  --with-php    Compile PHP libraries],
-     [php=true])
+     [php=true; swig=true])
 
 AC_ARG_WITH([ruby],
 	 [  --with-ruby   Compile RUBY libraries],
-	 [ruby=true])
+	 [ruby=true; swig=true])
 
 AC_ARG_WITH([perl],
 	 [  --with-perl   Compile PERL libraries],
-	 [perl=true])
+	 [perl=true; swig=true])
 
 AC_ARG_WITH([lua],
 	 [  --with-lua   Compile LUA libraries],
-	 [lua=true])
+	 [lua=true; swig=true])
 
 AC_ARG_WITH(lua-include-dir,
             [  --with-lua-include-dir=DIR        where to look for lua headers],
@@ -81,7 +81,7 @@ AC_ARG_WITH(lua-include-dir,
 
 AC_ARG_WITH([java],
      [  --with-java    Compile JAVA libraries],
-     [java=true])
+     [java=true; swig=true])
 
 AC_ARG_WITH(java-dir,
             [  --with-java-dir=DIR        where to look for jni headers and libs. We search for jni.h in 'java-dir/include/'],
@@ -93,6 +93,10 @@ AC_ARG_WITH(java-dir,
                 fi
            ])
 
+AC_ARG_WITH([guile],
+     [  --with-guile    Compile GUILE libraries],
+     [guile=true; swig=true])
+
 AC_ARG_WITH(doc,
             [  --with-doc   Compile DOC],
             [doc=true])
@@ -103,12 +107,21 @@ AM_CONDITIONAL([PHP], [test x$php = xtrue])
 AM_CONDITIONAL([PERL], [test x$perl = xtrue])
 AM_CONDITIONAL([LUA], [test x$lua = xtrue])
 AM_CONDITIONAL([RUBY], [test x$ruby = xtrue])
+AM_CONDITIONAL([GUILE], [test x$guile = xtrue])
 AM_CONDITIONAL([DOC], [test x$doc = xtrue])
 
 LANGUAGES="C++"
 
+if test x$swig = xtrue; then
+	AC_CHECK_PROG([SWIG], [swig], ["yes"], ["no"])
+	if test "SWIG" = "no"
+	then
+		AC_MSG_ERROR(swig not found)
+	fi
+fi
+
 if test x$python = xtrue; then
-	AC_CHECK_PROG([PYTHONCONFIG],[python-config],["php-config"], ["no"])
+	AC_CHECK_PROG([PYTHONCONFIG],[python-config],["yes"], ["no"])
 	if test "$PYTHONCONFIG" = "no"
 	then
 		AC_MSG_ERROR(python-config not found)
@@ -122,7 +135,7 @@ if test x$python = xtrue; then
     AC_SUBST(PYLDFLAGS)
     AC_SUBST(PYLIBS)
 	AC_SUBST_FILE([PYTHON_AUTOGENERATION])
-	PYTHON_AUTOGENERATION=src/autogen_helpers/support_command
+	PYTHON_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
 	LANGUAGES="$LANGUAGES Python"
 fi 
 
@@ -152,12 +165,12 @@ if test x$java = xtrue; then
     AC_SUBST(JAVALDFLAGS)
     AC_SUBST(JABALIBS)
 	AC_SUBST_FILE([JAVA_AUTOGENERATION])
-	JAVA_AUTOGENERATION=src/autogen_helpers/support_command
+	JAVA_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
 	LANGUAGES="$LANGUAGES Java"
 fi 
 
 if test x$php = xtrue; then
-	AC_CHECK_PROG([PHPCONFIG],[php-config],["php-config"], ["no"])
+	AC_CHECK_PROG([PHPCONFIG],[php-config],["yes"], ["no"])
 	if test "$PHPCONFIG" = "no"
 	then
 		AC_MSG_ERROR(php-config not found)
@@ -167,7 +180,7 @@ if test x$php = xtrue; then
     AC_SUBST(PHPINCLUDES)
     AC_SUBST(PHPLDFLAGS)
 	AC_SUBST_FILE([PHP_AUTOGENERATION])
-	PHP_AUTOGENERATION=src/autogen_helpers/support_command
+	PHP_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
 	LANGUAGES="$LANGUAGES PHP"
 fi 
 
@@ -193,12 +206,12 @@ if test x$lua = xtrue; then
 	fi
     AC_SUBST(LUAINCLUDES)
 	AC_SUBST_FILE([LUA_AUTOGENERATION])
-	LUA_AUTOGENERATION=src/autogen_helpers/support_command
+	LUA_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
 	LANGUAGES="$LANGUAGES LUA"
 fi
 
 if test x$perl = xtrue; then
-	AC_CHECK_PROG([PERLINT],[perl],["perl"], ["no"])
+	AC_CHECK_PROG([PERLINT],[perl],["yes"], ["no"])
 	if test "$PERLINT" = "no"
 	then
 		AC_MSG_ERROR(perl interpreter not found)
@@ -208,12 +221,12 @@ if test x$perl = xtrue; then
     AC_SUBST(PERLINCLUDES)
     AC_SUBST(PERLDEFINES)
 	AC_SUBST_FILE([PERL_AUTOGENERATION])
-	PERL_AUTOGENERATION=src/autogen_helpers/support_command
+	PERL_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
 	LANGUAGES="$LANGUAGES Perl"
 fi
 
 if test x$ruby = xtrue; then
-	AC_CHECK_PROG([RUBYINT],[ruby],["ruby"], ["no"])
+	AC_CHECK_PROG([RUBYINT],[ruby],["yes"], ["no"])
     RUBYINCLUDES=""
 	if test "$RUBYINT" = "no"
 	then
@@ -238,10 +251,21 @@ if test x$ruby = xtrue; then
     AC_SUBST(RUBYINCLUDES)
     AC_SUBST(RUBYDEFINES)
 	AC_SUBST_FILE([RUBY_AUTOGENERATION])
-	RUBY_AUTOGENERATION=src/autogen_helpers/support_command
+	RUBY_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
 	LANGUAGES="$LANGUAGES Ruby"
 fi
 
+if test x$guile = xtrue; then
+	AC_CHECK_PROG([GUILEINT],[guile],["yes"], ["no"])
+	if test "$GUILEINT" = "no"
+	then
+		AC_MSG_ERROR(guile interpreter not found)
+	fi
+	AC_SUBST_FILE([GUILE_AUTOGENERATION])
+	GUILE_AUTOGENERATION=$srcdir/src/autogen_helpers/support_command
+	LANGUAGES="$LANGUAGES Guile"
+fi
+
 AC_SUBST(LHT_LIBDEPS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LIBS)
@@ -250,7 +274,7 @@ AC_SUBST(EXT_LIB_PATH)
 AC_SUBST(EXT_LIBS)
 
 AC_OUTPUT(
-	  libhttpserver.pc Makefile src/Makefile src/python/Makefile src/java/Makefile src/php/Makefile src/lua/Makefile src/perl/Makefile src/ruby/Makefile
+	  libhttpserver.pc Makefile src/Makefile src/python/Makefile src/java/Makefile src/php/Makefile src/lua/Makefile src/perl/Makefile src/ruby/Makefile src/guile/Makefile
 )
 
 AC_MSG_NOTICE([Configuration Summary:  

Diff for: doxyconfig

@@ -25,7 +25,7 @@ DOXYFILE_ENCODING      = UTF-8
 # The PROJECT_NAME tag is a single word (or a sequence of words surrounded
 # by quotes) that should identify the project.
 
-PROJECT_NAME           = Distributed Systems Project
+PROJECT_NAME           = libhttpserver
 
 # The PROJECT_NUMBER tag can be used to enter a project or revision number.
 # This could be handy for archiving the generated documentation or
@@ -47,7 +47,7 @@ OUTPUT_DIRECTORY       = doc
 # source files, where putting all generated files in the same directory would
 # otherwise cause performance problems for the file system.
 
-CREATE_SUBDIRS         = NO
+CREATE_SUBDIRS         = YES
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
@@ -99,7 +99,7 @@ ALWAYS_DETAILED_SEC    = NO
 # members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
 
-INLINE_INHERITED_MEMB  = NO
+INLINE_INHERITED_MEMB  = YES
 
 # If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
 # path before files name in the file list and in the header files. If set
@@ -581,7 +581,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories
 # with spaces.
 
-INPUT                  = src
+INPUT                  = src/httpserver
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -598,7 +598,7 @@ INPUT_ENCODING         = UTF-8
 # *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
 # *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
 
-FILE_PATTERNS          = *.cpp *.hpp
+FILE_PATTERNS          = *.hpp
 
 # The RECURSIVE tag can be used to turn specify whether or not subdirectories
 # should be searched for input files as well. Possible values are YES and NO.
@@ -697,12 +697,12 @@ FILTER_SOURCE_FILES    = YES
 # Note: To get rid of all source code in the generated output, make sure also
 # VERBATIM_HEADERS is set to NO.
 
-SOURCE_BROWSER         = NO
+SOURCE_BROWSER         = YES
 
 # Setting the INLINE_SOURCES tag to YES will include the body
 # of functions and classes directly in the documentation.
 
-INLINE_SOURCES         = NO
+INLINE_SOURCES         = YES
 
 # Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
 # doxygen to hide any special comment blocks from generated source code
@@ -1213,7 +1213,7 @@ RTF_EXTENSIONS_FILE    =
 # If the GENERATE_MAN tag is set to YES (the default) Doxygen will
 # generate man pages
 
-GENERATE_MAN           = NO
+GENERATE_MAN           = YES
 
 # The MAN_OUTPUT tag is used to specify where the man pages will be put.
 # If a relative path is entered the value of OUTPUT_DIRECTORY will be
@@ -1232,7 +1232,7 @@ MAN_EXTENSION          = .3
 # only source the real man page, but without them the man command
 # would be unable to find the correct page. The default is NO.
 
-MAN_LINKS              = NO
+MAN_LINKS              = YES
 
 #---------------------------------------------------------------------------
 # configuration options related to the XML output
@@ -1551,7 +1551,7 @@ CALL_GRAPH             = YES
 # the time of a run. So in most cases it will be better to enable caller
 # graphs for selected functions only using the \callergraph command.
 
-CALLER_GRAPH           = NO
+CALLER_GRAPH           = YES
 
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
 # will graphical hierarchy of all classes instead of a textual one.

Diff for: src/autogen_helpers/support_command

@@ -16,5 +16,5 @@
 #     License along with this library; if not, write to the Free Software
 #     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #
-$(srcdir)/WebserverWrap.cpp $(srcdir)/WebserverWrap.h: $(top_srcdir)/src/httpserver/Webserver.hpp $(top_srcdir)/src/httpserver/HttpResponse.hpp $(top_srcdir)/src/httpserver/HttpRequest.hpp $(top_srcdir)/src/httpserver/HttpResource.hpp $(top_srcdir)/src/httpserver/HttpEndpoint.hpp $(top_srcdir)/src/httpserver/HttpUtils.hpp
+$(srcdir)/WebserverWrap.cpp $(srcdir)/WebserverWrap.h: $(srcdir)/../httpserver/Webserver.hpp $(srcdir)/../httpserver/HttpResponse.hpp $(srcdir)/../httpserver/HttpRequest.hpp $(srcdir)/../httpserver/HttpResource.hpp $(srcdir)/../httpserver/HttpEndpoint.hpp $(srcdir)/../httpserver/HttpUtils.hpp
 	swig -c++ -$(language) $(swigoptions) -o $(srcdir)/WebserverWrap.cpp -I$(srcdir)/.. $(srcdir)/../httpserver/Webserver.hpp

Diff for: src/guile/Makefile.am

@@ -0,0 +1,29 @@
+#
+#     This file is part of libhttpserver
+#     Copyright (C) 2011 Sebastiano Merlino
+#
+#     This library is free software; you can redistribute it and/or
+#     modify it under the terms of the GNU Lesser General Public
+#     License as published by the Free Software Foundation; either
+#     version 2.1 of the License, or (at your option) any later version.
+#
+#     This library is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+#     Lesser General Public License for more details.
+#
+#     You should have received a copy of the GNU Lesser General Public
+#     License along with this library; if not, write to the Free Software
+#     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+INCLUDES = -I../ -I$(top_srcdir)/src -I$(top_srcdir)/src/httpserver
+METASOURCES = AUTO
+lib_LTLIBRARIES = libhttpserver_guile.la
+libhttpserver_guile_la_LIBADD = -lmicrohttpd
+libhttpserver_guile_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_guile_la_includedir = 
+libhttpserver_guile_la_include_HEADERS =
+
+language=guile
+swigoptions=-Wall
+@GUILE_AUTOGENERATION@

Diff for: src/httpserver/Webserver.hpp

@@ -77,6 +77,18 @@ namespace std {
 	%feature("director") HttpUtils;
 #endif
 
+#ifdef SWIGGUILE
+	%module(directors="1") libhttpserver_guile
+	%include "typemaps.i"
+	%include "cpointer.i"
+	%feature("director") Webserver;
+	%feature("director") HttpRequest;
+	%feature("director") HttpResponse;
+	%feature("director") HttpResource;
+	%feature("director") HttpEndpoint;
+	%feature("director") HttpUtils;
+#endif
+
 #ifdef SWIGLUA
 	%module(directors="1") libhttpserver_lua
 	%include "typemaps.i"

Diff for: src/httpserver/string_utilities.hpp

@@ -28,6 +28,12 @@ namespace httpserver
 namespace string_utilities
 {
 
+/**
+ * Function used to convert a string to its uppercase version.
+ * It generates a new string in output
+ * @param str The string to turn uppercase
+ * @return a string that is the uppercase version of the previous
+**/
 std::string to_upper_copy(std::string str);
 std::string to_lower_copy(std::string str);
 std::vector<std::string> string_split(std::string s, char sep);