From 1926211300280e94560a52a62d2fe0459cd4a571 Mon Sep 17 00:00:00 2001
From: Furkan Sahin <furkan-dev@proton.me>
Date: Thu, 23 Aug 2012 01:05:40 -0400
Subject: simplify build rule for fcgiwrap

Add flags and libraries to the respective environment vars and let make
figure out the order on its own. This provides support for unmentioned
vars such as LDFLAGS implicitly, as the compilation rule isn't
explicitly defined.
---
 Makefile.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 647d98b..40ccf5d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,8 +15,10 @@ ifneq ("@systemdsystemunitdir@", "")
 	install -m 644 systemd/fcgiwrap.service $(DESTDIR)@systemdsystemunitdir@
 endif
 
+LDLIBS = -lfcgi @systemd_LIBS@
+CFLAGS = @AM_CFLAGS@
+
 fcgiwrap: fcgiwrap.c
-	@CC@ @AM_CFLAGS@ fcgiwrap.c -o fcgiwrap -lfcgi @systemd_LIBS@ @LDFLAGS@
 
 #>+ 21
 clean:
-- 
cgit v1.2.3


From 7c5d088f61db48ad405e2f59a5cebec6658c66f4 Mon Sep 17 00:00:00 2001
From: Furkan Sahin <furkan-dev@proton.me>
Date: Sat, 8 Sep 2012 12:38:05 -0400
Subject: Makefile.in: define dummy datarootdir variable

This suppresses a warning on ./configure for a directory which fcgiwrap
does not use:

  config.status: WARNING:  'Makefile.in' seems to ignore the --datarootdir
  setting
---
 Makefile.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile.in b/Makefile.in
index 40ccf5d..97378e5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,6 @@
 targetdir = $(DESTDIR)@prefix@@sbindir@
 man8dir = $(DESTDIR)@prefix@@mandir@/man8
+datarootdir =
 
 .PHONY:	clean distclean
 
-- 
cgit v1.2.3


From b3e5a9f43abf1791ce38527068500e6ab6608bfb Mon Sep 17 00:00:00 2001
From: Furkan Sahin <furkan-dev@proton.me>
Date: Sat, 8 Sep 2012 12:40:29 -0400
Subject: Correct invalid defintion in configuring systemd support

This was an unfortunate copypasta error that slipped in with ba06d8a8c.
The HAVE_SYSTEMD macro should only be defined based on the presence of
the library, not the unit files, since the units are useless without the
library support.
---
 configure.ac | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 296ea75..b37ffd1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,7 @@ if test "x$with_systemd" != "xno"; then
     AC_MSG_ERROR([systemd support requested but libraries not found])
   fi
 fi
-AM_CONDITIONAL(HAVE_LIBSSL, [test "x$have_systemd" = "xyes"])
+AM_CONDITIONAL(HAVE_SYSTEMD, [test "x$have_systemd" = "xyes"])
 
 AC_ARG_WITH([systemdsystemunitdir],
         AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
@@ -44,7 +44,6 @@ AC_ARG_WITH([systemdsystemunitdir],
 if test "x$with_systemdsystemunitdir" != xno -a "x$have_systemd" != xno; then
         AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
 fi
-AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
 
 # Checks for header files.
 AC_CHECK_HEADERS([fcntl.h],, [AC_MSG_ERROR([fcntl.h header missing])])
-- 
cgit v1.2.3