* Moved ./include/defs.h to ./config.h

  * Renamed ./include/config.h to ./include/vlc_config.h
  * Other misc auto* fixes.

.cvsignore

 .*
+m4
+intl
 core
 core.*
 gmon.out
 configure
+config.h
+config.h.*
 config.log
 config.cache
+config.rpath
 config.status
 config.guess
 config.sub

bootstrap

 #! /bin/sh
 
 ##  bootstrap.sh file for vlc, the VideoLAN Client
-##  $Id: bootstrap,v 1.1 2002/08/25 23:18:04 sam Exp $
+##  $Id: bootstrap,v 1.2 2002/08/26 01:01:13 sam Exp $
 ##
 ##  Authors: Samuel Hocevar <sam@zoy.org>
 
@@ -29,11 +29,16 @@ done
 ###
 ###  classic stuff
 ###
-aclocal -I m4
+rm -f aclocal.m4 configure config.guess config.log config.sub ltmain.sh libtool ltconfig missing mkinstalldirs depcomp install-sh configure.in~ Makefile.am~
+
+aclocal
 autoheader
-echo "no" | gettextize --force --intl --copy --no-changelog
+gettextize --force --intl --copy --no-changelog
+test -f configure.in~ && mv configure.in~ configure.in
+test -f Makefile.am~ && mv Makefile.am~ Makefile.am
 automake --foreign --add-missing --copy
 autoconf
+aclocal -I m4
 
 # nuahahahahaha !! overwriting Makefile.in with what *I* want!
 cp Makefile.old Makefile.in

configure.in

 dnl Autoconf settings for vlc
-AC_INIT(include/main.h)
-AM_CONFIG_HEADER(include/defs.h)
+AC_INIT(configure.in)
+AM_CONFIG_HEADER(config.h)
 AC_CANONICAL_SYSTEM
 
 CONFIGURE_LINE="$0 $*"
@@ -2167,7 +2167,7 @@ AC_SUBST(xvideo_LDFLAGS)
 AC_SUBST(xosd_LDFLAGS)
 AC_SUBST(id3tag_LDFLAGS)
         
-AC_OUTPUT([Makefile Makefile.config Makefile.opts po/Makefile.in vlc-config m4/Makefile  intl/Makefile ])
+AC_OUTPUT([Makefile Makefile.config Makefile.opts po/Makefile.in vlc-config m4/Makefile intl/Makefile])
 chmod a+x vlc-config
 
 echo "

include/.cvsignore

-config.h
-defs.h
+stamp-h
+stamp-h.in

include/vlc/vlc.h

@@ -2,7 +2,7 @@
  * vlc.h: global header for vlc
  *****************************************************************************
  * Copyright (C) 1998, 1999, 2000 VideoLAN
- * $Id: vlc.h,v 1.10 2002/08/20 18:08:51 sam Exp $
+ * $Id: vlc.h,v 1.11 2002/08/26 01:01:13 sam Exp $
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -95,8 +95,8 @@ typedef int        vlc_status_t;
  * Required internal headers
  *****************************************************************************/
 #if defined( __VLC__ )
-#   include "defs.h"
-#   include "config.h"
+#   include "../config.h"
+#   include "vlc_config.h"
 #   include "modules_inner.h"
 #   include "vlc_common.h"
 #   include "os_specific.h"