Changeset 892b62c4ee2d1e73c0fffd7bc8f9209a851fcb9a

Timestamp:

08/12/02 15:47:28 (6 years ago)

Author:

Gildas Bazin <gbazin@videolan.org>

git-committer:

Gildas Bazin <gbazin@videolan.org> 1039358848 +0000

git-parent:

[940b79b4c163e31f56eb871c6e50d3612038e7fb]

git-author:

Gildas Bazin <gbazin@videolan.org> 1039358848 +0000

Message:

* configure.ac.in: fix for dvdread and libdvdplay plugins linking stage.

Files:

• configure.ac.in (modified) (7 diffs)

configure.ac.in

@@ -89 +89 @@
-    CFLAGS_save="${CFLAGS_save} -pthread"; CFLAGS="${CFLAGS_save}"
-    LDFLAGS_dvd="${LDFLAGS_dvd} -ldvd"
+    LDFLAGS_dvdcss="${LDFLAGS_dvdcss} -ldvd"
-    LDFLAGS_vcd="${LDFLAGS_vcd} -ldvd"
-    ;;
@@ -956 +957 @@
-      AC_CHECK_HEADERS(dvdread/dvd_reader.h,
-        [ PLUGINS="${PLUGINS} dvdread"
-
+ ${LDFLAGS_dvdcss}
-        [ if test "x${enable_dvdread}" != "x"
-          then
@@ -976 +977 @@
-        AC_MSG_RESULT(${real_dvdread_tree}/dvdread/.libs/libdvdread.a)
-        BUILTINS="${BUILTINS} dvdread"
-
+ ${LDFLAGS_dvdcss}
-        CPPFLAGS_dvdread="${CPPFLAGS_dvdread} -I${real_dvdread_tree}"
-      else
@@ -991 +992 @@
-      AC_MSG_RESULT(yes)
-      PLUGINS="${PLUGINS} dvdread"
-
+ ${LDFLAGS_dvdcss}
-      CPPFLAGS_dvdread="${CPPFLAGS_dvdread} -I${with_dvdread}/include"
-    else
@@ -1018 +1019 @@
-      AC_CHECK_HEADERS(dvdplay/dvdplay.h,
-        [ PLUGINS="${PLUGINS} dvdplay"
-${LDFLAGS_dvd} ${LDFLAGS_dvdread} -ldvdplay
+-ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}
-          CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread}" ],
-        [ if test "x${enable_dvdplay}" != "x"
@@ -1039 +1040 @@
-        AC_MSG_RESULT(${real_dvdplay_tree}/src/.libs/libdvdplay.a)
-        BUILTINS="${BUILTINS} dvdplay"
-LDFLAGS_dvd} ${LDFLAGS_dvdread} ${real_dvdplay_tree}/src/.libs/libdvdplay.a
+real_dvdplay_tree}/src/.libs/libdvdplay.a ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}
-        CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread} -I${real_dvdplay_tree}/src"
-      else
@@ -1054 +1055 @@
-      AC_MSG_RESULT(yes)
-      PLUGINS="${PLUGINS} dvdplay"
-${LDFLAGS_dvd} ${LDFLAGS_dvdread} -L${with_dvdplay}/lib -ldvdplay
+-L${with_dvdplay}/lib -ldvdplay ${LDFLAGS_dvdread} ${LDFLAGS_dvdcss}
-      CPPFLAGS_dvdplay="${CPPFLAGS_dvdplay} ${CPPFLAGS_dvdread} -I${with_dvdplay}/include"
-    else