using autoheader to generate config.h so we get rid of the long compile

lines filled with defines.
I also added a ChangeLog, if people don't like that feel free to flame me down
and I'll remove it.

svn path=/trunk/vorbis/; revision=7481

diff --git a/ChangeLog b/ChangeLog
new file mode 100644 (file)
index 0000000..f3c26f7
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,8 @@
+2004-08-05  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * autogen.sh:
+         activate autoheader
+       * configure.in:
+         generate config.h
+       * lib/os.h:
+         include config.h because we use a define from it

diff --git a/autogen.sh b/autogen.sh
index eb4d01c..b1679bd 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -62,8 +62,8 @@ echo "Generating configuration files for $package, please wait...."
 
 echo "  aclocal $ACLOCAL_FLAGS"
 aclocal $ACLOCAL_FLAGS || exit 1
-#echo "  autoheader"
-#autoheader
+echo "  autoheader"
+autoheader || exit 1
 echo "  $LIBTOOLIZE --automake"
 $LIBTOOLIZE --automake || exit 1
 echo "  automake --add-missing $AUTOMAKE_FLAGS"

diff --git a/configure.in b/configure.in
index c8c8534..b5f1a84 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -9,6 +9,8 @@ AC_INIT(lib/mdct.c)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
+AM_CONFIG_HEADER([config.h])
+
 AM_INIT_AUTOMAKE(libvorbis,1.0.1)
 AM_MAINTAINER_MODE
 

diff --git a/lib/os.h b/lib/os.h
index 523cd5c..6a0571f 100644 (file)
--- a/lib/os.h
+++ b/lib/os.h
@@ -13,10 +13,14 @@
  ********************************************************************
 
  function: #ifdef jail to whip a few platforms into the UNIX ideal.
- last mod: $Id: os.h,v 1.33 2003/09/02 05:11:53 xiphmont Exp $
+ last mod: $Id$
 
  ********************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <math.h>
 #include <ogg/os_types.h>