mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-11-26 11:41:09 +00:00
Add AS and ASFLAGS to configure.base, fixing the build with automake 1.4g
Original commit message from CVS: Add AS and ASFLAGS to configure.base, fixing the build with automake 1.4g AS is defined in a hacky way: I've asked on the automake list for help doing this properly.
This commit is contained in:
parent
266e62d332
commit
41aa12b2c6
1 changed files with 12 additions and 6 deletions
|
@ -969,9 +969,6 @@ LIBS="$CORE_LIBS $LIBS"
|
||||||
AC_SUBST(CORE_LIBS)
|
AC_SUBST(CORE_LIBS)
|
||||||
AC_SUBST(CORE_CFLAGS)
|
AC_SUBST(CORE_CFLAGS)
|
||||||
|
|
||||||
dnl FIXME: having to AC_SUBST these is messy. Not sure if CPPFLAGS and LDFLAGS
|
|
||||||
dnl need it, either.
|
|
||||||
|
|
||||||
dnl Vars for everyone else
|
dnl Vars for everyone else
|
||||||
GST_LIBS="\$(top_builddir)/gst/libgst.la"
|
GST_LIBS="\$(top_builddir)/gst/libgst.la"
|
||||||
GST_CFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/include"
|
GST_CFLAGS="-I\$(top_srcdir) -I\$(top_srcdir)/include"
|
||||||
|
@ -986,11 +983,20 @@ AC_SUBST(LIBGST_CFLAGS)
|
||||||
|
|
||||||
dnl CFLAGS for everyone else
|
dnl CFLAGS for everyone else
|
||||||
CFLAGS="$CFLAGS $GST_CFLAGS"
|
CFLAGS="$CFLAGS $GST_CFLAGS"
|
||||||
|
|
||||||
|
dnl Needed to make automake 1.4g happy.
|
||||||
|
dnl FIXME: find as properly, rather than just using CC
|
||||||
|
AS="\$(CC)"
|
||||||
|
|
||||||
|
dnl Having to AC_SUBST these is messy, but doesn't seem to do any harm.
|
||||||
|
dnl I'm not sure whether it's really necessary, but it removes some warnings
|
||||||
|
dnl when automake 1.4g runs, and may be beneficial elsewhere.
|
||||||
AC_SUBST(LIBS)
|
AC_SUBST(LIBS)
|
||||||
AC_SUBST(CFLAGS)
|
AC_SUBST(CFLAGS)
|
||||||
|
AC_SUBST(CPPFLAGS)
|
||||||
dnl AC_SUBST(CPPFLAGS)
|
AC_SUBST(LDFLAGS)
|
||||||
dnl AC_SUBST(LDFLAGS)
|
AC_SUBST(AS)
|
||||||
|
AC_SUBST(ASFLAGS)
|
||||||
|
|
||||||
|
|
||||||
dnl #############################
|
dnl #############################
|
||||||
|
|
Loading…
Reference in a new issue