diff options
| author |  Dan Dennedy
| 2008-04-22 10:51:50 -0700 |
|---|---|---|
| committer | Dan Dennedy
| 2008-04-22 10:51:50 -0700 |
| commit | 7c4d4970543f1829e783cc2bea2421913cc23a04 (patch) | |
| tree | 96697b7ba341760df6f5bf745a102938d509a9bc /configure.ac | |
| parent | Merge branch 'master' of dennedy.org:git/dennedy.org/libraw1394 (diff) | |
| parent | Set handle->iso.packets to NULL after freeing to avoid double-frees. (diff) | |
Merge commit 'krh/juju'
Conflicts:
configure.ac
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index fe9ffcd..28ddacb 100644 --- a/configure.ac +++ b/configure.ac @@ -28,7 +28,28 @@ dnl Check to see if valgrind is available AC_ARG_WITH(valgrind, AC_HELP_STRING([--with-valgrind],[compile with valgrind support])) if test x$with_valgrind = xyes ; then AC_CHECK_HEADERS(valgrind/valgrind.h) + +AC_ARG_WITH(juju-dir,[ --with-juju-dir=<dir> Path to juju include files]) +if ! test -z "$with_juju_dir" ; then + JUJU_DIR="$with_juju_dir" + LIB_SUBDIR=juju + AC_SUBST(JUJU_DIR) +else + LIB_SUBDIR=src fi +AC_SUBST(LIB_SUBDIR) + +AC_ARG_WITH(fw-device-prefix, + [ --with-fw-device-prefix=<prefix> Prefix of firewire device file names (default "fw").], + [FW_DEVICE_PREFIX="\"$withval\""], [FW_DEVICE_PREFIX="\"fw\""]) +AC_ARG_WITH(fw-device-dir, + [ --with-fw-device-dir=<dir> Directory to watch for firewire device files (default "/dev").], + [FW_DEVICE_DIR="\"$withval\""], [FW_DEVICE_DIR="\"/dev\""]) + +AC_DEFINE_UNQUOTED(FW_DEVICE_PREFIX, $FW_DEVICE_PREFIX, + [Prefix of firewire device file names.]) +AC_DEFINE_UNQUOTED(FW_DEVICE_DIR, $FW_DEVICE_DIR, + [Directory to watch for firewire device files.]) #CFLAGS=${CFLAGS:-"-Wall"} AC_OUTPUT([ @@ -36,6 +57,7 @@ Makefile libraw1394.pc libraw1394.spec src/Makefile +juju/Makefile tools/Makefile doc/Makefile doc/testlibraw.1 |