From: Sam Hocevar Date: Mon, 26 Aug 2002 01:01:13 +0000 (+0000) Subject: * Moved ./include/defs.h to ./config.h X-Git-Tag: 0.5.0~1006 X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=eb395af053ac65f5386bab02a2da920284528f56;p=vlc * Moved ./include/defs.h to ./config.h * Renamed ./include/config.h to ./include/vlc_config.h * Other misc auto* fixes. --- diff --git a/.cvsignore b/.cvsignore index 963d8d52d4..8a95823e2e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,10 +1,15 @@ .* +m4 +intl core core.* gmon.out configure +config.h +config.h.* config.log config.cache +config.rpath config.status config.guess config.sub diff --git a/bootstrap b/bootstrap index b60d3b3f16..b0b516d2cf 100755 --- a/bootstrap +++ b/bootstrap @@ -1,7 +1,7 @@ #! /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 @@ -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 diff --git a/configure.in b/configure.in index 6c8f718b9e..389078f818 100644 --- a/configure.in +++ b/configure.in @@ -1,6 +1,6 @@ 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 " diff --git a/include/.cvsignore b/include/.cvsignore index 61df1b0a58..2d0a015643 100644 --- a/include/.cvsignore +++ b/include/.cvsignore @@ -1,2 +1,2 @@ -config.h -defs.h +stamp-h +stamp-h.in diff --git a/include/defs.h.in b/include/defs.h.in deleted file mode 100644 index 8c4f608f91..0000000000 --- a/include/defs.h.in +++ /dev/null @@ -1,475 +0,0 @@ -/* include/defs.h.in. Generated automatically from configure.in by autoheader 2.13. */ - -/* Define if using alloca.c. */ -#undef C_ALLOCA - -/* Define to empty if the keyword does not work. */ -#undef const - -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -#undef CRAY_STACKSEG_END - -/* Define if you have alloca, as a function or macro. */ -#undef HAVE_ALLOCA - -/* Define if you have and it should be used (not on Ultrix). */ -#undef HAVE_ALLOCA_H - -/* Define if you have a working `mmap' system call. */ -#undef HAVE_MMAP - -/* Define as __inline if that's what the C compiler calls it. */ -#undef inline - -/* Define to `long' if doesn't define. */ -#undef off_t - -/* Define as the return type of signal handlers (int or void). */ -#undef RETSIGTYPE - -/* Define to `unsigned' if doesn't define. */ -#undef size_t - -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown - */ -#undef STACK_DIRECTION - -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME - -/* Define if you have the __argz_count function. */ -#undef HAVE___ARGZ_COUNT - -/* Define if you have the __argz_next function. */ -#undef HAVE___ARGZ_NEXT - -/* Define if you have the __argz_stringify function. */ -#undef HAVE___ARGZ_STRINGIFY - -/* Define if you have the atoll function. */ -#undef HAVE_ATOLL - -/* Define if you have the feof_unlocked function. */ -#undef HAVE_FEOF_UNLOCKED - -/* Define if you have the fgets_unlocked function. */ -#undef HAVE_FGETS_UNLOCKED - -/* Define if you have the getc_unlocked function. */ -#undef HAVE_GETC_UNLOCKED - -/* Define if you have the getcwd function. */ -#undef HAVE_GETCWD - -/* Define if you have the getegid function. */ -#undef HAVE_GETEGID - -/* Define if you have the geteuid function. */ -#undef HAVE_GETEUID - -/* Define if you have the getgid function. */ -#undef HAVE_GETGID - -/* Define if you have the gethostbyname2 function. */ -#undef HAVE_GETHOSTBYNAME2 - -/* Define if you have the getpagesize function. */ -#undef HAVE_GETPAGESIZE - -/* Define if you have the getpwuid function. */ -#undef HAVE_GETPWUID - -/* Define if you have the gettimeofday function. */ -#undef HAVE_GETTIMEOFDAY - -/* Define if you have the getuid function. */ -#undef HAVE_GETUID - -/* Define if you have the isatty function. */ -#undef HAVE_ISATTY - -/* Define if you have the memalign function. */ -#undef HAVE_MEMALIGN - -/* Define if you have the mempcpy function. */ -#undef HAVE_MEMPCPY - -/* Define if you have the munmap function. */ -#undef HAVE_MUNMAP - -/* Define if you have the posix_memalign function. */ -#undef HAVE_POSIX_MEMALIGN - -/* Define if you have the putenv function. */ -#undef HAVE_PUTENV - -/* Define if you have the select function. */ -#undef HAVE_SELECT - -/* Define if you have the setenv function. */ -#undef HAVE_SETENV - -/* Define if you have the setlocale function. */ -#undef HAVE_SETLOCALE - -/* Define if you have the sigrelse function. */ -#undef HAVE_SIGRELSE - -/* Define if you have the stpcpy function. */ -#undef HAVE_STPCPY - -/* Define if you have the strcasecmp function. */ -#undef HAVE_STRCASECMP - -/* Define if you have the strdup function. */ -#undef HAVE_STRDUP - -/* Define if you have the strerror function. */ -#undef HAVE_STRERROR - -/* Define if you have the strndup function. */ -#undef HAVE_STRNDUP - -/* Define if you have the strtod function. */ -#undef HAVE_STRTOD - -/* Define if you have the strtol function. */ -#undef HAVE_STRTOL - -/* Define if you have the strtoul function. */ -#undef HAVE_STRTOUL - -/* Define if you have the swab function. */ -#undef HAVE_SWAB - -/* Define if you have the tsearch function. */ -#undef HAVE_TSEARCH - -/* Define if you have the vasprintf function. */ -#undef HAVE_VASPRINTF - -/* Define if you have the header file. */ -#undef HAVE_COCOA_COCOA_H - -/* Define if you have the header file. */ -#undef HAVE_PH_H - -/* Define if you have the header file. */ -#undef HAVE_X11_XLIB_H - -/* Define if you have the header file. */ -#undef HAVE_X11_EXTENSIONS_XV_H - -/* Define if you have the header file. */ -#undef HAVE_X11_EXTENSIONS_DPMS_H - -/* Define if you have the header file. */ -#undef HAVE_A52DEC_A52_H - -/* Define if you have the header file. */ -#undef HAVE_ARGZ_H - -/* Define if you have the header file. */ -#undef HAVE_ARPA_INET_H - -/* Define if you have the header file. */ -#undef HAVE_CTHREADS_H - -/* Define if you have the header file. */ -#undef HAVE_DDRAW_H - -/* Define if you have the header file. */ -#undef HAVE_DLFCN_H - -/* Define if you have the header file. */ -#undef HAVE_DVBPSI_DR_H - -/* Define if you have the header file. */ -#undef HAVE_DVDCSS_DVDCSS_H - -/* Define if you have the header file. */ -#undef HAVE_DVDPLAY_DVDPLAY_H - -/* Define if you have the header file. */ -#undef HAVE_DVDREAD_DVD_READER_H - -/* Define if you have the header file. */ -#undef HAVE_FAAD_H - -/* Define if you have the header file. */ -#undef HAVE_FCNTL_H - -/* Define if you have the header file. */ -#undef HAVE_GDK_GDK_H - -/* Define if you have the header file. */ -#undef HAVE_GETOPT_H - -/* Define if you have the header file. */ -#undef HAVE_GLIB_H - -/* Define if you have the header file. */ -#undef HAVE_GNOME_H - -/* Define if you have the header file. */ -#undef HAVE_GTK_GTK_H - -/* Define if you have the header file. */ -#undef HAVE_ID3TAG_H - -/* Define if you have the header file. */ -#undef HAVE_IMAGE_H - -/* Define if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define if you have the header file. */ -#undef HAVE_KERNEL_OS_H - -/* Define if you have the header file. */ -#undef HAVE_KERNEL_SCHEDULER_H - -/* Define if you have the header file. */ -#undef HAVE_LIBDV_DV_H - -/* Define if you have the header file. */ -#undef HAVE_LIBV4L_V4L_H - -/* Define if you have the header file. */ -#undef HAVE_LIMITS_H - -/* Define if you have the header file. */ -#undef HAVE_LINUX_FB_H - -/* Define if you have the header file. */ -#undef HAVE_LINUX_VERSION_H - -/* Define if you have the header file. */ -#undef HAVE_LOCALE_H - -/* Define if you have the header file. */ -#undef HAVE_MACHINE_PARAM_H - -/* Define if you have the header file. */ -#undef HAVE_MACHINE_SOUNDCARD_H - -/* Define if you have the header file. */ -#undef HAVE_MAD_H - -/* Define if you have the header file. */ -#undef HAVE_MALLOC_H - -/* Define if you have the header file. */ -#undef HAVE_NET_IF_H - -/* Define if you have the header file. */ -#undef HAVE_NETINET_IN_H - -/* Define if you have the header file. */ -#undef HAVE_NL_TYPES_H - -/* Define if you have the header file. */ -#undef HAVE_OGG_OGG_H - -/* Define if you have the header file. */ -#undef HAVE_PTHREAD_H - -/* Define if you have the header file. */ -#undef HAVE_SOUNDCARD_H - -/* Define if you have the header file. */ -#undef HAVE_STDDEF_H - -/* Define if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define if you have the header file. */ -#undef HAVE_STRING_H - -/* Define if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_INT_TYPES_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_SHM_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_SOCKET_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_SOCKIO_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_SOUNDCARD_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_TIME_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_TIMES_H - -/* Define if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define if you have the header file. */ -#undef HAVE_ZLIB_H - -/* Define if you have the pth library (-lpth). */ -#undef HAVE_LIBPTH - -/* Define if you have the st library (-lst). */ -#undef HAVE_LIBST - -/* Package name */ -#undef VLC_PACKAGE - -/* Package version */ -#undef VLC_VERSION - -/* Define if exists, doesn't clash with , - and declares uintmax_t. */ -#undef HAVE_INTTYPES_H_WITH_UINTMAX - -/* Define if exists, doesn't clash with , - and declares uintmax_t. */ -#undef HAVE_STDINT_H_WITH_UINTMAX - -/* Define if you have the unsigned long long type. */ -#undef HAVE_UNSIGNED_LONG_LONG - -/* Define if integer division by zero raises signal SIGFPE. */ -#undef INTDIV0_RAISES_SIGFPE - -/* Define to unsigned long or unsigned long long - if and don't define. */ -#undef uintmax_t - -/* Define if exists and doesn't clash with . */ -#undef HAVE_INTTYPES_H - -/* Define if exists and defines unusable PRI* macros. */ -#undef PRI_MACROS_BROKEN - -/* Define if you have the iconv() function. */ -#undef HAVE_ICONV - -/* Define as const if the declaration of iconv() needs const. */ -#undef ICONV_CONST - -/* Define if you have and nl_langinfo(CODESET). */ -#undef HAVE_LANGINFO_CODESET - -/* Define if your file defines LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES - -/* Define to 1 if translation of program messages to the user's native language - is requested. */ -#undef ENABLE_NLS - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - -/* Define if the GNU dcgettext() function is already present or preinstalled. */ -#undef HAVE_DCGETTEXT - -/* Define if nanosleep is available. */ -#undef HAVE_NANOSLEEP - -/* long getopt support */ -#undef HAVE_GETOPT_LONG - -/* getopt support */ -#undef HAVE_GETOPT_LONG - -/* Define if defines pthread_cond_t. */ -#undef PTHREAD_COND_T_IN_PTHREAD_H - -/* Define if defines pthread_once. */ -#undef PTHREAD_ONCE_IN_PTHREAD_H - -/* Define if defines strncasecmp. */ -#undef STRNCASECMP_IN_STRINGS_H - -/* Define if defines nanosleep. */ -#undef HAVE_DECL_NANOSLEEP - -/* Define if defines struct timespec. */ -#undef HAVE_STRUCT_TIMESPEC - -/* Define if defines DPMSInfo. */ -#undef DPMSINFO_IN_DPMS_H - -/* Define if defines ntohl. */ -#undef NTOHL_IN_SYS_PARAM_H - -/* Support for variadic macros */ -#undef HAVE_VARIADIC_MACROS - -/* Maximum supported data alignment */ -#undef ATTRIBUTE_ALIGNED_MAX - -/* Define if $CC groks 3D Now! inline assembly. */ -#undef CAN_COMPILE_3DNOW - -/* Define if $CC groks SSE inline assembly. */ -#undef CAN_COMPILE_SSE - -/* Define if $CC groks AltiVec inline assembly. */ -#undef CAN_COMPILE_ALTIVEC - -/* Define if your compiler groks C AltiVec extensions. */ -#undef CAN_COMPILE_C_ALTIVEC - -/* For FreeBSD VCD support */ -#undef HAVE_IOC_TOC_HEADER_IN_SYS_CDIO_H - -/* Indicate whether we should use SDL/SDL.h or SDL11/SDL.h */ -#undef SDL_INCLUDE_FILE - -/* Define if is pre-1.0.0 */ -#undef HAVE_OLD_XOSD_H - -/* big endian system */ -#undef WORDS_BIGENDIAN - -/* Define if defines pth_init */ -#undef PTH_INIT_IN_PTH_H - -/* Define if defines st_init */ -#undef ST_INIT_IN_ST_H - -/* Simple version string */ -#undef VERSION_MESSAGE - -/* Copyright string */ -#undef COPYRIGHT_MESSAGE - -/* The ./configure command line */ -#undef CONFIGURE_LINE - -/* String suffix for module functions */ -#undef MODULE_SUFFIX - -/* Symbol suffix for module functions */ -#undef MODULE_SYMBOL - diff --git a/include/vlc/vlc.h b/include/vlc/vlc.h index dbe4a7e906..01ecf79e7e 100644 --- a/include/vlc/vlc.h +++ b/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" diff --git a/include/config.h b/include/vlc_config.h similarity index 100% rename from include/config.h rename to include/vlc_config.h