--- libgig/trunk/configure.in	2005/05/08 16:19:34	518
+++ libgig/trunk/configure.in	2005/06/12 13:06:57	632
@@ -1,9 +1,4 @@
 AC_INIT(configure.in)
-AM_CONFIG_HEADER(config.h)
-
-AM_INIT_AUTOMAKE(libgig, 1.0.0, cuse@users.sourceforge.net)
-AC_PROG_LIBTOOL
-
 
 #------------------------------------------------------------------------------------
 # Rules for library version information:
@@ -21,9 +16,9 @@
 #  6. If any interfaces have been removed since the last public release, then set age
 #     to 0.
 
-LIBGIG_CURRENT=1
+LIBGIG_CURRENT=2
 LIBGIG_REVISION=0
-LIBGIG_AGE=0
+LIBGIG_AGE=1
 SHARED_VERSION_INFO="$LIBGIG_CURRENT:$LIBGIG_REVISION:$LIBGIG_AGE"
 
 
@@ -46,17 +41,16 @@
 AC_SUBST(SNDFILE_LIBS)
 if test "$ac_cv_sndfile" = "1"; then
     have_audio_file_lib="true";
+else
+    # no libsndfile? then check for presence of libaudiofile
+    PKG_CHECK_MODULES(AUDIOFILE, audiofile >= 0.2.3, ac_cv_audiofile=1, ac_cv_audiofile=0)
+    AC_DEFINE_UNQUOTED([HAVE_AUDIOFILE],${ac_cv_audiofile}, [Set to 1 if you have libaudiofile.])
+    AC_SUBST(AUDIOFILE_CFLAGS)
+    AC_SUBST(AUDIOFILE_LIBS)
+    if test "$ac_cv_audiofile" = "1"; then
+        have_audio_file_lib="true";
+    fi
 fi
-
-# check for presence of libaudiofile
-PKG_CHECK_MODULES(AUDIOFILE, audiofile >= 0.2.3, ac_cv_audiofile=1, ac_cv_audiofile=0)
-AC_DEFINE_UNQUOTED([HAVE_AUDIOFILE],${ac_cv_audiofile}, [Set to 1 if you have libaudiofile.])
-AC_SUBST(AUDIOFILE_CFLAGS)
-AC_SUBST(AUDIOFILE_LIBS)
-if test "$ac_cv_audiofile" = "1"; then
-    have_audio_file_lib="true";
-fi
-
 if test "$have_audio_file_lib" = "false"; then
     echo "No audio file library found!"
     echo "Sorry, you need either libsndfile or libaudiofile to compile libgig."
@@ -64,6 +58,7 @@
     exit -1;
 fi
 
+AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(libgig, "$LIBGIG_CURRENT.$LIBGIG_REVISION.$LIBGIG_AGE")
 
 AC_OUTPUT(Makefile doc/Makefile man/Makefile src/Makefile libgig.spec gig.pc Doxyfile man/dlsdump.1 man/gigdump.1 man/gigextract.1 man/rifftree.1)