- Improve DIST_SUBDIR

[vlc] / vlc-config.in.in

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 9c16886046128a4fed8a4a6860eb2e436f0ffe46..0585089602f35aec3f2956fb058a90c940714b11 100644 (file)
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -3,6 +3,7 @@
 prefix="@prefix@"
 exec_prefix="@exec_prefix@"
 exec_prefix_set=no
+datarootdir="@datarootdir@"
 
 release="@release@"
 debug="@debug@"
@@ -94,14 +95,14 @@ linkage="c"
 #
 #  On Linux and Solaris, activate 64-bit off_t (by default under BSD)
 #
-cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE -D_REENTRANT -D_THREAD_SAFE -D_GNU_SOURCE"
+cppflags="${cppflags} -D_FILE_OFFSET_BITS=64 -D__USE_UNIX98 -D_LARGEFILE64_SOURCE -D_REENTRANT -D_THREAD_SAFE"
 
 #
 #  Gettext, data and plugin location
 #
 cppflags="${cppflags} -DLOCALEDIR=\"@datadir@/locale\""
-cppflags="${cppflags} -DDATA_PATH=\"${prefix}/share/vlc\""
-cppflags="${cppflags} -DPLUGIN_PATH=\"${prefix}/lib/vlc\""
+cppflags="${cppflags} -DDATA_PATH=\"@datadir@/vlc\""
+cppflags="${cppflags} -DPLUGIN_PATH=\"@libdir@/vlc\""
 
 #
 #  Various additional defines
@@ -192,30 +193,24 @@ while test $# -gt 0; do
     -*)
       usage 1 1>&1
       ;;
-    vlc)
-      cppflags="${cppflags} -D__VLC__ -I${top_builddir}src/misc"
+    libvlc)
+      cppflags="${cppflags} -D__LIBVLC__ -I${top_builddir}src/misc"
       ;;
     plugin)
       echo_plugin=yes
-      cppflags="${cppflags} -D__VLC__ -D__PLUGIN__"
-      ;;
-    pic)
-      echo_pic=yes
+      cppflags="${cppflags} -D__LIBVLC__ -D__PLUGIN__"
       ;;
     builtin)
       echo_builtin=yes
-      cppflags="${cppflags} -D__VLC__ -D__BUILTIN__"
+      cppflags="${cppflags} -D__LIBVLC__ -D__BUILTIN__"
+      ;;
+    pic)
       ;;
     mozilla)
       ;;
     external)
       echo_external=yes
-      if test "x${echo_pic}" = "xno"
-      then
-        ldflags="${ldflags} -lvlc"
-      else
-        ldflags="${ldflags} -lvlc_pic"
-      fi
+      ldflags="${ldflags} -lvlc -lvlc-control"
       ;;      
     *)
       module="$1"
@@ -270,11 +265,7 @@ if test "${echo_target}" = yes; then
     for module in `echo "${builtins}"`; do
       register_targets "${module}"
     done
-    if test "${echo_pic}" = yes; then
-      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_pic.a "; done
-    else
-      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done
-    fi
+    for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done
     printf '\n'
   fi
   exit 0
@@ -315,34 +306,24 @@ fi
 # There are 4 possibilities
 #  - We are a plugin or a builtin
 #  - We are building from the outside (external):
-#      - Give full libvlc linkflags + -lvlc(_pic) (in libdir)
+#      - Give full libvlc linkflags + -lvlc (in libdir)
 #      - Link with builtins in libdir
 #  - We are building something from the inside (builtin)
 #       - Link with builtins in place
 #  If you want something shared from the inside (binding),
-#  you need "builtin vlc pic"
+#  you need "builtin vlc"
 if test "${echo_libs}" = yes; then
   if test "${echo_builtin}" = yes; then
     for module in `echo "${builtins}"`; do
       register_targets "${module}"
       register_flags "${module}"
     done
-    if test "${echo_pic}" = yes; then
-      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}_pic.a "; done
-    else
-      for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done
-    fi
+    for target in `echo "${list}"`; do printf "${top_builddir}modules/${target}.a "; done
   fi
   if test "${echo_external}" = yes; then
-    if test "${echo_pic}" = yes; then
-      for module in `echo "${builtins}"`; do
-        ldflags="${ldflags} @libdir@/vlc/lib${module}_pic.a"
-      done
-    else
-      for module in `echo "${builtins}"`; do
-        ldflags="${ldflags} @libdir@/vlc/lib${module}.a"
-      done
-    fi
+    for module in `echo "${builtins}"`; do
+      ldflags="${ldflags} @libdir@/vlc/lib${module}.a"
+    done
     for module in `echo "${builtins}"`; do
       register_flags "${module}"
     done