Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Minor buildsys fixes #8

Merged
merged 3 commits into from

2 participants

@falconindy

Hi Grzegorz,

This is a small pull request to fix some dangling issues, including an error that I introduced with the last pull request. Apologies for that.

I'd also like to ask if you have any plans in the near future to do another release of fcgiwrap. I'd feel more comfortable packaging a tag than a git snapshot (for Arch Linux). That said, don't feel compelled to do a release just for me.

Thanks!

falconindy added some commits
@falconindy falconindy 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.
51bf869
@falconindy falconindy 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
8a8880f
@falconindy falconindy Correct invalid defintion in configuring systemd support
This was an unfortunate copypasta error that slipped in with 9836d6d.
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.
da630b8
@gnosek
Owner

Well, you can probably see that fcgiwrap is pretty much a finished project with not much to add to it ;) I guess I can make a point release gathering all the patches.

Still, I want fcgiwrap not to try to find the right files but rely on script_filename and path_info from the web server instead. That's much cleaner for basically all environments (except the one fcgiwrap was created for), so I guess I can live with an option and give the world a better interface ;)

I'm attending a conference next week and that's a good place to get things done, so I just might make two fcgiwrap releases: "stable" with the patches so far and "experimental" also including the change above.

@gnosek gnosek merged commit b9f03e6 into gnosek:master
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Aug 23, 2012
  1. @falconindy

    simplify build rule for fcgiwrap

    falconindy authored
    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.
Commits on Sep 8, 2012
  1. @falconindy

    Makefile.in: define dummy datarootdir variable

    falconindy authored
    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
  2. @falconindy

    Correct invalid defintion in configuring systemd support

    falconindy authored
    This was an unfortunate copypasta error that slipped in with 9836d6d.
    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.
This page is out of date. Refresh to see the latest.
Showing with 5 additions and 3 deletions.
  1. +4 −1 Makefile.in
  2. +1 −2  configure.ac
View
5 Makefile.in
@@ -1,5 +1,6 @@
targetdir = $(DESTDIR)@prefix@@sbindir@
man8dir = $(DESTDIR)@prefix@@mandir@/man8
+datarootdir =
.PHONY: clean distclean
@@ -15,8 +16,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:
View
3  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])])
Something went wrong with that request. Please try again.