[vlc-devel] commit: Accept libtool archives and libtool objects as well as plugin names ( Rémi Denis-Courmont )

git version control git at videolan.org
Mon Apr 21 20:48:07 CEST 2008


vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Mon Apr 21 21:36:24 2008 +0300| [c106ef79e1469b9fa9e0cf96a6217152a755e290]

Accept libtool archives and libtool objects as well as plugin names

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c106ef79e1469b9fa9e0cf96a6217152a755e290
---

 vlc-config.in.in |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 1083105..fab1af7 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -158,7 +158,23 @@ while test $# -gt 0; do
   *) optarg= ;;
   esac
 
-  case "$1" in
+  # Mangle plugin name, if applicable
+  # This is just a convenience hack for modules/common.am
+  tgt="$1"
+  case "$tgt" in
+    lib*_plugin_la-*.lo)
+      tgt="${tgt#lib}"
+      tgt="${tgt%_plugin_la-*.lo}"
+      ;;
+    lib*_plugin.la)
+      tgt="${tgt#lib}"
+      tgt="${tgt%_plugin.la}"
+      ;;
+    *)
+      ;;
+  esac
+
+  case "$tgt" in
     --prefix=*)
       prefix="${optarg}"
       if test "${exec_prefix_set}" = no ; then
@@ -229,15 +245,15 @@ while test $# -gt 0; do
       libs="${libs} -lvlc -lvlc-control"
       ;;
     *)
-      module="$1"
+      module="$tgt"
       ;;
   esac
 
   # Register per-module *FLAGS
-  register_flags "$1"
+  register_flags "$tgt"
 
   # Register module targets
-  register_targets "$1"
+  register_targets "$tgt"
 
   shift
 done




More information about the vlc-devel mailing list