Remove vlc-config

.gitignore

@@ -28,8 +28,6 @@ libtool
 Makefile
 Makefile.in
 stamp-*
-vlc-config
-vlc-config.in
 vlc
 qvlc
 rvlc

Makefile.am

@@ -35,7 +35,6 @@ EXTRA_DIST = \
 	extras/package/win32/vlc.exe.manifest \
 	extras/package/win32/libvlc.dll.manifest \
 	extras/package/macosx/README.MacOSX.rtf \
-	vlc-config.in.in \
 	extras/package/rpm/vlc.fedora.spec \
 	extras/package/rpm/vlc.altlinux.spec \
 	extras/package/win32/vlc.win32.nsi.in \
@@ -70,7 +69,7 @@ EXTRA_DIST = \
 dist_noinst_SCRIPTS = bootstrap
 nodist_noinst_SCRIPTS = compile
 
-BUILT_SOURCES_distclean = vlc-config
+BUILT_SOURCES_distclean =
 if HAVE_WIN32
 BUILT_SOURCES_distclean += \
 	extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi
@@ -364,18 +363,8 @@ EXTRA_DIST += \
 # Building libvlc
 ###############################################################################
 
-noinst_SCRIPTS = vlc-config
-vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
-	$(SHELL) ./config.status --file=$@
-	chmod 0755 $@
-	touch $@
-
-vlc-config.in: vlc-config.in.in
-	./config.status --recheck
-	touch $@
-
 CLEANFILES = $(BUILT_SOURCES_clean)
-DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
+DISTCLEANFILES = $(BUILT_SOURCES_distclean) compile
 MAINTAINERCLEANFILES = ChangeLog
 
 # Shortcut for developers to rebuild the core (libvlc + vlc)
@@ -427,7 +416,7 @@ mvlc: make-alias Makefile
 	$(AM_V_GEN)$(MKALIAS) maemo
 
 if BUILD_VLC
-noinst_SCRIPTS += vlc$(EXEEXT)
+noinst_SCRIPTS = vlc$(EXEEXT)
 endif
 
 vlc$(EXEEXT):
@@ -1042,5 +1031,5 @@ update-po:
 ###############################################################################
 # Enforce Mac OS X deployment target environment variable
 ###############################################################################
-macosx-sdk: Makefile.in $(HEADERS_include) vlc-config
+macosx-sdk: Makefile.in $(HEADERS_include)
 	export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET)

bootstrap

@@ -100,7 +100,6 @@ sh modules/genmf `sed -ne 's,modules/\(.*\)/Makefile,\1,p' configure.ac`
 set -x
 
 # Automake complains if these are not present
-echo > vlc-config.in
 echo > ABOUT-NLS
 cp -f INSTALL INSTALL.git
 
@@ -112,7 +111,6 @@ mv -f INSTALL.git INSTALL
 ##
 ##  files which need to be regenerated
 ##
-rm -f vlc-config.in vlc-config
 rm -f stamp-h*
 
 # Shut up

configure.ac

@@ -4275,8 +4275,6 @@ AC_DEFINE_UNQUOTED(VLC_COMPILER, "`$CC -v 2>&1 | tail -n 1`", [compiler])
 dnl
 dnl  Handle substvars that use $(top_srcdir)
 dnl
-VLC_CONFIG="top_srcdir=\"\$(top_srcdir)\" top_builddir=\"\$(top_builddir)\" \$(top_builddir)/vlc-config"
-AC_SUBST(VLC_CONFIG)
 CPPFLAGS_save="-I\$(top_srcdir)/include -I\$(top_builddir)/include ${CPPFLAGS_save}"
 
 dnl
@@ -4289,11 +4287,6 @@ dnl Sort the modules list
 dnl
 PLUGINS=$( (for i in `echo $PLUGINS`; do echo $i; done)|sort|xargs )
 
-dnl
-dnl  Create the vlc-config script
-dnl
-LDFLAGS_libvlc="${LDFLAGS_libvlc} ${LDFLAGS_builtin}"
-
 dnl
 dnl  Configuration is finished
 dnl
@@ -4312,9 +4305,6 @@ AC_SUBST(MACOSX_DEPLOYMENT_TARGET)
 AC_SUBST(FILE_LIBVLCCORE_DLL)
 AC_SUBST(FILE_LIBVLC_DLL)
 
-dnl Create vlc-config.in
-VLC_OUTPUT_VLC_CONFIG_IN
-
 AC_CONFIG_FILES([
   Makefile
   doc/Makefile
@@ -4417,11 +4407,6 @@ AM_COND_IF([HAVE_DARWIN], [
 dnl Generate makefiles
 AC_OUTPUT
 
-# Cannot use AC_CONFIG_FILES([vlc-config]) as is automatically built,
-# not provided with the source
-${SHELL} ./config.status --file=vlc-config
-chmod 0755 vlc-config
-
 /bin/echo -n "Enabled modules: ${PLUGINS}"
 
 dnl Do we have to use make or gmake ?

doc/Makefile.am

@@ -24,8 +24,7 @@ CHANGELOGS = \
 
 man1_MANS = \
 	   vlc.1 \
-	   vlc-wrapper.1 \
-	   vlc-config.1
+	   vlc-wrapper.1
 
 EXTRA_DIST = \
 	$(CHANGELOGS) \

doc/vlc-config.1

-.TH LIBVLC 1 "8 August 2002" Version 0.5.0
-.SH NAME
-vlc-config - script to get information about the installed version of libvlc
-.SH SYNOPSIS
-.B vlc-config
-[\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags]
-.SH DESCRIPTION
-.PP
-\fIvlc-config\fP is a tool that is used to configure to determine
-the compiler and linker flags that should be used to compile
-and link programs that use \fIlibvlc\fP.
-.
-.SH OPTIONS
-\fIvlc-config\fP accepts the following options:
-.TP 8
-.B  \-\-version
-Print the currently installed version of \fIlibvlc\fP on the standard output.
-.TP 8
-.B  \-\-libs
-Print the linker flags that are necessary to link a \fIlibvlc\fP program.
-.TP 8
-.B  \-\-cflags
-Print the compiler flags that are necessary to compile a \fIlibvlc\fP program.
-.TP 8
-.B  \-\-prefix=PREFIX
-If specified, use PREFIX instead of the installation prefix that \fIlibvlc\fP
-was built with when computing the output for the \-\-cflags and
-\-\-libs options. This option is also used for the exec prefix
-if \-\-exec\-prefix was not specified. This option must be specified
-before any \-\-libs or \-\-cflags options.
-.TP 8
-.B  \-\-exec\-prefix=PREFIX
-If specified, use PREFIX instead of the installation exec prefix that
-\fIlibvlc\fP was built with when computing the output for the \-\-cflags
-and \-\-libs options.  This option must be specified before any
-\-\-libs or \-\-cflags options.
-.SH SEE ALSO
-.BR vlc (1),
-.SH COPYRIGHT
-Copyright \(co  2002 Owen Taylor, modified by Sam Hocevar
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted,
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in
-supporting documentation.

libs/loader/Makefile.am

@@ -14,7 +14,7 @@ noinst_LTLIBRARIES = libloader.la
 # TODO: real check for vsscanf() and <sys/mmap.h>
 AM_CPPFLAGS = -D__WINE__ -DHAVE_SYS_MMAN_H=1 -DHAVE_VSSCANF=1 \
 	-DWIN32_PATH=\"\" -DTRACE\(...\)=\(void\)0
-AM_CFLAGS = -fno-PIC `$(top_builddir)/vlc-config --cflags libs` -U_FILE_OFFSET_BITS \
+AM_CFLAGS = -fno-PIC -U_FILE_OFFSET_BITS \
 	-fno-omit-frame-pointer -mno-omit-leaf-frame-pointer
 
 noinst_HEADERS = com.h driver.h ext.h ldt_keeper.h loader.h registry.h \

m4/vlc.m4

@@ -77,52 +77,6 @@ AC_DEFUN([VLC_RESTORE_FLAGS], [
   LIBS="${LIBS_save}"
 ])
 
-dnl ===========================================================================
-dnl  Helper macro to generate the vlc-config.in file
-
-AC_DEFUN([VLC_OUTPUT_VLC_CONFIG_IN], [
-
-  AC_MSG_RESULT(configure: creating ./vlc-config.in)
-
-  am_all_modules="`for x in ${am_modules_with_cppflags} ${am_modules_with_cflags} ${am_modules_with_cxxflags} ${am_modules_with_objcflags} ${am_modules_with_ldflags} ${am_modules_with_libs}; do echo $x; done | sort | uniq`"
-
-  rm -f vlc-config.in
-  sed -ne '/#@1@#/q;p' < "${srcdir}/vlc-config.in.in" \
-    | sed \
-          -e "s/@optim@/${enable_optimizations}/" \
-          -e "s/@CFLAGS_TUNING@/${CFLAGS_TUNING}/" \
-    > vlc-config.in
-
-  dnl  Switch/case loop
-  for x in `echo ${am_all_modules}`
-  do [
-    echo "    ${x})"
-    if test "`eval echo @'$'CPPFLAGS_${x}@`" != "@@"; then
-      echo "      cppflags=\"\${cppflags} `eval echo '$'CPPFLAGS_${x}`\""
-    fi
-    if test "`eval echo @'$'CFLAGS_${x}@`" != "@@"; then
-      echo "      cflags=\"\${cflags} `eval echo '$'CFLAGS_${x}`\""
-    fi
-    if test "`eval echo @'$'CXXFLAGS_${x}@`" != "@@"; then
-      echo "      cxxflags=\"\${cxxflags} `eval echo '$'CXXFLAGS_${x}`\""
-    fi
-    if test "`eval echo @'$'OBJCFLAGS_${x}@`" != "@@"; then
-      echo "      objcflags=\"\${objcflags} `eval echo '$'OBJCFLAGS_${x}`\""
-    fi
-    if test "`eval echo @'$'LDFLAGS_${x}@`" != "@@"; then
-      echo "      ldflags=\"\${ldflags} `eval echo '$'LDFLAGS_${x}`\""
-    fi
-    if test "`eval echo @'$'LIBS_${x}@`" != "@@"; then
-      echo "      libs=\"\${libs} `eval echo '$'LIBS_${x}`\""
-    fi
-    echo "    ;;"
-  ] done >> vlc-config.in
-
-  dnl  '/#@1@#/,${/#@.@#/d;p}' won't work on OS X
-  sed -ne '/#@1@#/,$p' < "${srcdir}/vlc-config.in.in" \
-   | sed -e '/#@.@#/d' >> vlc-config.in
-])
-
 dnl ===========================================================================
 dnl  Macros for shared object handling (TODO)
 

src/test/headers.c

@@ -22,7 +22,7 @@
 /* config.h is NOT installed, headers MUST NOT depend on it.
  # include <config.h> */
 /* One thing we don't check is the CPPFLAGS - these MUST be exposed publicly,
- * e.g. using pkg-config or the broken old vlc-config. */
+ * e.g. using pkg-config. */
 
 #define PACKAGE "vlc"
 

vlc-config.in.in

-#!@SHELL@
-
-optim="@optim@"
-
-cppflags=""
-cflags=""
-cxxflags=""
-objcflags=""
-ldflags=""
-libs=""
-
-cflags_tuning="@CFLAGS_TUNING@"
-
-#
-#  Do not touch below this place unless you really know what you are doing
-#
-usage()
-{
-        cat << BLAH
-Usage: vlc-config OPTIONS MODULES
-Options:
-        [--version]               print version and exit
-        [--libs]                  output linking flags
-        [--cflags]                output C compilation flags
-        [--cxxflags]              output C++ compilation flags
-        [--objcflags]             output Objective C compilation flags
-Modules:
-        vlc                       the main VLC object
-        MODULE                    any available module (dummy, gtk, avi, etc.)
-        libs                      flags for external libs
-BLAH
-        exit $1
-}
-
-register_flags()
-{
-  case "$1" in
-    #@1@#
-    *)
-      ;;
-  esac
-}
-
-if test $# -eq 0; then
-        usage 1 1>&2
-fi
-
-if test "${top_builddir}" != ""; then
-  top_builddir="${top_builddir}/"
-elif test "${TOP_BUILDDIR}" != ""; then
-  top_builddir="${TOP_BUILDDIR}/"
-fi
-includes="${includes}"
-cppflags="${includes}"
-module=""
-
-#
-#  Various additional defines
-#
-if [ "${optim}" = speed ]; then
-  cflags="${cflags} ${cflags_tuning}"
-  cxxflags="${cxxflags} ${cflags_tuning}"
-  objcflags="${objcflags} ${cflags_tuning}"
-fi
-
-#
-#  The main argument loop
-#
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/-[_a-zA-Z0-9\-]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # Mangle plugin name, if applicable
-  # This is just a convenience hack for modules/common.am
-  tgt="$1"
-  tgt="${tgt##*/}"
-  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
-    --version)
-      echo "@VERSION@"
-      exit 0
-      ;;
-    --cflags)
-      echo_cflags=yes
-      ;;
-    --cppflags)
-      echo_cppflags=yes
-      ;;
-    --cxxflags)
-      echo_cxxflags=yes
-      ;;
-    --objcflags)
-      echo_objcflags=yes
-      ;;
-    --ldflags)
-      echo_ldflags=yes
-      ;;
-    --libs|-libs)
-      echo_libs=yes
-      ;;
-    -*)
-      usage 1 1>&1
-      ;;
-    libvlccore)
-      ;;
-    *)
-      module="$tgt"
-      ;;
-  esac
-
-  # Register per-module *FLAGS
-  register_flags "$tgt"
-
-  shift
-done
-
-#
-#  Output what we were asked
-#
-if test "${echo_cppflags}" = yes; then
-  echo "${cppflags}"
-fi
-if test "${echo_cflags}" = yes; then
-  echo "${cppflags} ${cflags}"
-fi
-if test "${echo_cxxflags}" = yes; then
-  echo "${cppflags} ${cxxflags}"
-fi
-if test "${echo_objcflags}" = yes; then
-  echo "${cppflags} ${objcflags}"
-fi
-if test "${echo_ldflags}" = yes; then
-  echo "${ldflags}"
-fi
-
-# Libs
-# There are 4 possibilities
-#  - We are a plugin or a builtin
-#  - 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"
-if test "${echo_libs}" = yes; then
-  echo "${libs}"
-fi