--- libgig/trunk/configure.in	2005/05/16 18:19:27	546
+++ libgig/trunk/configure.ac	2013/12/31 00:13:20	2484
@@ -1,7 +1,17 @@
-AC_INIT(configure.in)
+#------------------------------------------------------------------------------------
+# Library's "official" release version:
+
+m4_define(libgig_release_major, 3)
+m4_define(libgig_release_minor, 3)
+m4_define(libgig_release_build, 0.svn7)
+
+
+AC_INIT([libgig],[libgig_release_major.libgig_release_minor.libgig_release_build])
+AC_CONFIG_SRCDIR([configure.ac])
 
 #------------------------------------------------------------------------------------
-# 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
@@ -16,20 +26,24 @@
 #  6. If any interfaces have been removed since the last public release, then set age
 #     to 0.
 
-LIBGIG_CURRENT=2
-LIBGIG_REVISION=0
-LIBGIG_AGE=0
-SHARED_VERSION_INFO="$LIBGIG_CURRENT:$LIBGIG_REVISION:$LIBGIG_AGE"
-
+LIBGIG_LT_CURRENT=10
+LIBGIG_LT_REVISION=0
+LIBGIG_LT_AGE=4
+SHARED_VERSION_INFO="$LIBGIG_LT_CURRENT:$LIBGIG_LT_REVISION:$LIBGIG_LT_AGE"
 
-AC_C_BIGENDIAN
 
-AC_LANG_CPLUSPLUS
+AC_LANG([C++])
 AC_PROG_CXX
-AM_PROG_LIBTOOL
+AC_LIBTOOL_WIN32_DLL
+AC_PROG_LIBTOOL
+
+AC_C_BIGENDIAN
 
 AC_SUBST(SHLIB_VERSION_ARG)
 AC_SUBST(SHARED_VERSION_INFO)
+AC_SUBST(LIBGIG_RELEASE_MAJOR, libgig_release_major)
+AC_SUBST(LIBGIG_RELEASE_MINOR, libgig_release_minor)
+AC_SUBST(LIBGIG_RELEASE_BUILD, libgig_release_build)
 
 have_audio_file_lib="false"
 
@@ -58,7 +72,59 @@
     exit -1;
 fi
 
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libgig, "$LIBGIG_CURRENT.$LIBGIG_REVISION.$LIBGIG_AGE")
+AC_CHECK_HEADERS(uuid/uuid.h)
+AC_SEARCH_LIBS(uuid_generate, uuid)
+AC_CHECK_FUNCS(uuid_generate)
+
+case "$host" in
+    *mingw*|*cygwin*)
+        win32=yes
+        ;;
+    *)
+        win32=no
+        ;;
+esac
+AM_CONDITIONAL(WIN32, test "$win32" = "yes")
+
+case "$host" in
+    *-*-darwin*)
+        mac=yes
+        ;;
+    *)
+        mac=no
+        ;;
+esac
+AM_CONDITIONAL(MAC, test "$mac" = "yes")
+
+if test "$ac_cv_func_uuid_generate" = no -a "$mac" = 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
+
+AC_CONFIG_HEADERS([config.h])
+AM_INIT_AUTOMAKE
 
-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)
+AC_CONFIG_FILES([\
+    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/gigmerge.1 \
+    man/gig2mono.1 \
+    man/rifftree.1 \
+    debian/Makefile \
+    osx/Makefile \
+    osx/libgig.xcodeproj/Makefile \
+    win32/Makefile \
+    win32/libgig.dev \
+])
+AC_OUTPUT