Fixed build on Ubuntu 12.04 Presice

avm · May 17, 2012 · fdbbfe1 · fdbbfe1
1 parent f169593
commit fdbbfe1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I config
 AUTOMAKE_OPTIONS = 1.9 foreign
 
 SUBDIRS = include library main example syslog request-cache statistics file-logger

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+fastcgi-daemon2 (2.10-11) unstable; urgency=low
+
+  * Fixed build on Ubuntu 12.04 Presice
+
+ -- Anton Kortunov <toshic@yandex-team.ru>  Thu, 17 May 2012 15:54:56 +0400
+
 fastcgi-daemon2 (2.10-10) unstable; urgency=low
 
   * getContentLength method fixed in case of exceptions

diff --git a/library/Makefile.am b/library/Makefile.am
@@ -8,4 +8,4 @@ libfastcgi_daemon2_la_SOURCES = component.cpp config.cpp cookie.cpp except.cpp \
 
 AM_CPPFLAGS = -I../include -I../config @xml_CFLAGS@
 AM_CXXFLAGS = -pthread
-AM_LDFLAGS = -lpthread -ldl -lfcgi -lfcgi++ -lssl @BOOST_LDFLAGS@ @BOOST_THREAD_LDFLAGS@ @BOOST_REGEX_LDFLAGS@ @xml_LIBS@
+AM_LDFLAGS = -lpthread -ldl -lfcgi -lfcgi++ -lssl -lcrypto @BOOST_LDFLAGS@ @BOOST_THREAD_LDFLAGS@ @BOOST_REGEX_LDFLAGS@ @xml_LIBS@
diff --git a/main/Makefile.am b/main/Makefile.am
@@ -1,7 +1,7 @@
 sbin_PROGRAMS = fastcgi-daemon2
 
 fastcgi_daemon2_SOURCES = main.cpp fcgi_server.cpp endpoint.cpp fcgi_request.cpp
-fastcgi_daemon2_LDADD = ../library/libfastcgi-daemon2.la
+fastcgi_daemon2_LDADD = ../library/libfastcgi-daemon2.la -lfcgi -lfcgi++
 
 AM_CPPFLAGS = -I@top_srcdir@/include -I@top_srcdir@/config
 AM_LDFLAGS = @BOOST_THREAD_LDFLAGS@