diff options
| author |  Dan Dennedy
| 2009-06-18 23:15:19 -0700 |
|---|---|---|
| committer | Dan Dennedy
| 2009-06-18 23:15:19 -0700 |
| commit | cc16f4ddbe4e706041845d40270a6011a62e4c56 (patch) | |
| tree | 5a62c69a4a0d5956fafb91119b7f4dee2c487994 | |
| parent | Match only /dev/fw[0-9]* as firewire-core device files (diff) | |
Fix build always expecting FW_DIR.
Date: Sun, 14 Jun 2009 11:51:33 +0100
From: Mike Auty <mike.auty@gmail.com>
Subject: [patch libraw1394-2] src/makefile.am expects FW_DIR to be set,
but configure only sets it if given --with-fw-dir
Here's a very small patch for the configure system of
libraw1394-2.0.{0,1,2}. At the moment, if configure is called without
--with-fw-dir, then FW_DIR doesn't get specified. The Makefile includes
the line INCLUDES=-I$(FW_DIR) and so in the compilation we get a -I not
followed by anything sensible. That can cause compilation issues in
certain circumstances (see Gentoo bug 272540), so this patch ensures
that INCLUDES is only set if --with-fw-dir was specified.
Please let me know if there's any problems with the patch or if I've
submitted it to the wrong place or in the wrong way. Thanks...
Mike 5:)
[1] http://bugs.gentoo.org/272540
Signed-off-by: Dan Dennedy <dan@dennedy.org>
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 498ba0a..86f0a63 100644 --- a/configure.ac +++ b/configure.ac @@ -35,6 +35,7 @@ if ! test -z "$with_fw_dir" ; then FW_DIR="$with_fw_dir" AC_SUBST(FW_DIR) fi +AM_CONDITIONAL([WITH_FW_DIR], [! test -z "$with_fw_dir"]) AC_ARG_WITH(fw-device-prefix, [ --with-fw-device-prefix=<prefix> Prefix of firewire device file names (default "fw").], diff --git a/src/Makefile.am b/src/Makefile.am index a62df10..79ee407 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,7 +6,11 @@ lib_LTLIBRARIES = libraw1394.la libraw1394_la_LDFLAGS = -version-info @lt_major@:@lt_revision@:@lt_age@ +if WITH_FW_DIR INCLUDES = -I$(FW_DIR) +else +INCLUDES = +endif libraw1394_la_SOURCES = \ main.c \ |