Fixed doxygen config file.

diff --git a/configure.in b/configure.in
index 22bb7e0a4f45e26dcffc291e68904fe3ea3f7d29..015c84c364970fe3381df30654e19fadafdf4f93 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -31,21 +31,21 @@ if test "$kerneldir" != "" -a -d $kerneldir/include ; then
 fi
 AC_MSG_RESULT($ALSA_CFLAGS)
 
-dnl Check for asound.h localtion
-ASOUND_PATH=""
-if test x"$kerneldir" != x""; then
-  if test -f $kerneldir/include/sound/asound.h; then
-    ASOUND_PATH=$kerneldir/include/sound
-  fi
-fi
-if test x$asound_loc = x ; then
-  if test -f /usr/include/sound/asound.h; then
-    ASOUND_PATH=/usr/include/sound
-  else
-    ASOUND_PATH=../../alsa-driver/include
-  fi
-fi
-AC_SUBST(ASOUND_PATH)
+dnl dnl Check for asound.h localtion
+dnl ASOUND_PATH=""
+dnl if test x"$kerneldir" != x""; then
+dnl   if test -f $kerneldir/include/sound/asound.h; then
+dnl     ASOUND_PATH=$kerneldir/include/sound
+dnl   fi
+dnl fi
+dnl if test x$asound_loc = x ; then
+dnl   if test -f /usr/include/sound/asound.h; then
+dnl     ASOUND_PATH=/usr/include/sound
+dnl   else
+dnl     ASOUND_PATH=../../alsa-driver/include
+dnl   fi
+dnl fi
+dnl AC_SUBST(ASOUND_PATH)
     
 dnl Checks for header files.
 AC_HEADER_STDC
@@ -94,4 +94,4 @@ AC_OUTPUT(Makefile doc/Makefile include/Makefile src/Makefile \
           src/compat/Makefile src/conf/Makefile \
          src/conf/cards/Makefile src/conf/pcm/Makefile \
          aserver/Makefile test/Makefile utils/Makefile \
-          utils/alsa-lib.spec doc/doxygen.cfg)
+          utils/alsa-lib.spec)

diff --git a/doc/Makefile.am b/doc/Makefile.am
index 6e21d76564fd74fb3bb08de0573c1d856dd35e0d..e9f6d78368548e8459c76ffd8b985941864cfe35 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,4 +1,4 @@
-EXTRA_DIST=README.1st asoundrc.txt
+EXTRA_DIST=README.1st asoundrc.txt doxygen.cfg
 
 INCLUDES=-I$(top_srcdir)/include
 

diff --git a/doc/doxygen.cfg.in b/doc/doxygen.cfg
similarity index 92%
rename from doc/doxygen.cfg.in
rename to doc/doxygen.cfg
index bc18fa89cbfdc76c135ec8670cb5b944c4b41d16..d37b36089d3a384fc5f3239b6ec4158534cbea0d 100644 (file)
--- a/doc/doxygen.cfg.in
+++ b/doc/doxygen.cfg
@@ -5,7 +5,7 @@ GENERATE_MAN     = NO
 GENERATE_RTF    = NO
 
 CASE_SENSE_NAMES = NO
-INPUT            = @ASOUND_PATH@/asound.h ../include/asoundlib.h ../src
+INPUT            = ../include ../src
 EXCLUDE                 = ../src/control/control_local.h \
                   ../src/pcm/atomic.h \
                   ../src/pcm/interval.h \