From c3a51903f20e3c11405ae9e99dd11841048ba5ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net>
Date: Sun, 1 May 2011 21:13:54 +0300
Subject: [PATCH] Remove some leftovers from pre-libtool era

(Note __BUILTIN__ was not used anymore as we have !__PLUGIN__)
---
 bootstrap               |  1 -
 extras/analyser/zsh.cpp |  1 -
 m4/vlc.m4               |  4 ----
 src/libvlc-module.c     |  1 -
 src/modules/.gitignore  |  1 -
 vlc-config.in.in        | 10 ----------
 6 files changed, 18 deletions(-)
 delete mode 100644 src/modules/.gitignore

diff --git a/bootstrap b/bootstrap
index 6ce643b562..ceeb9d9812 100755
--- a/bootstrap
+++ b/bootstrap
@@ -113,7 +113,6 @@ mv -f INSTALL.git INSTALL
 ##  files which need to be regenerated
 ##
 rm -f vlc-config.in vlc-config
-rm -f src/misc/modules_builtin.h
 rm -f stamp-h*
 
 # Shut up
diff --git a/extras/analyser/zsh.cpp b/extras/analyser/zsh.cpp
index f9a7427540..6b5dd13376 100644
--- a/extras/analyser/zsh.cpp
+++ b/extras/analyser/zsh.cpp
@@ -43,7 +43,6 @@ typedef std::pair<int, std::string> mcpair;
 
 /* evil hack */
 #undef __PLUGIN__
-#undef __BUILTIN__
 #include <../src/modules/modules.h>
 
 void ParseModules( mumap &mods, mcmap &mods2 );
diff --git a/m4/vlc.m4 b/m4/vlc.m4
index 38c5b90adf..e82a47c6a9 100644
--- a/m4/vlc.m4
+++ b/m4/vlc.m4
@@ -6,10 +6,6 @@ dnl  Macros to add plugins or builtins and handle their flags
 m4_pattern_allow([^PKG_CONFIG(_LIBDIR)?$])
 
 
-AC_DEFUN([VLC_ADD_BUILTINS], [
-  BUILTINS="${BUILTINS} $1"
-])
-
 AC_DEFUN([VLC_ADD_PLUGIN], [
   m4_foreach_w([element], [$1], [
     [PLUGINS="${PLUGINS} ]element["]
diff --git a/src/libvlc-module.c b/src/libvlc-module.c
index b5e2fca5ea..73d61d8a54 100644
--- a/src/libvlc-module.c
+++ b/src/libvlc-module.c
@@ -27,7 +27,6 @@
 // Pretend we are a builtin module
 #define MODULE_NAME main
 #define MODULE_PATH main
-#define __BUILTIN__
 
 
 #ifdef HAVE_CONFIG_H
diff --git a/src/modules/.gitignore b/src/modules/.gitignore
deleted file mode 100644
index c67848de86..0000000000
--- a/src/modules/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-builtin.h
diff --git a/vlc-config.in.in b/vlc-config.in.in
index 0673b74d47..2b649c87e2 100644
--- a/vlc-config.in.in
+++ b/vlc-config.in.in
@@ -8,7 +8,6 @@ datarootdir="@datarootdir@"
 optim="@optim@"
 
 plugins="@PLUGINS@ "
-builtins="@BUILTINS@ "
 
 cppflags=""
 cflags=""
@@ -38,7 +37,6 @@ Options:
 Modules:
         vlc                       the main VLC object
         plugin                    flags for plugin modules
-        builtin                   flags for built-in modules
         MODULE                    any available module (dummy, gtk, avi, etc.)
         libs                      flags for external libs
 BLAH
@@ -159,10 +157,6 @@ while test $# -gt 0; do
       echo_plugin=yes
       cppflags="${cppflags} -D__LIBVLC__ -D__PLUGIN__"
       ;;
-    builtin)
-      echo_builtin=yes
-      cppflags="${cppflags} -D__LIBVLC__ -D__BUILTIN__"
-      ;;
     *)
       module="$tgt"
       ;;
@@ -189,10 +183,6 @@ if test "${echo_list}" = yes; then
     echo "${plugins}"
     printf '\n'
   fi
-  if test "${echo_builtin}" = yes; then
-    echo "${builtins}"
-    printf '\n'
-  fi
   exit 0
 fi