49 lines
1.4 KiB
Diff
49 lines
1.4 KiB
Diff
---
|
|
libdc1394-2.0.2/acinclude.m4 | 4 ++--
|
|
libdc1394-2.0.2/configure.in | 7 +------
|
|
2 files changed, 3 insertions(+), 8 deletions(-)
|
|
|
|
--- a/libdc1394-2.0.2/acinclude.m4
|
|
+++ b/libdc1394-2.0.2/acinclude.m4
|
|
@@ -78,7 +78,7 @@ AC_DEFUN([DX_REQUIRE_PROG], [
|
|
AC_PATH_TOOL([$1], [$2])
|
|
if test "$DX_FLAG_[]DX_CURRENT_FEATURE$$1" = 1; then
|
|
AC_MSG_WARN([$2 not found - will not DX_CURRENT_DESCRIPTION])
|
|
- AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0)
|
|
+ AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
|
|
fi
|
|
])
|
|
|
|
@@ -101,7 +101,7 @@ test "$DX_FLAG_$1" = "$2" \
|
|
# ----------------------------------------------------------
|
|
# Turn off the DX_CURRENT_FEATURE if the required feature is off.
|
|
AC_DEFUN([DX_CLEAR_DEPEND], [
|
|
-test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_[]DX_CURRENT_FEATURE], 0)
|
|
+test "$DX_FLAG_$1" = "$2" || AC_SUBST([DX_FLAG_]DX_CURRENT_FEATURE, 0)
|
|
])
|
|
|
|
# DX_FEATURE_ARG(FEATURE, DESCRIPTION,
|
|
--- a/libdc1394-2.0.2/configure.in
|
|
+++ b/libdc1394-2.0.2/configure.in
|
|
@@ -3,12 +3,6 @@ AC_PREREQ([2.6.0])
|
|
AC_INIT([libdc1394],[2.0.2],[libdc1394-devel@lists.sf.net])
|
|
AC_CONFIG_SRCDIR([dc1394/control.c])
|
|
|
|
-case "$host" in
|
|
-*-*-cygwin* | *-*-mingw*)
|
|
-AC_LIBTOOL_WIN32_DLL
|
|
-;;
|
|
-esac
|
|
-
|
|
#
|
|
DX_HTML_FEATURE(OFF)
|
|
DX_CHM_FEATURE(OFF)
|
|
@@ -25,6 +19,7 @@ AM_INIT_AUTOMAKE([--warnings=all 1.9.6])
|
|
AC_CONFIG_HEADERS([config.h])
|
|
|
|
AC_PROG_CC
|
|
+AC_LIBTOOL_WIN32_DLL
|
|
AC_PROG_LIBTOOL
|
|
AM_PROG_CC_C_O
|
|
|