From 7cc72564f95e39aa619884fecb04558db63bd6c9 Mon Sep 17 00:00:00 2001 From: Filippo Carone Date: Sun, 4 Jun 2006 15:30:18 +0000 Subject: [PATCH] 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 --- bootstrap | 4 ++-- configure.ac | 19 +++++++++++++++---- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/bootstrap b/bootstrap index 72f807fdc0..84806c4c68 100755 --- a/bootstrap +++ b/bootstrap @@ -305,7 +305,7 @@ else ;; \ esac; \ done -if BUILD_MOZILLA +if BUILD_PIC @z=\$\$(\$(VLC_CONFIG) --list builtin); \ for mod in \$(mods); do \ case "\$\$z " \ @@ -345,7 +345,7 @@ else ;; \ esac; \ done -if BUILD_MOZILLA +if BUILD_PIC @z=\$\$(\$(VLC_CONFIG) --list builtin); \ for mod in \$(mods); do \ case "\$\$z " \ diff --git a/configure.ac b/configure.ac index e4b13e4a53..2d29dbb8e0 100644 --- a/configure.ac +++ b/configure.ac @@ -841,7 +841,7 @@ fi dnl Check for 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" then @@ -1514,7 +1514,7 @@ dnl Libnotify notification plugin dnl AC_ARG_ENABLE(notify, - [ --enable-notify libnotify notification plugin (default enabled)]) + [ --enable-notify libnotify notification plugin (default enabled)]) AS_IF([test "${enable_notify}" != "no"], [ PKG_CHECK_MODULES(NOTIFY, libnotify, [ @@ -1548,7 +1548,7 @@ then enable_live555="yes" fi 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 AC_ARG_WITH(live555-tree, [ --with-live555-tree=PATH live.com tree for static linking]) @@ -4628,7 +4628,7 @@ dnl QT 4 dnl enableqt4=false AC_ARG_ENABLE(qt4, - [ --enable-qt4 QT 4 support (default disabled) ], + [ --enable-qt4 QT 4 support (default disabled) ], [if test "${enable_qt4}" = "yes"; then PKG_CHECK_MODULES(QT4, QtCore QtGui, [ VLC_ADD_PLUGINS([qt4]) @@ -5256,6 +5256,17 @@ then build_pic=yes 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 test plugins -- 2.39.2