Menu
▾
▴
[Bitcollider-commits] CVS: bitcollider aclocal.m4,1.10,1.11 autogen.sh,1.3,1.4 config.h.in,1.10,1.11 configure.in,1.14,1.15 acconfig.h,1.4,NONE
|
From: Robert K. <may...@us...> - 2004-02-02 00:05:40
|
Update of /cvsroot/bitcollider/bitcollider In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31834 Modified Files: aclocal.m4 autogen.sh config.h.in configure.in Removed Files: acconfig.h Log Message: Updated for cleaner support of later libtools/autoconf/automake in order to enable clean support for OS X. Index: aclocal.m4 =================================================================== RCS file: /cvsroot/bitcollider/bitcollider/aclocal.m4,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** aclocal.m4 8 Jul 2002 19:39:56 -0000 1.10 --- aclocal.m4 2 Feb 2004 00:03:36 -0000 1.11 *************** *** 1,46 **** ! dnl aclocal.m4 generated automatically by aclocal 1.4 ! dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. ! dnl This file is free software; the Free Software Foundation ! dnl gives unlimited permission to copy and/or distribute it, ! dnl with or without modifications, as long as this notice is preserved. ! ! dnl This program is distributed in the hope that it will be useful, ! dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without ! dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A [...7149 lines suppressed...] ! # ------------------------------------------------------------ ! # We used to try to get a real timestamp in stamp-h. But the fear is that ! # that will cause unnecessary cvs conflicts. ! AC_DEFUN([_AM_CONFIG_HEADER], ! [# Add the stamp file to the list of files AC keeps track of, ! # along with our hook. ! AC_CONFIG_HEADERS([$1], ! [# update the timestamp ! echo 'timestamp for $1' >"_AM_STAMP([$1])" ! $2], ! [$3]) ! ])# _AM_CONFIG_HEADER ! ! ! # AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS) ! # -------------------------------------------------------------- ! AC_DEFUN([AM_CONFIG_HEADER], ! [AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) ! ])# AM_CONFIG_HEADER Index: autogen.sh =================================================================== RCS file: /cvsroot/bitcollider/bitcollider/autogen.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** autogen.sh 9 Jul 2001 21:19:52 -0000 1.3 --- autogen.sh 2 Feb 2004 00:03:37 -0000 1.4 *************** *** 10,13 **** --- 10,19 ---- cd "$srcdir" DIE=0 + LIBTOOLIZE=libtoolize + + # Check to see if we need to use the Mac OS X libtool version + (glibtoolize --version) < /dev/null > /dev/null 2>&1 && { + LIBTOOLIZE=glibtoolize + } (autoconf --version) < /dev/null > /dev/null 2>&1 || { *************** *** 19,22 **** --- 25,36 ---- } + (automake --version) < /dev/null > /dev/null 2>&1 || { + echo + echo "You must have automake installed to compile $package." + echo "Download the appropriate package for your distribution," + echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/automake" + DIE=1 + } + if test "$DIE" -eq 1; then exit 1 *************** *** 32,37 **** echo " autoheader" autoheader ! echo " libtoolize --automake --ltdl" ! libtoolize --automake --ltdl echo " automake --add-missing" automake --add-missing --- 46,51 ---- echo " autoheader" autoheader ! echo " $LIBTOOLIZE --automake --ltdl" ! $LIBTOOLIZE --automake --ltdl echo " automake --add-missing" automake --add-missing Index: config.h.in =================================================================== RCS file: /cvsroot/bitcollider/bitcollider/config.h.in,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -r1.10 -r1.11 *** config.h.in 8 Jul 2002 19:39:56 -0000 1.10 --- config.h.in 2 Feb 2004 00:03:37 -0000 1.11 *************** *** 1,19 **** ! /* config.h.in. Generated automatically from configure.in by autoheader. */ ! /* Define if your processor stores words with the most significant ! byte first (like Motorola and SPARC, unlike Intel and VAX). */ ! #undef WORDS_BIGENDIAN ! #undef USE_BDB ! #undef USE_VORBIS ! #undef PREFIX ! /* The number of bytes in a long. */ ! #undef SIZEOF_LONG /* Name of package */ #undef PACKAGE /* Version number of package */ #undef VERSION --- 1,68 ---- ! /* config.h.in. Generated from configure.in by autoheader. */ ! /* Define to 1 if you have the <dlfcn.h> header file. */ ! #undef HAVE_DLFCN_H ! /* Define to 1 if you have the <inttypes.h> header file. */ ! #undef HAVE_INTTYPES_H ! /* Define to 1 if you have the <memory.h> header file. */ ! #undef HAVE_MEMORY_H ! ! /* Define to 1 if you have the <stdint.h> header file. */ ! #undef HAVE_STDINT_H ! ! /* Define to 1 if you have the <stdlib.h> header file. */ ! #undef HAVE_STDLIB_H ! ! /* Define to 1 if you have the <strings.h> header file. */ ! #undef HAVE_STRINGS_H ! ! /* Define to 1 if you have the <string.h> header file. */ ! #undef HAVE_STRING_H ! ! /* Define to 1 if you have the <sys/stat.h> header file. */ ! #undef HAVE_SYS_STAT_H ! ! /* Define to 1 if you have the <sys/types.h> header file. */ ! #undef HAVE_SYS_TYPES_H ! ! /* Define to 1 if you have the <unistd.h> header file. */ ! #undef HAVE_UNISTD_H /* Name of package */ #undef PACKAGE + /* Define to the address where bug reports for this package should be sent. */ + #undef PACKAGE_BUGREPORT + + /* Define to the full name of this package. */ + #undef PACKAGE_NAME + + /* Define to the full name and version of this package. */ + #undef PACKAGE_STRING + + /* Define to the one symbol short name of this package. */ + #undef PACKAGE_TARNAME + + /* Define to the version of this package. */ + #undef PACKAGE_VERSION + + /* "PREFIX" */ + #undef PREFIX + + /* The size of a `long', as computed by sizeof. */ + #undef SIZEOF_LONG + + /* Define to 1 if you have the ANSI C header files. */ + #undef STDC_HEADERS + + /* "ogg/vorbis support" */ + #undef USE_VORBIS + /* Version number of package */ #undef VERSION + /* Define to 1 if your processor stores words with the most significant byte + first (like Motorola and SPARC, unlike Intel and VAX). */ + #undef WORDS_BIGENDIAN Index: configure.in =================================================================== RCS file: /cvsroot/bitcollider/bitcollider/configure.in,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -r1.14 -r1.15 *** configure.in 16 Sep 2002 20:45:32 -0000 1.14 --- configure.in 2 Feb 2004 00:03:37 -0000 1.15 *************** *** 7,11 **** VERSION="0.4.0" AM_INIT_AUTOMAKE(bitcollider, "$VERSION") - dnl AC_DEFINE_UNQUOTED(VERSION, "$VERSION") CFLAGS="-Wall -g -O3" --- 7,10 ---- *************** *** 32,36 **** dnl AC_CHECK_LIB(db, db_create, have_db="yes", have_db="no") dnl if test "$have_db" = "yes"; then ! dnl AC_DEFINE(USE_BDB) dnl BDB_LIBS="-ldb" dnl AC_SUBST(BDB_LIBS) --- 31,35 ---- dnl AC_CHECK_LIB(db, db_create, have_db="yes", have_db="no") dnl if test "$have_db" = "yes"; then ! dnl AC_DEFINE(USE_BDB, 1, "[Berkeley DB Support]") dnl BDB_LIBS="-ldb" dnl AC_SUBST(BDB_LIBS) *************** *** 47,51 **** if test "$have_ogg" = "yes"; then if test "$have_vorbis" = "yes"; then ! AC_DEFINE(USE_VORBIS) VORBIS_LIBS="-lvorbisfile -lvorbis -logg" VORBIS_SUB="vorbis" --- 46,50 ---- if test "$have_ogg" = "yes"; then if test "$have_vorbis" = "yes"; then ! AC_DEFINE(USE_VORBIS, 1, "[ogg/vorbis support]") VORBIS_LIBS="-lvorbisfile -lvorbis -logg" VORBIS_SUB="vorbis" *************** *** 61,66 **** AC_SUBST(CFLAGS) ! AC_DEFINE_UNQUOTED(PREFIX, "${prefix}") AM_CONFIG_HEADER(config.h) ! AC_CONFIG_SUBDIRS(libltdl) AC_OUTPUT(Makefile lib/Makefile src/Makefile vorbis/Makefile wav/Makefile image/Makefile video/Makefile, echo timestamp > stamp-h) --- 60,65 ---- AC_SUBST(CFLAGS) ! AC_DEFINE_UNQUOTED(PREFIX, "${prefix}", "PREFIX") AM_CONFIG_HEADER(config.h) ! dnl AC_CONFIG_SUBDIRS(libltdl) AC_OUTPUT(Makefile lib/Makefile src/Makefile vorbis/Makefile wav/Makefile image/Makefile video/Makefile, echo timestamp > stamp-h) --- acconfig.h DELETED --- |
