[Libspiff-commits] SF.net SVN: libspiff:[505] trunk

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 505
          http://libspiff.svn.sourceforge.net/libspiff/?rev=505&view=rev
Author:   hartwork
Date:     2008-11-16 23:06:25 +0000 (Sun, 16 Nov 2008)

Log Message:
-----------
- Move some build files to build-aux directory
- Rename configure.in to configure.ac

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/bootstrap.sh
    trunk/test/CppTest/config.h.in

Added Paths:
-----------
    trunk/configure.ac

Removed Paths:
-------------
    trunk/configure.in

Property Changed:
----------------
    trunk/


Property changes on: trunk
___________________________________________________________________
Modified: svn:ignore
   - .deps
.libs
.project
Makefile
autom4te.cache
config.*
conftest.*
confdefs.h
libtool
acinclude.m4
aclocal.m4
config.guess
config.sub
configure
depcomp
INSTALL
install-sh
ltmain.sh
Makefile.in
missing
*.bz2
*.gz
*.lzma
*.zip

   + .deps
.libs
.project
Makefile
autom4te.cache
build-aux
config.log
config.status
conftest.*
confdefs.h
libtool
acinclude.m4
aclocal.m4
configure
INSTALL
Makefile.in
*.bz2
*.gz
*.lzma
*.zip


Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2008-11-09 00:28:49 UTC (rev 504)
+++ trunk/ChangeLog	2008-11-16 23:06:25 UTC (rev 505)
@@ -2,6 +2,9 @@
 
   * Fixed: Test suite compile fix for GCC 4.3
       Thanks to Alexis Ballier for the patch!
+  * Changed: Build system changes:
+      - configure.in renamed to configure.ac
+      - some Autotools files moved to build-aux directory
 
 2008-09-21 -- 1.0.0
 

Modified: trunk/bootstrap.sh
===================================================================
--- trunk/bootstrap.sh	2008-11-09 00:28:49 UTC (rev 504)
+++ trunk/bootstrap.sh	2008-11-16 23:06:25 UTC (rev 505)
@@ -27,9 +27,10 @@
 fi
 LIBTOOLIZE_VERSION=`${LIBTOOLIZE} --version | head -1 | grep -o '[^ ]*$'`
 step "${LIBTOOLIZE}${WHITESPACE}${LIBTOOLIZE_VERSION}"
+mkdir -p build-aux
 ${LIBTOOLIZE} --copy --force >/dev/null || exit 1
-wget 'http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD' -O config.guess &>/dev/null || exit 1
-grep '^timestamp=' config.guess >/dev/null || exit 1
+wget 'http://git.savannah.gnu.org/gitweb/?p=gnulib.git;a=blob_plain;f=build-aux/config.guess;hb=HEAD' -O build-aux/config.guess &>/dev/null || exit 1
+grep '^timestamp=' build-aux/config.guess >/dev/null || exit 1
 
 ## Autoconf
 AUTOCONF_VERSION=`autoconf --version | head -1 | grep -o '[^ ]*$'`

Copied: trunk/configure.ac (from rev 503, trunk/configure.in)
===================================================================
--- trunk/configure.ac	                        (rev 0)
+++ trunk/configure.ac	2008-11-16 23:06:25 UTC (rev 505)
@@ -0,0 +1,129 @@
+# Process this file with autoconf to produce a configure script.
+AC_PREREQ(2.61)
+AC_INIT(src/SpiffReader.cpp)
+AC_CONFIG_AUX_DIR([build-aux])
+AM_INIT_AUTOMAKE(libspiff, 1.0.0)
+AM_CONFIG_HEADER(test/CppTest/config.h)
+
+AC_PROG_LIBTOOL
+AC_PROG_INSTALL
+AC_PROG_CC
+AC_PROG_CXX
+AC_HEADER_STDC
+
+
+
+# These are for and from CppTest
+AC_CHECK_HEADERS(sys/time.h)
+AC_CHECK_FUNCS([gettimeofday])
+AC_MSG_CHECKING(for round)
+AC_TRY_COMPILE(
+	[ #include <math.h> ],
+	[ double d = round(1.0); ],
+	[ round=yes ],[ round=no ])
+AC_MSG_RESULT($round)
+if test "$round" = "yes"; then
+	AC_DEFINE([HAVE_ROUND],,[Defined if the function exists])
+fi
+
+
+
+# Expat
+AC_ARG_WITH(expat, [
+Dependency locations:
+  --with-expat=DIR        override path of Expat
+                          ("/lib" and "/include" is appended)], [
+	if test "x${withval}" = "x"; then
+		AC_MSG_ERROR([No path given for option --with-expat])
+	fi
+	LDFLAGS="-L${withval}/lib ${LDFLAGS}"
+	CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
+], [])
+
+AC_ARG_WITH(expat-inc, [  --with-expat-inc=DIR    override include path of Expat], [
+	if test "x${withval}" = "x"; then
+		AC_MSG_ERROR([No path given for option --with-expat-inc])
+	fi
+	CPPFLAGS="-I${withval} ${CPPFLAGS}"
+], [])
+
+AC_ARG_WITH(expat-lib, [  --with-expat-lib=DIR    override library path of Expat], [
+	if test "x${withval}" = "x"; then
+		AC_MSG_ERROR([No path given for option --with-expat-lib])
+	fi
+	LDFLAGS="-L${withval} ${LDFLAGS}"
+], [])
+
+
+
+# uriparser
+AC_ARG_WITH(uriparser, [  --with-uriparser=DIR    override path of uriparser
+                          ("/lib" and "/include" is appended)], [
+	if test "x${withval}" = "x"; then
+		AC_MSG_ERROR([No path given for option --with-uriparser])
+	fi
+	LDFLAGS="-L${withval}/lib ${LDFLAGS}"
+	CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
+], [])
+
+AC_ARG_WITH(uriparser-inc, [  --with-uriparser-inc=D  override include path of uriparser], [
+	if test "x${withval}" = "x"; then
+		AC_MSG_ERROR([No path given for option --with-uriparser-inc])
+	fi
+	CPPFLAGS="-I${withval} ${CPPFLAGS}"
+], [])
+
+AC_ARG_WITH(uriparser-lib, [  --with-uriparser-lib=D  override library path of uriparser], [
+	if test "x${withval}" = "x"; then
+		AC_MSG_ERROR([No path given for option --with-uriparser-lib])
+	fi
+	LDFLAGS="-L${withval} ${LDFLAGS}"
+], [])
+
+
+
+# Local headers must come very first. Otherwise we
+# risk including headers of an already installed
+# libSpiff version if its path is in CPPFLAGS
+CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}"
+
+
+
+# Append $prefix as a fallback at the very end
+if test "x${prefix}" != "xNONE"; then
+	WORKING_PREFIX=${prefix}
+else
+	WORKING_PREFIX=${ac_default_prefix}
+fi
+LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib"
+CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include"
+
+
+
+# Check presence
+EXPAT_MISSING="Please install expat 1.95.8 or later.
+   On a Debian-based system enter 'sudo apt-get install libexpat-dev'."
+AC_CHECK_LIB(expat, XML_ResumeParser,, AC_MSG_ERROR(${EXPAT_MISSING}))
+AC_CHECK_HEADER(expat.h,, AC_MSG_ERROR(${EXPAT_MISSING}))
+
+URIPARSER_MISSING="Please install uriparser 0.7.2 or later.
+   On a Debian-based system enter 'sudo apt-get install liburiparser-dev'."
+AC_CHECK_LIB(uriparser, uriParseUriA,, AC_MSG_ERROR(${URIPARSER_MISSING}))
+AC_CHECK_HEADER(uriparser/Uri.h,, AC_MSG_ERROR(${URIPARSER_MISSING}))
+
+URIPARSER_TOO_OLD="uriparser 0.7.2 or later is required, your copy is too old."
+AC_COMPILE_IFELSE([
+#include <uriparser/Uri.h>
+#if (defined(URI_VER_MAJOR) && defined(URI_VER_MINOR) && defined(URI_VER_RELEASE) \
+&& ((URI_VER_MAJOR > 0) \
+|| ((URI_VER_MAJOR == 0) && (URI_VER_MINOR > 7)) \
+|| ((URI_VER_MAJOR == 0) && (URI_VER_MINOR == 7) && (URI_VER_RELEASE >= 2)) \
+))
+/* FINE */
+#else
+# error uriparser not recent enough
+#endif
+],,AC_MSG_ERROR(${URIPARSER_TOO_OLD}))
+
+
+AC_OUTPUT(Makefile)


Property changes on: trunk/configure.ac
___________________________________________________________________
Added: svn:mergeinfo
   + 

Deleted: trunk/configure.in
===================================================================
--- trunk/configure.in	2008-11-09 00:28:49 UTC (rev 504)
+++ trunk/configure.in	2008-11-16 23:06:25 UTC (rev 505)
@@ -1,128 +0,0 @@
-# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.61)
-AC_INIT(src/SpiffReader.cpp)
-AM_INIT_AUTOMAKE(libspiff, 1.0.0)
-AM_CONFIG_HEADER(test/CppTest/config.h)
-
-AC_PROG_LIBTOOL
-AC_PROG_INSTALL
-AC_PROG_CC
-AC_PROG_CXX
-AC_HEADER_STDC
-
-
-
-# These are for and from CppTest
-AC_CHECK_HEADERS(sys/time.h)
-AC_CHECK_FUNCS([gettimeofday])
-AC_MSG_CHECKING(for round)
-AC_TRY_COMPILE(
-	[ #include <math.h> ],
-	[ double d = round(1.0); ],
-	[ round=yes ],[ round=no ])
-AC_MSG_RESULT($round)
-if test "$round" = "yes"; then
-	AC_DEFINE([HAVE_ROUND],,[Defined if the function exists])
-fi
-
-
-
-# Expat
-AC_ARG_WITH(expat, [
-Dependency locations:
-  --with-expat=DIR        override path of Expat
-                          ("/lib" and "/include" is appended)], [
-	if test "x${withval}" = "x"; then
-		AC_MSG_ERROR([No path given for option --with-expat])
-	fi
-	LDFLAGS="-L${withval}/lib ${LDFLAGS}"
-	CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
-], [])
-
-AC_ARG_WITH(expat-inc, [  --with-expat-inc=DIR    override include path of Expat], [
-	if test "x${withval}" = "x"; then
-		AC_MSG_ERROR([No path given for option --with-expat-inc])
-	fi
-	CPPFLAGS="-I${withval} ${CPPFLAGS}"
-], [])
-
-AC_ARG_WITH(expat-lib, [  --with-expat-lib=DIR    override library path of Expat], [
-	if test "x${withval}" = "x"; then
-		AC_MSG_ERROR([No path given for option --with-expat-lib])
-	fi
-	LDFLAGS="-L${withval} ${LDFLAGS}"
-], [])
-
-
-
-# uriparser
-AC_ARG_WITH(uriparser, [  --with-uriparser=DIR    override path of uriparser
-                          ("/lib" and "/include" is appended)], [
-	if test "x${withval}" = "x"; then
-		AC_MSG_ERROR([No path given for option --with-uriparser])
-	fi
-	LDFLAGS="-L${withval}/lib ${LDFLAGS}"
-	CPPFLAGS="-I${withval}/include ${CPPFLAGS}"
-], [])
-
-AC_ARG_WITH(uriparser-inc, [  --with-uriparser-inc=D  override include path of uriparser], [
-	if test "x${withval}" = "x"; then
-		AC_MSG_ERROR([No path given for option --with-uriparser-inc])
-	fi
-	CPPFLAGS="-I${withval} ${CPPFLAGS}"
-], [])
-
-AC_ARG_WITH(uriparser-lib, [  --with-uriparser-lib=D  override library path of uriparser], [
-	if test "x${withval}" = "x"; then
-		AC_MSG_ERROR([No path given for option --with-uriparser-lib])
-	fi
-	LDFLAGS="-L${withval} ${LDFLAGS}"
-], [])
-
-
-
-# Local headers must come very first. Otherwise we
-# risk including headers of an already installed
-# libSpiff version if its path is in CPPFLAGS
-CPPFLAGS="-I${srcdir}/include ${CPPFLAGS}"
-
-
-
-# Append $prefix as a fallback at the very end
-if test "x${prefix}" != "xNONE"; then
-	WORKING_PREFIX=${prefix}
-else
-	WORKING_PREFIX=${ac_default_prefix}
-fi
-LDFLAGS="${LDFLAGS} -L${WORKING_PREFIX}/lib"
-CPPFLAGS="${CPPFLAGS} -I${WORKING_PREFIX}/include"
-
-
-
-# Check presence
-EXPAT_MISSING="Please install expat 1.95.8 or later.
-   On a Debian-based system enter 'sudo apt-get install libexpat-dev'."
-AC_CHECK_LIB(expat, XML_ResumeParser,, AC_MSG_ERROR(${EXPAT_MISSING}))
-AC_CHECK_HEADER(expat.h,, AC_MSG_ERROR(${EXPAT_MISSING}))
-
-URIPARSER_MISSING="Please install uriparser 0.7.2 or later.
-   On a Debian-based system enter 'sudo apt-get install liburiparser-dev'."
-AC_CHECK_LIB(uriparser, uriParseUriA,, AC_MSG_ERROR(${URIPARSER_MISSING}))
-AC_CHECK_HEADER(uriparser/Uri.h,, AC_MSG_ERROR(${URIPARSER_MISSING}))
-
-URIPARSER_TOO_OLD="uriparser 0.7.2 or later is required, your copy is too old."
-AC_COMPILE_IFELSE([
-#include <uriparser/Uri.h>
-#if (defined(URI_VER_MAJOR) && defined(URI_VER_MINOR) && defined(URI_VER_RELEASE) \
-&& ((URI_VER_MAJOR > 0) \
-|| ((URI_VER_MAJOR == 0) && (URI_VER_MINOR > 7)) \
-|| ((URI_VER_MAJOR == 0) && (URI_VER_MINOR == 7) && (URI_VER_RELEASE >= 2)) \
-))
-/* FINE */
-#else
-# error uriparser not recent enough
-#endif
-],,AC_MSG_ERROR(${URIPARSER_TOO_OLD}))
-
-
-AC_OUTPUT(Makefile)

Modified: trunk/test/CppTest/config.h.in
===================================================================
--- trunk/test/CppTest/config.h.in	2008-11-09 00:28:49 UTC (rev 504)
+++ trunk/test/CppTest/config.h.in	2008-11-16 23:06:25 UTC (rev 505)
@@ -1,4 +1,4 @@
-/* test/CppTest/config.h.in.  Generated from configure.in by autoheader.  */
+/* test/CppTest/config.h.in.  Generated from configure.ac by autoheader.  */
 
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.


