Modified in order to move httpserver.h to httpserver.hpp

Author: Sebastiano Merlino

configure.ac

@@ -29,6 +29,7 @@ OLD_CXXFLAGS=$CXXFLAGS
 AC_PROG_LIBTOOL
 AC_PROG_CC
 AC_PROG_CXX
+AC_PROG_LN_S
 CXXFLAGS=$OLD_CXXFLAGS
 AC_LANG([C++])
 

src/Makefile.am

@@ -21,7 +21,13 @@ METASOURCES = AUTO
 lib_LTLIBRARIES = libhttpserver.la
 libhttpserver_la_SOURCES = string_utilities.cpp Webserver.cpp HttpUtils.cpp HttpEndpoint.cpp HttpRequest.cpp HttpResponse.cpp HttpResource.cpp
 noinst_HEADERS = httpserver/string_utilities.hpp gettext.h
-nobase_include_HEADERS = httpserver.h httpserver/Webserver.hpp httpserver/HttpUtils.hpp httpserver/HttpEndpoint.hpp httpserver/HttpRequest.hpp httpserver/HttpResponse.hpp httpserver/HttpResource.hpp
+nobase_include_HEADERS = httpserver.hpp httpserver/Webserver.hpp httpserver/HttpUtils.hpp httpserver/HttpEndpoint.hpp httpserver/HttpRequest.hpp httpserver/HttpResponse.hpp httpserver/HttpResource.hpp
 AM_CXXFLAGS += -fPIC -Wall
 libhttpserver_la_LIBADD = -lmicrohttpd
 libhttpserver_la_LDFLAGS =
+
+install-exec-hook:
+	(cd $(DESTDIR)$(includedir) && $(LN_S) httpserver.hpp httpserverpp)
+
+uninstall-hook:
+	(cd $(DESTDIR)$(includedir) && rm -f httpserverpp)

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: $(srcdir)/../httpserver.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)/.. -I$(srcdir)/../httpserver $(srcdir)/../httpserver.h
+$(srcdir)/WebserverWrap.cpp $(srcdir)/WebserverWrap.h: $(srcdir)/../httpserver.hpp $(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)/.. -I$(srcdir)/../httpserver $(srcdir)/../httpserver.hpp

src/httpserver.h src/httpserver.hppsrc/httpserver.h renamed to src/httpserver.hpp

@@ -1,5 +1,5 @@
-#ifndef _httpserver_h_
-#define _httpserver_h_
+#ifndef _httpserver_hpp_
+#define _httpserver_hpp_
 
 #ifdef SWIG
 %include "std_string.i"

test/Test.hpp

@@ -1,6 +1,6 @@
 #ifndef _TEST_HPP_
 #define _TEST_HPP_
-#include <httpserver.h>
+#include <httpserver.hpp>
 
 using namespace httpserver;