make forte happy

Original commit message from CVS:
make forte happy
This commit is contained in:
Thomas Vander Stichele 2003-01-20 14:10:14 +00:00
parent 26477ae320
commit f1526799e0
2 changed files with 20 additions and 6 deletions

2
common

@ -1 +1 @@
Subproject commit bbd74e96ef37a7d437930f85f939a6a7d36dd012 Subproject commit bc8b71d0f48b1283b975913c841fa4f1326f2991

View file

@ -3,7 +3,8 @@ AC_CANONICAL_TARGET([])
dnl when going to/from release please set the nano (fourth number) right ! dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too 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 dnl AM_MAINTAINER_MODE only provides the option to configure to enable it
AM_MAINTAINER_MODE AM_MAINTAINER_MODE
AM_INIT_AUTOMAKE($PACKAGE,$VERSION) AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
@ -12,6 +13,10 @@ dnl our libraries and install dirs use major.minor as a version
GST_MAJORMINOR=$GST_VERSION_MAJOR.$GST_VERSION_MINOR GST_MAJORMINOR=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
AC_SUBST(GST_MAJORMINOR) AC_SUBST(GST_MAJORMINOR)
AC_PROG_CC
dnl For interactive UNIX (a Sun thing)
AC_ISC_POSIX
dnl CURRENT, REVISION, AGE dnl CURRENT, REVISION, AGE
dnl - library source changed -> increment REVISION dnl - library source changed -> increment REVISION
dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0 dnl - interfaces added/removed/changed -> increment CURRENT, REVISION = 0
@ -26,13 +31,22 @@ dnl Add parameters for aclocal
dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL) dnl (This must come after AM_INIT_AUTOMAKE, since it modifies ACLOCAL)
ACLOCAL="$ACLOCAL -I common/m4 $ACLOCAL_FLAGS" 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_CC_STDC
AM_PROG_AS AM_PROG_AS
AS="${CC}" 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 We disable static building for development, for time savings
dnl *NOTE*: dnl this line before release, so release does static too dnl *NOTE*: dnl this line before release, so release does static too
dnl AM_DISABLE_STATIC dnl AM_DISABLE_STATIC
@ -420,7 +434,7 @@ GST_INT_CFLAGS="$GST_INT_CFLAGS -I\$(top_srcdir)/libs -I\$(top_srcdir)/include"
AC_SUBST(GST_CFLAGS, "$LIBGST_CFLAGS $GST_INT_CFLAGS") AC_SUBST(GST_CFLAGS, "$LIBGST_CFLAGS $GST_INT_CFLAGS")
AC_SUBST(GST_LIBS, "$LIBGST_LIBS $GST_INT_LIBS") 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_SUBST(GST_PLUGIN_LDFLAGS, "$GST_PLUGIN_LDFLAGS")
AC_CONFIG_SUBDIRS(libs/ext/cothreads) AC_CONFIG_SUBDIRS(libs/ext/cothreads)