scrub cflags

Original commit message from CVS:
scrub cflags
This commit is contained in:
Thomas Vander Stichele 2004-05-22 11:01:15 +00:00
parent 9afd2f70ab
commit ce74039b2d
2 changed files with 9 additions and 1 deletions

View file

@ -1,3 +1,9 @@
2004-05-22 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac:
scrub cflags for glib2 so gcc doesn't complain when glib is in
/usr/local
2004-05-21 Johan Dahlin <johan@gnome.org> 2004-05-21 Johan Dahlin <johan@gnome.org>
* gst/gstcpu.c (gst_cpuid_i386): Protect some gcc asm stuff with * gst/gstcpu.c (gst_cpuid_i386): Protect some gcc asm stuff with

View file

@ -3,7 +3,7 @@ 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, 8, 1, 1, GST_CVS="no", GST_CVS="yes") AS_VERSION(gstreamer, GST_VERSION, 0, 8, 1, 2, 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
@ -252,6 +252,8 @@ AC_SUBST(GLIB2_REQ)
dnl Check for glib2 with sugar on top dnl Check for glib2 with sugar on top
PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQ gobject-2.0 gthread-2.0 gmodule-2.0,HAVE_GLIB2=yes,HAVE_GLIB2=no) PKG_CHECK_MODULES(GLIB2, glib-2.0 >= $GLIB2_REQ gobject-2.0 gthread-2.0 gmodule-2.0,HAVE_GLIB2=yes,HAVE_GLIB2=no)
dnl for the poor souls who for example have glib in /usr/local
AS_SCRUB_CFLAGS(GLIB2_CFLAGS)
GLIB_LIBS=$GLIB2_LIBS GLIB_LIBS=$GLIB2_LIBS
GLIB_CFLAGS=$GLIB2_CFLAGS GLIB_CFLAGS=$GLIB2_CFLAGS
AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_LIBS)