X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=vlc-config.in.in;h=0585089602f35aec3f2956fb058a90c940714b11;hb=3ecee5c492d12aeb8aa8575d13c14d809b97b947;hp=8b26c61fa2f1c90af8afa4399ba6ea3a677731cd;hpb=14815d2cc5501b7417a34b96957c726e253bdeb2;p=vlc

diff --git a/vlc-config.in.in b/vlc-config.in.in
index 8b26c61fa2..0585089602 100644
--- 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,7 +95,7 @@ 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
@@ -192,25 +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 "Warning: vlc-config does not use \"pic\" anymore." >&2
+      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
-      ldflags="${ldflags} -lvlc"
+      ldflags="${ldflags} -lvlc -lvlc-control"
       ;;      
     *)
       module="$1"
@@ -311,7 +311,7 @@ fi
 #  - 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