* configure.ac, activex/Makefile.am: small fixes to the activex plugin build.

diff --git a/activex/Makefile.am b/activex/Makefile.am
index 2798c6547f06de7a124ca6a14e640bac68f3197d..696234d9ba052d20bd6548a1478f495fc7bbe6c0 100644 (file)
--- a/activex/Makefile.am
+++ b/activex/Makefile.am
@@ -5,7 +5,7 @@
 noinst_LIBRARIES = $(noinst_LIBRARIES_activex)
 
 MOSTLYCLEANFILES = $(LIBRARIES_activex)
-EXTRA_DIST = $(SOURCES_activex) $(DIST_rsrc) 
+EXTRA_DIST = $(SOURCES_activex) $(DIST_rsrc) $(DIST_misc)
 BUILT_SOURCES = $(BUILT_SOURCES_activex)
 
 SOURCES_activex = \
@@ -44,6 +44,16 @@ DIST_rsrc = \
        axvlc_rc.rc \
        $(NULL)
 
+DIST_misc = \
+       README.TXT \
+       axvlc.def \
+       axvlc.idl \
+       axvlc.reg \
+       axvlc.tlb \
+       inplace.bmp \
+       test.html \
+       $(NULL)
+
 LIBRARIES_libvlc = $(top_builddir)/lib/libvlc.a
 
 noinst_LIBRARIES_activex = libaxvlc.a

diff --git a/configure.ac b/configure.ac
index ec3906759b7cdfcd237ab754205d9e9216c46e1d..04e0adb2a0b24d2023a78d6c7a13c28241c2e66a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -297,7 +297,7 @@ CPPFLAGS_save="${CPPFLAGS_save} -DSYS_`echo ${SYS} | sed -e 's/-.*//' | tr 'abcd
 dnl Check for system libs needed
 need_libc=false
 
-AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon)
+AC_CHECK_FUNCS(gettimeofday select strerror strtod strtol strtof strtoll strtoull isatty vasprintf asprintf swab sigrelse getpwuid memalign posix_memalign gethostbyname2 if_nametoindex atoll getenv putenv setenv gmtime_r ctime_r localtime_r lrintf daemon)
 
 dnl Check for usual libc functions
 AC_CHECK_FUNCS(strdup strndup atof lseek)
@@ -3918,8 +3918,6 @@ fi
 dnl
 dnl  Microsoft ActiveX support
 dnl
-AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)])
-AM_CONDITIONAL(HAS_MIDL_COMPILER, test -n "${MIDL}")
 AC_ARG_ENABLE(activex,
   [  --enable-activex        build a vlc-based ActiveX control (default enabled on Win32)])
 if test "${enable_activex}" != "no"
@@ -3938,6 +3936,8 @@ then
     )
   fi
 fi
+AC_ARG_VAR(MIDL, [Microsoft IDL compiler (Win32 platform only)])
+AM_CONDITIONAL(HAS_MIDL_COMPILER, test -n "${MIDL}")
 
 dnl
 dnl  Mozilla plugin