Changeset 8aa887870319cc0089f781b6ecd332ae7af5c02c

Timestamp:

07/24/07 19:15:59 (1 year ago)

Author:

Damien Fouilleul <damienf@videolan.org>

git-committer:

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

git-parent:

[935af8b0594944307465a9d25c27625f663681b4]

git-author:

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

Message:

- mingw32: fix libtool linking.

Files:

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

bootstrap

@@ -222 +222 @@
-include Modules.am
-
-if HAVE_WIN32
-LTLIBVLC = -L\$(top_builddir)/src -lvlc.dll
-else
-LTLIBVLC = -L\$(top_builddir)/src -lvlc
-endif
-
-AM_LDFLAGS = -rpath '\$(libvlcdir)' -avoid-version \\

configure.ac

@@ -221 +221 @@
-  *mingw32* | *cygwin* | *wince* | *mingwce* | *pe*)
-    AC_CHECK_TOOL(WINDRES, windres, :)
-    enable_libtool="no"
-
-    case "${host_os}" in
@@ -243 +242 @@
-    if test "${SYS}" = "mingw32"; then
-        # add ws2_32 for closesocket, select, recv
-        CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
-        VLC_ADD_LDFLAGS([libvlc],[-lws2_32 -lnetapi32 -lwinmm])
-        VLC_ADD_LDFLAGS([vlc activex mozilla],[-mwindows])
@@ -251 +249 @@
-    if test "${SYS}" = "mingwce"; then
-        # add ws2 for closesocket, select, recv
-        CPPFLAGS_save="${CPPFLAGS_save} -D_OFF_T_ -D_off_t=long"; CPPFLAGS="${CPPFLAGS_save}"
-        VLC_ADD_CPPFLAGS([libvlc vlc],[-Dmain(a,b)=maince(a,b)])
-        VLC_ADD_LDFLAGS([libvlc vlc],[-lws2 -e WinMainCRTStartup])
@@ -318 +315 @@
-dnl  -- Courmisch
-dnl
+
+dnl override platform specific check for dependent libraries
+dnl otherwise libtool linking of shared libraries will
+dnl fail on anything other than pass_all.
+AC_CACHE_CHECK([how to recognize dependent libraries],
+   lt_cv_deplibs_check_method,
+   [lt_cv_deplibs_check_method=pass_all
+])
+
-AC_DISABLE_STATIC
-AC_LIBTOOL_DLOPEN
-
+
-m4_undefine([AC_PROG_F77])
-m4_defun([AC_PROG_F77],[])
-AC_PROG_LIBTOOL
+
+m4_undefine([AC_DEPLIBS_CHECK_METHOD])
+m4_defun([AC_DEPLIBS_CHECK_METHOD],[])
-
-AC_ARG_ENABLE(libtool,
@@ -331 +340 @@
-])
-AM_CONDITIONAL(USE_LIBTOOL, [test "x${enable_libtool}" != "xno"] )
+
+lt_cv_deplibs_check_method=pass_all
-
-
@@ -5943 +5954 @@
-dnl Pic and shared libvlc stuff
-dnl
-SYS}" = "mingw32" || test "${
+
-  AC_DEFINE(HAVE_SHARED_LIBVLC, 1, [Define to 1 if libvlc is built as a shared library.])
-  VLC_ADD_PLUGINS([${BUILTINS}])
-  AS_IF([test "${SYS}" = "mingw32"], [
-    FILE_LIBVLC_DLL="!define LIBVLC_DLL libvlc.dll"
-    VLC_ADD_CPPFLAGS([libvlc],[-DDLL_EXPORT])
-  ])
-  BUILTINS=""
@@ -5954 +5964 @@
-  LDFLAGS_vlc="${LDFLAGS_vlc} ${LDFLAGS_libvlc}"
-  FILE_LIBVLC_DLL=""
+  VLC_ADD_CPPFLAGS([libvlc],[-DDLL_EXPORT])
-])
-