[cvs-annodex] commit (/annodex): libfishsound/branches/1.0-stable/ChangeLog libfishsound/branches/1.0-stable/autogen.sh libfishsound/branches/1.0-stable/configure.ac -libfishsound/branches/1.0-stable/m4/as-ac-expand.m4 +libfishsound/branches/1.0-stable/m4/ +libfishsound/branches/1.0-stable/m4/as-ac-expand.m4

[conrad]

Update of /annodex (new revision 1394)

Added files:
   libfishsound/branches/1.0-stable/m4/
   libfishsound/branches/1.0-stable/m4/as-ac-expand.m4

Removed files:
   libfishsound/branches/1.0-stable/m4/as-ac-expand.m4

Modified files:
   libfishsound/branches/1.0-stable/ChangeLog
   libfishsound/branches/1.0-stable/autogen.sh
   libfishsound/branches/1.0-stable/configure.ac

Log Message:
libfishsound-stable: backport changeset:1337 (thomasvs' autotools cleanups)


Modified: libfishsound/branches/1.0-stable/ChangeLog
===================================================================
--- libfishsound/branches/1.0-stable/ChangeLog	2005-07-18 08:36:28 UTC (rev 1393)
+++ libfishsound/branches/1.0-stable/ChangeLog	2005-07-18 08:56:57 UTC (rev 1394)
@@ -17,10 +17,10 @@
 
 	Improved handling of first and last blocks of data (bos and eos
 	packets in Ogg):
-        * new fish_sound_prepare_truncation() API call
-        * improved encdec-audio test to keep track of frames in and out,
-          and warn if unequal. (Currently not set to FAIL on this condition
-          as it appears to be common for Speex)
+	* new fish_sound_prepare_truncation() API call
+	* improved encdec-audio test to keep track of frames in and out,
+	  and warn if unequal. (Currently not set to FAIL on this condition
+	  as it appears to be common for Speex)
 
 	Updates to Win32 nmake build files
 

Modified: libfishsound/branches/1.0-stable/autogen.sh
===================================================================
--- libfishsound/branches/1.0-stable/autogen.sh	2005-07-18 08:36:28 UTC (rev 1393)
+++ libfishsound/branches/1.0-stable/autogen.sh	2005-07-18 08:56:57 UTC (rev 1394)
@@ -118,7 +118,7 @@
   FINK_DETECTED=1
 fi
 
-eval "$ACLOCAL"
+eval "$ACLOCAL -I m4"
 
 # do we need libtool?
 if grep -q PROG_LIBTOOL configure.*; then

Modified: libfishsound/branches/1.0-stable/configure.ac
===================================================================
--- libfishsound/branches/1.0-stable/configure.ac	2005-07-18 08:36:28 UTC (rev 1393)
+++ libfishsound/branches/1.0-stable/configure.ac	2005-07-18 08:56:57 UTC (rev 1394)
@@ -21,6 +21,9 @@
 AC_C_CONST
 AC_C_BIGENDIAN
 
+dnl Add parameters for aclocal
+AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
+
 # Check for doxygen
 AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, true, false)
 AM_CONDITIONAL(HAVE_DOXYGEN,$HAVE_DOXYGEN)
@@ -43,13 +46,13 @@
   if test "x$HAVE_VALGRIND" = xyes ; then
     VALGRIND_ENVIRONMENT="$VALGRIND_ENVIRONMENT valgrind -q --leak-check=yes --show-reachable=yes --num-callers=100"
     AC_SUBST(VALGRIND_ENVIRONMENT)
-    TESTS_INFO="'make check' test suite will be run under:
+    TESTS_INFO="Type 'make check' to run test suite. Tests will be run under:
   ${VALGRIND_ENVIRONMENT}"
   else
-    TESTS_INFO="'make check' to run test suite (Valgrind not found)"
+    TESTS_INFO="Type 'make check' to run test suite (Valgrind not found)"
   fi
 else
-  TESTS_INFO="'make check' to run test suite (Valgrind testing not enabled)"
+  TESTS_INFO="Type 'make check' to run test suite (Valgrind testing not enabled)"
 fi
 
 dnl Overall configuration success flag
@@ -411,6 +414,11 @@
 fishsound.pc
 ])
 
+AS_AC_EXPAND(LIBDIR, ${libdir})
+AS_AC_EXPAND(INCLUDEDIR, ${includedir})
+AS_AC_EXPAND(BINDIR, ${bindir})
+AS_AC_EXPAND(DOCDIR, ${datadir}/doc)
+
 AC_MSG_RESULT([
 ------------------------------------------------------------------------
   $PACKAGE $VERSION:  Automatic configuration OK.
@@ -432,12 +440,18 @@
 
   Installation paths:
 
-    libfishsound: ................ ${prefix}/lib
-    C header files: .............. ${prefix}/include/fishsound
-    Documentation: ............... ${prefix}/share/doc/$PACKAGE
+    libfishsound: ................ ${LIBDIR}
+    C header files: .............. ${INCLUDEDIR}/fishsound
+    Documentation: ............... ${DOCDIR}/$PACKAGE
 
-  ${TESTS_INFO}
+  Building:
 
+    Type 'make' to compile $PACKAGE.
+
+    Type 'make install' to install $PACKAGE.
+
+    ${TESTS_INFO}
+
   Example programs will be built but not installed.
 ------------------------------------------------------------------------
 ])

Copied: libfishsound/branches/1.0-stable/m4 (from rev 1337, libfishsound/trunk/m4)

Deleted: libfishsound/branches/1.0-stable/m4/as-ac-expand.m4

Copied: libfishsound/branches/1.0-stable/m4/as-ac-expand.m4 (from rev 1337, libfishsound/trunk/m4/as-ac-expand.m4)


-- 
conrad