diff options
| author | Grzegorz Nosek <root@localdomain.pl> | 2012-09-08 23:29:02 -0700 |
|---|---|---|
| committer | Grzegorz Nosek <root@localdomain.pl> | 2012-09-08 23:29:02 -0700 |
| commit | b9f03e63779df844e7bc52b210de19116ab9d587 (patch) | |
| tree | 236443db2c33a454cefe55a0ae3f33c59e5091e7 | |
| parent | a7e3d397bad337d59519fa69eafee7ca1d83d551 (diff) | |
| parent | da630b8b4f0112916f915bca06bbdac7a7a95628 (diff) | |
| download | fcgiwrap-b9f03e63779df844e7bc52b210de19116ab9d587.tar.xz fcgiwrap-b9f03e63779df844e7bc52b210de19116ab9d587.zip | |
Merge pull request #8 from falconindy/master
Minor buildsys fixes
| -rw-r--r-- | Makefile.in | 5 | ||||
| -rw-r--r-- | configure.ac | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/Makefile.in b/Makefile.in index 647d98b..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 @@ -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: 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])]) |