Changeset 2242665b9b86102477ac0e2299a73bd6b1f6e342

Timestamp:

12/09/06 19:03:39 (2 years ago)

Author:

Damien Fouilleul <damienf@videolan.org>

git-committer:

Damien Fouilleul <damienf@videolan.org> 1158080619 +0000

git-parent:

[56649e7c4df5c0ae5db6e9ef347dcf1dfa435863]

git-author:

Damien Fouilleul <damienf@videolan.org> 1158080619 +0000

Message:

- bootstrap: removed vlcintf.h
- configure.ac: autoconf 2.59c is not yet supported in Cygwin, added Wine support for ActiveX plugin

Files:

• bootstrap (modified) (1 diff)
• configure.ac (modified) (5 diffs)

bootstrap

@@ -473 +473 @@
-rm -f vlc-config.in vlc-config
-rm -f src/misc/modules_builtin.h
-rm -f mozilla/vlcintf.h
-
-# Shut up

configure.ac

@@ -10 +10 @@
-CODENAME="Janus"
-
-c
+
-AC_CONFIG_SRCDIR(src/libvlc.c)
-AC_CONFIG_AUX_DIR(autotools)
@@ -38 +38 @@
-dnl Check for tools
-dnl
-AC_PROG_CC_C99
-AM_PROG_CC_C_O
-AC_PROG_CPP
@@ -5176 +5175 @@
-AC_ARG_ENABLE(activex,
-  [  --enable-activex        build a vlc-based ActiveX control (default enabled on Win32)])
+AC_ARG_WITH(wine-sdk-path,
+  [    --with-wine-sdk-path=PATH path to wine sdk])
-if test "${enable_activex}" != "no"
-then
-  if test "${SYS}" = "mingw32" -o "${SYS}" = "cygwin"
-  then
-
+
+
+
+
+
+
+
+
+
+
+
+
-    AC_LANG_PUSH(C++)
-    AC_CHECK_HEADERS(ole2.h olectl.h,
@@ -5200 +5212 @@
-AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)])
-AM_CONDITIONAL(HAS_MIDL_COMPILER, test "${MIDL}" != "no")
+AC_ARG_VAR(WIDL, [Wine IDL compiler (requires Wine SDK)])
+AM_CONDITIONAL(HAS_WIDL_COMPILER, test "${WIDL}" != "no")
-AM_CONDITIONAL(BUILD_ACTIVEX,${activex})
-
@@ -5535 +5549 @@
-AC_SUBST(WINDRES)
-AC_SUBST(MOZILLA_SDK_PATH)
+AC_SUBST(WINE_SDK_PATH)
-AC_SUBST(XPIDL)
-AC_SUBST(XPIDL_INCL)