--- libgig/trunk/configure.in	2005/02/14 18:22:42	383
+++ libgig/trunk/configure.in	2007/10/14 14:20:50	1417
@@ -1,12 +1,15 @@
 AC_INIT(configure.in)
-AM_CONFIG_HEADER(config.h)
 
-AM_INIT_AUTOMAKE(libgig, 1.0.0, cuse@users.sourceforge.net)
-AC_PROG_LIBTOOL
+#------------------------------------------------------------------------------------
+# Library's "official" release version:
 
+LIBGIG_RELEASE_MAJOR=3
+LIBGIG_RELEASE_MINOR=2
+LIBGIG_RELEASE_BUILD=0
 
 #------------------------------------------------------------------------------------
-# Rules for library version information:
+# The following is the libtool / shared library version. This doesn't have to
+# do anything with the release version. It MUST conform to the following rules:
 #
 #  1. Start with version information of `0:0:0' for each libtool library.
 #  2. Update the version information only immediately before a public release of
@@ -21,21 +24,27 @@
 #  6. If any interfaces have been removed since the last public release, then set age
 #     to 0.
 
-SHARED_VERSION_INFO="1:0:0"
+LIBGIG_LT_CURRENT=8
+LIBGIG_LT_REVISION=0
+LIBGIG_LT_AGE=2
+SHARED_VERSION_INFO="$LIBGIG_LT_CURRENT:$LIBGIG_LT_REVISION:$LIBGIG_LT_AGE"
 
 
-AC_C_BIGENDIAN
-
 AC_LANG_CPLUSPLUS
 AC_PROG_CXX
 AM_PROG_LIBTOOL
 
+AC_C_BIGENDIAN
+
 AC_SUBST(SHLIB_VERSION_ARG)
 AC_SUBST(SHARED_VERSION_INFO)
+AC_SUBST(LIBGIG_RELEASE_MAJOR)
+AC_SUBST(LIBGIG_RELEASE_MINOR)
+AC_SUBST(LIBGIG_RELEASE_BUILD)
 
 have_audio_file_lib="false"
 
-// check for presence of libsndfile
+# check for presence of libsndfile
 PKG_CHECK_MODULES(SNDFILE, sndfile >= 1.0.2, ac_cv_sndfile=1, ac_cv_sndfile=0)
 AM_CONDITIONAL(HAVE_SNDFILE, test $ac_cv_sndfile = "1")
 AC_DEFINE_UNQUOTED([HAVE_SNDFILE],${ac_cv_sndfile}, [Set to 1 if you have libsndfile.])
@@ -43,17 +52,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."
@@ -61,4 +69,46 @@
     exit -1;
 fi
 
-AC_OUTPUT(Makefile doc/Makefile man/Makefile src/Makefile libgig.spec gig.pc Doxyfile)
+AC_CHECK_HEADERS(uuid/uuid.h)
+AC_SEARCH_LIBS(uuid_generate, uuid)
+AC_CHECK_FUNCS(uuid_generate CFUUIDCreate)
+
+case "$host" in
+    *mingw*|*cygwin*)
+        win32=yes
+        ;;
+    *)
+        win32=no
+        ;;
+esac
+AM_CONDITIONAL(WIN32, test "$win32" = "yes")
+
+if test "$ac_cv_func_uuid_generate" = no -a "$ac_cv_func_CFUUIDCreate" = no -a "$win32" = no; then
+   AC_MSG_WARN([No UUID generate function found.
+*** libgig will not be able to create DLSIDs in DLS and gig files.
+*** Install libuuid from e2fsprogs to solve this. Package might be called
+*** uuid-dev, libext2fs2-devel or e2fsprogs-devel.])
+fi
+
+AM_CONFIG_HEADER(config.h)
+AM_INIT_AUTOMAKE(libgig, "$LIBGIG_RELEASE_MAJOR.$LIBGIG_RELEASE_MINOR.$LIBGIG_RELEASE_BUILD")
+
+AC_OUTPUT( \
+    Doxyfile \
+    gig.pc \
+    libgig.spec \
+    Makefile \
+    src/Makefile \
+    src/testcases/Makefile \
+    doc/Makefile \
+    man/Makefile \
+    man/dlsdump.1 \
+    man/gigdump.1 \
+    man/gigextract.1 \
+    man/rifftree.1 \
+    debian/Makefile \
+    osx/Makefile \
+    osx/libgig.xcodeproj/Makefile \
+    win32/Makefile \
+    win32/libgig.dev \
+)