--- libgig/trunk/configure.in 2005/02/14 18:22:42 383 +++ libgig/trunk/configure.in 2007/03/24 11:55:06 1116 @@ -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=1 +LIBGIG_RELEASE_BUILD=1 #------------------------------------------------------------------------------------ -# 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,7 +24,10 @@ # 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=7 +LIBGIG_LT_REVISION=0 +LIBGIG_LT_AGE=1 +SHARED_VERSION_INFO="$LIBGIG_LT_CURRENT:$LIBGIG_LT_REVISION:$LIBGIG_LT_AGE" AC_C_BIGENDIAN @@ -35,7 +41,7 @@ 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 +49,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 +66,7 @@ exit -1; fi -AC_OUTPUT(Makefile doc/Makefile man/Makefile src/Makefile libgig.spec gig.pc Doxyfile) +AM_CONFIG_HEADER(config.h) +AM_INIT_AUTOMAKE(libgig, "$LIBGIG_RELEASE_MAJOR.$LIBGIG_RELEASE_MINOR.$LIBGIG_RELEASE_BUILD") + +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 debian/Makefile src/testcases/Makefile)