Skip to content

Commit

Permalink
added: check for spidev.h in configure
Browse files Browse the repository at this point in the history
  • Loading branch information
bob.loosen committed Nov 12, 2012
1 parent 55a229d commit a246589
Show file tree
Hide file tree
Showing 4 changed files with 74 additions and 27 deletions.
9 changes: 2 additions & 7 deletions INSTALL
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
Installation Instructions
*************************

Copyright (C) 1994-1996, 1999-2002, 2004-2011 Free Software Foundation,
Inc.
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
2006, 2007, 2008, 2009 Free Software Foundation, Inc.

Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
Expand Down Expand Up @@ -226,11 +226,6 @@ order to use an ANSI C compiler:

and if that doesn't work, install pre-built binaries of GCC for HP-UX.

HP-UX `make' updates targets which have the same time stamps as
their prerequisites, which makes it generally unusable when shipped
generated files such as `configure' are involved. Use GNU `make'
instead.

On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
parse its `<wchar.h>' header file. The option `-nodtk' can be used as
a workaround. If GNU CC is not installed, it is therefore recommended
Expand Down
3 changes: 3 additions & 0 deletions config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@
/* */
#undef HAVE_LIBXRENDER

/* Define to 1 if you have the <linux/spi/spidev.h> header file. */
#undef HAVE_LINUX_SPI_SPIDEV_H

/* Define to 1 if you have the <linux/videodev2.h> header file. */
#undef HAVE_LINUX_VIDEODEV2_H

Expand Down
82 changes: 62 additions & 20 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -751,6 +751,8 @@ HAVE_OPENGL_FALSE
HAVE_OPENGL_TRUE
HAVE_X11_FALSE
HAVE_X11_TRUE
HAVE_SPI_FALSE
HAVE_SPI_TRUE
HAVE_LIBUSB_FALSE
HAVE_LIBUSB_TRUE
HAVE_PORTAUDIO_FALSE
Expand Down Expand Up @@ -883,6 +885,7 @@ with_gnu_ld
enable_libtool_lock
with_portaudio
with_libusb
with_spi
with_x11
with_opengl
with_ffmpeg
Expand Down Expand Up @@ -1539,6 +1542,7 @@ Optional Packages:
--without-portaudio Disable portaudio support (no support for sound
devices)
--without-libusb Disable libusb support (no support for iBeLight)
--without-spi Disable spi support (no support for LPD8806)
--without-x11 Disable x11 support
--without-opengl Disable opengl support (boblight-X11 will not be
able to capture on vblanks)
Expand Down Expand Up @@ -6100,13 +6104,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
(eval echo "\"\$as_me:6103: $ac_compile\"" >&5)
(eval echo "\"\$as_me:6107: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
(eval echo "\"\$as_me:6106: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval echo "\"\$as_me:6110: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
(eval echo "\"\$as_me:6109: output\"" >&5)
(eval echo "\"\$as_me:6113: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
Expand Down Expand Up @@ -7311,7 +7315,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
echo '#line 7314 "configure"' > conftest.$ac_ext
echo '#line 7318 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
Expand Down Expand Up @@ -9114,11 +9118,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9117: $lt_compile\"" >&5)
(eval echo "\"\$as_me:9121: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:9121: \$? = $ac_status" >&5
echo "$as_me:9125: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
Expand Down Expand Up @@ -9453,11 +9457,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9456: $lt_compile\"" >&5)
(eval echo "\"\$as_me:9460: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:9460: \$? = $ac_status" >&5
echo "$as_me:9464: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
Expand Down Expand Up @@ -9558,11 +9562,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9561: $lt_compile\"" >&5)
(eval echo "\"\$as_me:9565: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:9565: \$? = $ac_status" >&5
echo "$as_me:9569: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
Expand Down Expand Up @@ -9613,11 +9617,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:9616: $lt_compile\"" >&5)
(eval echo "\"\$as_me:9620: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:9620: \$? = $ac_status" >&5
echo "$as_me:9624: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
Expand Down Expand Up @@ -11997,7 +12001,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12000 "configure"
#line 12004 "configure"
#include "confdefs.h"

#if HAVE_DLFCN_H
Expand Down Expand Up @@ -12093,7 +12097,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
#line 12096 "configure"
#line 12100 "configure"
#include "confdefs.h"

#if HAVE_DLFCN_H
Expand Down Expand Up @@ -14049,11 +14053,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14052: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14056: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
echo "$as_me:14056: \$? = $ac_status" >&5
echo "$as_me:14060: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
Expand Down Expand Up @@ -14148,11 +14152,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14151: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14155: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:14155: \$? = $ac_status" >&5
echo "$as_me:14159: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
Expand Down Expand Up @@ -14200,11 +14204,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
(eval echo "\"\$as_me:14203: $lt_compile\"" >&5)
(eval echo "\"\$as_me:14207: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
echo "$as_me:14207: \$? = $ac_status" >&5
echo "$as_me:14211: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
Expand Down Expand Up @@ -15528,6 +15532,40 @@ fi



# Check whether --with-spi was given.
if test "${with_spi+set}" = set; then :
withval=$with_spi;
else
with_spi=check
fi

if test "x$with_spi" = xcheck; then :
for ac_header in linux/spi/spidev.h
do :
ac_fn_c_check_header_mongrel "$LINENO" "linux/spi/spidev.h" "ac_cv_header_linux_spi_spidev_h" "$ac_includes_default"
if test "x$ac_cv_header_linux_spi_spidev_h" = x""yes; then :
cat >>confdefs.h <<_ACEOF
#define HAVE_LINUX_SPI_SPIDEV_H 1
_ACEOF
with_spi=yes
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Missing spidev.h, if you want spi support (for LPD8806) please install the linux kernel headers." >&5
$as_echo "$as_me: WARNING: Missing spidev.h, if you want spi support (for LPD8806) please install the linux kernel headers." >&2;}
fi

done

fi
if test "x$with_spi" = xyes; then
HAVE_SPI_TRUE=
HAVE_SPI_FALSE='#'
else
HAVE_SPI_TRUE='#'
HAVE_SPI_FALSE=
fi



# Check whether --with-x11 was given.
if test "${with_x11+set}" = set; then :
withval=$with_x11;
Expand Down Expand Up @@ -16286,6 +16324,10 @@ if test -z "${HAVE_LIBUSB_TRUE}" && test -z "${HAVE_LIBUSB_FALSE}"; then
as_fn_error "conditional \"HAVE_LIBUSB\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_SPI_TRUE}" && test -z "${HAVE_SPI_FALSE}"; then
as_fn_error "conditional \"HAVE_SPI\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
fi
if test -z "${HAVE_X11_TRUE}" && test -z "${HAVE_X11_FALSE}"; then
as_fn_error "conditional \"HAVE_X11\" was never defined.
Usually this means the macro was only invoked conditionally." "$LINENO" 5
Expand Down
7 changes: 7 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ AC_CHECK_HEADERS([libusb-1.0/libusb.h],[],[AC_MSG_ERROR([Missing a required head
])
AM_CONDITIONAL(HAVE_LIBUSB, [test "x$with_libusb" = xcheck])

AC_ARG_WITH([spi], [AS_HELP_STRING([--without-spi], [Disable spi support (no support for LPD8806)])], [],
[with_spi=check])
AS_IF([test "x$with_spi" = xcheck],
[AC_CHECK_HEADERS([linux/spi/spidev.h], [with_spi=yes],
[AC_MSG_WARN([Missing spidev.h, if you want spi support (for LPD8806) please install the linux kernel headers.])])])
AM_CONDITIONAL(HAVE_SPI, [test "x$with_spi" = xyes])

dnl boblight-X11
AC_ARG_WITH([x11], [AS_HELP_STRING([--without-x11], [Disable x11 support])], [],
[with_x11=check])
Expand Down

0 comments on commit a246589

Please sign in to comment.