Commit eb395af0 authored by Sam Hocevar's avatar Sam Hocevar

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

  * Renamed ./include/config.h to ./include/vlc_config.h
  * Other misc auto* fixes.
parent 764176f6
.* .*
m4
intl
core core
core.* core.*
gmon.out gmon.out
configure configure
config.h
config.h.*
config.log config.log
config.cache config.cache
config.rpath
config.status config.status
config.guess config.guess
config.sub config.sub
......
#! /bin/sh #! /bin/sh
## bootstrap.sh file for vlc, the VideoLAN Client ## 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> ## Authors: Samuel Hocevar <sam@zoy.org>
...@@ -29,11 +29,16 @@ done ...@@ -29,11 +29,16 @@ done
### ###
### classic stuff ### 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 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 automake --foreign --add-missing --copy
autoconf autoconf
aclocal -I m4
# nuahahahahaha !! overwriting Makefile.in with what *I* want! # nuahahahahaha !! overwriting Makefile.in with what *I* want!
cp Makefile.old Makefile.in cp Makefile.old Makefile.in
......
dnl Autoconf settings for vlc dnl Autoconf settings for vlc
AC_INIT(include/main.h) AC_INIT(configure.in)
AM_CONFIG_HEADER(include/defs.h) AM_CONFIG_HEADER(config.h)
AC_CANONICAL_SYSTEM AC_CANONICAL_SYSTEM
CONFIGURE_LINE="$0 $*" CONFIGURE_LINE="$0 $*"
...@@ -2167,7 +2167,7 @@ AC_SUBST(xvideo_LDFLAGS) ...@@ -2167,7 +2167,7 @@ AC_SUBST(xvideo_LDFLAGS)
AC_SUBST(xosd_LDFLAGS) AC_SUBST(xosd_LDFLAGS)
AC_SUBST(id3tag_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 chmod a+x vlc-config
echo " echo "
......
config.h stamp-h
defs.h stamp-h.in
This diff is collapsed.
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* vlc.h: global header for vlc * vlc.h: global header for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 1998, 1999, 2000 VideoLAN * 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 * 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 * it under the terms of the GNU General Public License as published by
...@@ -95,8 +95,8 @@ typedef int vlc_status_t; ...@@ -95,8 +95,8 @@ typedef int vlc_status_t;
* Required internal headers * Required internal headers
*****************************************************************************/ *****************************************************************************/
#if defined( __VLC__ ) #if defined( __VLC__ )
# include "defs.h" # include "../config.h"
# include "config.h" # include "vlc_config.h"
# include "modules_inner.h" # include "modules_inner.h"
# include "vlc_common.h" # include "vlc_common.h"
# include "os_specific.h" # include "os_specific.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment