summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 26477ae)
raw | patch | inline | side by side (parent: 26477ae)
author | Thomas Vander Stichele <thomas@apestaart.org> | |
Mon, 20 Jan 2003 14:10:14 +0000 (14:10 +0000) | ||
committer | Thomas Vander Stichele <thomas@apestaart.org> | |
Mon, 20 Jan 2003 14:10:14 +0000 (14:10 +0000) |
Original commit message from CVS:
make forte happy
make forte happy
common | patch | blob | history | |
configure.ac | patch | blob | history |
index bbd74e96ef37a7d437930f85f939a6a7d36dd012..bc8b71d0f48b1283b975913c841fa4f1326f2991 160000 (submodule)
--- a/common
+++ b/common
-Subproject commit bbd74e96ef37a7d437930f85f939a6a7d36dd012
+Subproject commit bc8b71d0f48b1283b975913c841fa4f1326f2991
diff --git a/configure.ac b/configure.ac
index 4ee2272e82ca2437e27c683f03ec9c3e6fe6df48..49aa74c1e81fa616515954a5d75823f237eb7370 100644 (file)
--- a/configure.ac
+++ b/configure.ac
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
-AS_VERSION(gstreamer, GST_VERSION, 0, 5, 1, 1, GST_ERROR="-Wall", GST_ERROR="-Wall -Werror")
+AS_VERSION(gstreamer, GST_VERSION, 0, 5, 1, 1, GST_CVS="no", GST_CVS="yes")
+
dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
AM_MAINTAINER_MODE
AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
GST_MAJORMINOR=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
AC_SUBST(GST_MAJORMINOR)
+AC_PROG_CC
+dnl For interactive UNIX (a Sun thing)
+AC_ISC_POSIX
+
dnl CURRENT, REVISION, AGE
dnl - library source changed -> increment REVISION
dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL)
ACLOCAL="$ACLOCAL -I common/m4 $ACLOCAL_FLAGS"
-AC_PROG_CC
-dnl For interactive UNIX (a Sun thing)
-AC_ISC_POSIX
AM_PROG_CC_STDC
AM_PROG_AS
AS="${CC}"
+dnl decide on error flags
+AS_COMPILER(COMPILER)
+if test "x$COMPILER" = "xforte"; then
+ GST_ERROR=
+else
+ if test "x$GST_CVS"="xyes"; then
+ GST_ERROR="-Wall -Werror"
+ else
+ GST_ERROR="-Wall"
+ fi
+fi
+
dnl We disable static building for development, for time savings
dnl *NOTE*: dnl this line before release, so release does static too
dnl AM_DISABLE_STATIC
AC_SUBST(GST_CFLAGS, "$LIBGST_CFLAGS $GST_INT_CFLAGS")
AC_SUBST(GST_LIBS, "$LIBGST_LIBS $GST_INT_LIBS")
-GST_PLUGIN_LDFLAGS='-module -avoid-version'
+GST_PLUGIN_LDFLAGS="-module -avoid-version"
AC_SUBST(GST_PLUGIN_LDFLAGS, "$GST_PLUGIN_LDFLAGS")
AC_CONFIG_SUBDIRS(libs/ext/cothreads)