Commit 7cc72564 authored by Filippo Carone's avatar Filippo Carone

pic libraries are now correctly installed when needed:

* --enable-pic added in configure.ac
* bootstrap modified to use BUILD_PIC in place of BUILD_MOZILLA where needed
parent 31c1e82e
...@@ -305,7 +305,7 @@ else ...@@ -305,7 +305,7 @@ else
;; \ ;; \
esac; \ esac; \
done done
if BUILD_MOZILLA if BUILD_PIC
@z=\$\$(\$(VLC_CONFIG) --list builtin); \ @z=\$\$(\$(VLC_CONFIG) --list builtin); \
for mod in \$(mods); do \ for mod in \$(mods); do \
case "\$\$z " \ case "\$\$z " \
...@@ -345,7 +345,7 @@ else ...@@ -345,7 +345,7 @@ else
;; \ ;; \
esac; \ esac; \
done done
if BUILD_MOZILLA if BUILD_PIC
@z=\$\$(\$(VLC_CONFIG) --list builtin); \ @z=\$\$(\$(VLC_CONFIG) --list builtin); \
for mod in \$(mods); do \ for mod in \$(mods); do \
case "\$\$z " \ case "\$\$z " \
......
...@@ -841,7 +841,7 @@ fi ...@@ -841,7 +841,7 @@ fi
dnl Check for dbus dnl Check for dbus
AC_ARG_ENABLE(dbus, AC_ARG_ENABLE(dbus,
[ --enable-dbus Linux D-BUS message bus system (default enabled)]) [ --enable-dbus Linux D-BUS message bus system (default enabled)])
if test "${enable_dbus}" != "no" if test "${enable_dbus}" != "no"
then then
...@@ -1514,7 +1514,7 @@ dnl Libnotify notification plugin ...@@ -1514,7 +1514,7 @@ dnl Libnotify notification plugin
dnl dnl
AC_ARG_ENABLE(notify, AC_ARG_ENABLE(notify,
[ --enable-notify libnotify notification plugin (default enabled)]) [ --enable-notify libnotify notification plugin (default enabled)])
AS_IF([test "${enable_notify}" != "no"], [ AS_IF([test "${enable_notify}" != "no"], [
PKG_CHECK_MODULES(NOTIFY, libnotify, PKG_CHECK_MODULES(NOTIFY, libnotify,
[ [
...@@ -1548,7 +1548,7 @@ then ...@@ -1548,7 +1548,7 @@ then
enable_live555="yes" enable_live555="yes"
fi fi
AC_ARG_ENABLE(live555, AC_ARG_ENABLE(live555,
[ --enable-live555 live555 RTSP input plugin (default disabled)]) [ --enable-live555 live555 RTSP input plugin (default disabled)])
if test "${enable_live555}" = "yes"; then if test "${enable_live555}" = "yes"; then
AC_ARG_WITH(live555-tree, AC_ARG_WITH(live555-tree,
[ --with-live555-tree=PATH live.com tree for static linking]) [ --with-live555-tree=PATH live.com tree for static linking])
...@@ -4628,7 +4628,7 @@ dnl QT 4 ...@@ -4628,7 +4628,7 @@ dnl QT 4
dnl dnl
enableqt4=false enableqt4=false
AC_ARG_ENABLE(qt4, AC_ARG_ENABLE(qt4,
[ --enable-qt4 QT 4 support (default disabled) ], [ --enable-qt4 QT 4 support (default disabled) ],
[if test "${enable_qt4}" = "yes"; then [if test "${enable_qt4}" = "yes"; then
PKG_CHECK_MODULES(QT4, QtCore QtGui, PKG_CHECK_MODULES(QT4, QtCore QtGui,
[ VLC_ADD_PLUGINS([qt4]) [ VLC_ADD_PLUGINS([qt4])
...@@ -5256,6 +5256,17 @@ then ...@@ -5256,6 +5256,17 @@ then
build_pic=yes build_pic=yes
fi fi
dnl
dnl Enable pic libraries
dnl
AC_ARG_ENABLE(pic,
[ --enable-pic Enable pic libraries (default disabled)])
AM_CONDITIONAL(BUILD_PIC, [test "${enable_pic}" = "yes"])
if test "${enable_pic}" = "yes"
then
build_pic=yes
fi
dnl dnl
dnl test plugins dnl test plugins
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment