[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libcvd-members] libcvd configure configure.in
|
From: |
Edward Rosten |
|
Subject: |
[libcvd-members] libcvd configure configure.in |
|
Date: |
Mon, 26 Oct 2009 19:11:41 +0000 |
CVSROOT: /cvsroot/libcvd
Module name: libcvd
Changes by: Edward Rosten <edrosten> 09/10/26 19:11:41
Modified files:
. : configure configure.in
Log message:
Make dc1394v2 disable dc1394v1 by default, since the libraries conflict
if FORMAT_7 is used.
Use --with-dc1394v1v2 to force coexistence.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure?cvsroot=libcvd&r1=1.148&r2=1.149
http://cvs.savannah.gnu.org/viewcvs/libcvd/configure.in?cvsroot=libcvd&r1=1.149&r2=1.150
Patches:
Index: configure
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -b -r1.148 -r1.149
--- configure 26 Oct 2009 15:44:57 -0000 1.148
+++ configure 26 Oct 2009 19:11:40 -0000 1.149
@@ -665,6 +665,7 @@
have_videodisplay
XMKMF
have_posix_rt
+have_dvbuffer3
have_qtbuffer
osx_hacks
have_o2buffer
@@ -672,8 +673,7 @@
have_linux_2_4
have_v4l1buffer
have_v4l2buffer
-have_dvbuffer3
-have_dvbuffer
+have_dc1394v1
have_dc1394v2
have_assembler
have_inline_asm
@@ -765,8 +765,8 @@
with_assembler
with_inline_asm
enable_gpl
-with_dvbuffer
-with_dvbuffer3
+with_dc1394v1v2
+with_dc1394v1
with_dc1394v2
with_v4l1buffer
with_v4l2
@@ -1473,9 +1473,9 @@
--with-sse2 force presence or absence of SSE2 (x86 only)
--with-assembler force presence or absence of asm
--with-inline_asm force presence or absence of inline asm
- --without-dvbuffer compile without dvbuffer (libDC1394v1) support
(Linux only)
- --without-dvbuffer3 compile without dvbuffer3 (libDC1394v{1,2}) support
(Linux only)
- --without-dc1394v2 do not use libDC1394v2 (use v1 instead) for
dvbuffer3 (Linux only)
+ --with-dc1394v1v2 Force libDC1394 v1 and v2 co-exist. This will break
FORMAT_7.
+ --without-dc1394v1 do not use libDC1394v1 (use try v2 instead) for
dvbuffer3 (Linux/OSX). Disable dvbuffer (Linux).
+ --without-dc1394v2 do not use libDC1394v2 (use try v1 instead) for
dvbuffer3 (Linux/OSX).
--without-v4l1buffer compile without v4l1bffer (Video4Linux) support
(Linux only)
--without-v4l2buffer compile without v4l2buffer (Video4Linux2) support
(Linux only)
--without-o2buffer compile without sgi video (IRIX only)
@@ -6615,15 +6615,15 @@
-# Check whether --with-dvbuffer was given.
-if test "${with_dvbuffer+set}" = set; then
- withval=$with_dvbuffer;
+# Check whether --with-dc1394v1v2 was given.
+if test "${with_dc1394v1v2+set}" = set; then
+ withval=$with_dc1394v1v2;
fi
-# Check whether --with-dvbuffer3 was given.
-if test "${with_dvbuffer3+set}" = set; then
- withval=$with_dvbuffer3;
+# Check whether --with-dc1394v1 was given.
+if test "${with_dc1394v1+set}" = set; then
+ withval=$with_dc1394v1;
fi
@@ -6915,14 +6915,16 @@
case "$host" in
*linux*)
- os_all_options="dc1394v2 dvbuffer dvbuffer3 v4l2buffer
v4l1buffer v4lbuffer"
+ os_all_options="dc1394v2 dc1394v1 v4l2buffer v4l1buffer
v4lbuffer"
+ if test "$have_dc1394v2" != yes || test "$with_dc1394v1v2" ==
"yes"
+ then
- if test "$with_dvbuffer" != no && test "$have_dvbuffer" != yes
+ if test "$with_dc1394v1" != no && test "$have_dc1394v1" != yes
then
- if test "$with_dvbuffer" == ""
+ if test "$with_dc1394v1" == ""
then
- with_dvbuffer=yes
+ with_dc1394v1=yes
fi
save_LIBS="$LIBS"
@@ -7225,12 +7227,12 @@
if test x$a == x
then
cat >>confdefs.h <<\_ACEOF
-#define CVD_HAVE_DVBUFFER 1
+#define CVD_HAVE_DC1394V1 1
_ACEOF
- have_dvbuffer=yes
+ have_dc1394v1=yes
- options="$options dvbuffer"
+ options="$options dc1394v1"
else
LIBS="$save_LIBS"
@@ -7238,56 +7240,15 @@
fi
fi
- if test "$have_dvbuffer" != yes
+ if test "$have_dc1394v1" != yes
then
:
fi
-
-
- if test "$with_dvbuffer3" != no && test "$have_dvbuffer3" != yes
- then
- if test "$with_dvbuffer3" == ""
- then
- with_dvbuffer3=yes
- fi
-
- save_LIBS="$LIBS"
- save_CXXFLAGS="$CXXFLAGS"
- a=
-
- if test "$have_dc1394v2" != yes && test
"$have_dvbuffer" != yes
- then
- a=1
fi
- if test x$a == x
- then
- cat >>confdefs.h <<\_ACEOF
-#define CVD_HAVE_DVBUFFER3 1
-_ACEOF
-
- have_dvbuffer3=yes
-
- options="$options dvbuffer3"
-
- else
- LIBS="$save_LIBS"
- CXXFLAGS="$save_CXXFLAGS"
- fi
- fi
-
- if test "$have_dvbuffer3" != yes
- then
- :
-
- fi
-
-
-
-
if test "$with_v4l2buffer" != no && test "$have_v4l2buffer" != yes
then
if test "$with_v4l2buffer" == ""
@@ -7832,7 +7793,7 @@
$as_echo "$as_me: Adding /usr/X11R6/include to the build path." >&6;}
osx_hacks=yes
- os_all_options="qtbuffer dc1394v2 dvbuffer3"
+ os_all_options="qtbuffer dc1394v2"
if test "$with_qtbuffer" != no && test "$have_qtbuffer" != yes
@@ -12757,10 +12718,10 @@
cvd_src/i686/yuv411_to_stuff_MMX_64 inline_asm mmxext x86
cvd_src/yuv411_to_stuff END
-cvd_src/i686/halfsample,HALFSAMPLE_MMX8 mmx 32bit x86 assembler
END
-HALFSAMPLE_SSE16 sse2 END
+cvd_src/i686/halfsample,INTERNAL_HALFSAMPLE_MMX8 mmx 32bit x86
assembler END
+INTERNAL_HALFSAMPLE_SSE16
sse2 END
-YV402P_MMX
mmx END
+INTERNAL_YV402P_MMX
mmx END
cvd_src/i686/rgb_to_gray,cvd_src/i686/convert_rgb_to_y 32bit mmxext x86
assembler
cvd_src/noarch/convert_rgb_to_y END
@@ -12810,11 +12771,12 @@
cvd_src/slower_corner_12 fast12
END
#General OS specific bits
-cvd_src/Linux/dvbuffer
dvbuffer END
-cvd_src/Linux/dvbuffer3_dc1394v2
dvbuffer3 dc1394v2
-cvd_src/Linux/dvbuffer3_dc1394v1
dvbuffer3 dvbuffer END
-cvd_src/videosource_dvbuffer dvbuffer3
-cvd_src/videosource_nodvbuffer END
+
+cvd_src/Linux/dvbuffer3_dc1394v2,cvd_src/Linux/dvbuffer,cvd_src/videosource_dvbuffer,DVBUFFER3
dc1394v2 dc1394v1 dc1394v1v2
+cvd_src/Linux/dvbuffer3_dc1394v2,cvd_src/videosource_dvbuffer,DVBUFFER3
dc1394v2
+cvd_src/Linux/dvbuffer3_dc1394v1,cvd_src/Linux/dvbuffer,cvd_src/videosource_dvbuffer,DVBUFFER
dc1394v1
+cvd_src/Linux/videosource_nodvbuffer
END
+
cvd_src/Linux/v4l1buffer,cvd_src/Linux/videosource_v4l1buffer
v4l1buffer
cvd_src/Linux/videosource_nov4l1buffer END
@@ -12860,7 +12822,7 @@
dep_objects="`awk -v ORS=' ' '/[a-z]/{print $0".o"}' config.dep_tmp`"
-for i in `awk '!/[a-z]/{print "CVD_INTERNAL_HAVE_"$0}' config.dep_tmp`
+for i in `awk '!/[a-z]/{if(/^INTERNAL_/) print "CVD_INTERNAL_HAVE_" substr($0,
10); else print "CVD_HAVE_"$0}' config.dep_tmp`
do
cat >>confdefs.h <<_ACEOF
#define $i 1
Index: configure.in
===================================================================
RCS file: /cvsroot/libcvd/libcvd/configure.in,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -b -r1.149 -r1.150
--- configure.in 26 Oct 2009 15:44:57 -0000 1.149
+++ configure.in 26 Oct 2009 19:11:41 -0000 1.150
@@ -409,9 +409,9 @@
AC_ARG_ENABLE(gpl, [ --enable-gpl Allow the use of GPL
libraries.])
-AC_ARG_WITH(dvbuffer, [ --without-dvbuffer compile without dvbuffer
(libDC1394v1) support (Linux only)])
-AC_ARG_WITH(dvbuffer3, [ --without-dvbuffer3 compile without dvbuffer3
(libDC1394v{1,2}) support (Linux only)])
-AC_ARG_WITH(dc1394v2, [ --without-dc1394v2 do not use libDC1394v2 (use
v1 instead) for dvbuffer3 (Linux only)])
+AC_ARG_WITH(dc1394v1v2,[ --with-dc1394v1v2 Force libDC1394 v1 and v2
co-exist. This will break FORMAT_7.])
+AC_ARG_WITH(dc1394v1, [ --without-dc1394v1 do not use libDC1394v1 (use
try v2 instead) for dvbuffer3 (Linux/OSX). Disable dvbuffer (Linux).])
+AC_ARG_WITH(dc1394v2, [ --without-dc1394v2 do not use libDC1394v2 (use
try v1 instead) for dvbuffer3 (Linux/OSX). ])
AC_ARG_WITH(v4l1buffer,[ --without-v4l1buffer compile without v4l1bffer
(Video4Linux) support (Linux only)])
AC_ARG_WITH(v4l2, [ --without-v4l2buffer compile without v4l2buffer
(Video4Linux2) support (Linux only)])
AC_ARG_WITH(o2buffer, [ --without-o2buffer compile without sgi video
(IRIX only)])
@@ -424,21 +424,16 @@
case "$host" in
*linux*)
- os_all_options="dc1394v2 dvbuffer dvbuffer3 v4l2buffer
v4l1buffer v4lbuffer"
+ os_all_options="dc1394v2 dc1394v1 v4l2buffer v4l1buffer
v4lbuffer"
- CHECK_FOR_OPTION(dvbuffer, [
+ if test "$have_dc1394v2" != yes || test "$with_dc1394v1v2" ==
"yes"
+ then
+ CHECK_FOR_OPTION(dc1394v1, [
AC_CHECK_HEADERS(libraw1394/raw1394.h
libdc1394/dc1394_control.h, [], [a=1])
AC_CHECK_LIB(raw1394, main,[],[a=1])
AC_CHECK_LIB(dc1394_control, main,[],[a=1])
])
-
- CHECK_FOR_OPTION(dvbuffer3, [
- if test "$have_dc1394v2" != yes && test
"$have_dvbuffer" != yes
- then
- a=1
fi
- ])
-
CHECK_FOR_OPTION(v4l2buffer,[
AC_MSG_CHECKING(for v4l2)
@@ -546,7 +541,7 @@
APPEND(CPPFLAGS, [-I/usr/X11R6/include])
AC_MSG_NOTICE([Adding /usr/X11R6/include to the build path.])
AC_SUBST(osx_hacks,yes)
- os_all_options="qtbuffer dc1394v2 dvbuffer3"
+ os_all_options="qtbuffer dc1394v2"
CHECK_FOR_OPTION(qtbuffer,[
APPEND(LIBS, [-framework Carbon -framework QuickTime])
@@ -948,10 +943,10 @@
cvd_src/i686/yuv411_to_stuff_MMX_64 inline_asm mmxext x86
cvd_src/yuv411_to_stuff END
-cvd_src/i686/halfsample,HALFSAMPLE_MMX8 mmx 32bit x86 assembler
END
-HALFSAMPLE_SSE16 sse2 END
+cvd_src/i686/halfsample,INTERNAL_HALFSAMPLE_MMX8 mmx 32bit x86
assembler END
+INTERNAL_HALFSAMPLE_SSE16
sse2 END
-YV402P_MMX
mmx END
+INTERNAL_YV402P_MMX
mmx END
cvd_src/i686/rgb_to_gray,cvd_src/i686/convert_rgb_to_y 32bit mmxext x86
assembler
cvd_src/noarch/convert_rgb_to_y END
@@ -1001,11 +996,12 @@
cvd_src/slower_corner_12 fast12
END
#General OS specific bits
-cvd_src/Linux/dvbuffer
dvbuffer END
-cvd_src/Linux/dvbuffer3_dc1394v2
dvbuffer3 dc1394v2
-cvd_src/Linux/dvbuffer3_dc1394v1
dvbuffer3 dvbuffer END
-cvd_src/videosource_dvbuffer dvbuffer3
-cvd_src/videosource_nodvbuffer END
+
+cvd_src/Linux/dvbuffer3_dc1394v2,cvd_src/Linux/dvbuffer,cvd_src/videosource_dvbuffer,DVBUFFER3
dc1394v2 dc1394v1 dc1394v1v2
+cvd_src/Linux/dvbuffer3_dc1394v2,cvd_src/videosource_dvbuffer,DVBUFFER3
dc1394v2
+cvd_src/Linux/dvbuffer3_dc1394v1,cvd_src/Linux/dvbuffer,cvd_src/videosource_dvbuffer,DVBUFFER
dc1394v1
+cvd_src/Linux/videosource_nodvbuffer
END
+
cvd_src/Linux/v4l1buffer,cvd_src/Linux/videosource_v4l1buffer
v4l1buffer
cvd_src/Linux/videosource_nov4l1buffer END
@@ -1050,7 +1046,7 @@
#@<:@ is a quadrigraph for [
AC_SUBST(dep_objects, ["`awk -v ORS=' ' '/@<:@a-z@:>@/{print $0".o"}'
config.dep_tmp`"])
-for i in `awk '!/@<:@a-z@:>@/{print "CVD_INTERNAL_HAVE_"$0}' config.dep_tmp`
+for i in `awk '!/@<:@a-z@:>@/{if(/^INTERNAL_/) print "CVD_INTERNAL_HAVE_"
substr($0, 10); else print "CVD_HAVE_"$0}' config.dep_tmp`
do
AC_DEFINE_UNQUOTED($i, 1)
done
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libcvd-members] libcvd configure configure.in,
Edward Rosten <=