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) \

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"