[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog macros/ogg.m4
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] gnash ChangeLog macros/ogg.m4 |
Date: |
Mon, 09 Oct 2006 07:59:23 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/10/09 07:59:23
Modified files:
. : ChangeLog
macros : ogg.m4
Log message:
* macros/ogg.m4: use PKG_CONFIG *after* having manually looked.
this prevents the checks for actual existance of the lib from
confusing an LDFLAG with a path, resulting in an error
(LDFLAGS
contain spaces).
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1076&r2=1.1077
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/ogg.m4?cvsroot=gnash&r1=1.9&r2=1.10
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1076
retrieving revision 1.1077
diff -u -b -r1.1076 -r1.1077
--- ChangeLog 9 Oct 2006 07:50:18 -0000 1.1076
+++ ChangeLog 9 Oct 2006 07:59:23 -0000 1.1077
@@ -1,5 +1,9 @@
2006-10-09 Sandro Santilli <address@hidden>
+ * macros/ogg.m4: use PKG_CONFIG *after* having manually looked.
+ this prevents the checks for actual existance of the lib from
+ confusing an LDFLAG with a path, resulting in an error (LDFLAGS
+ contain spaces).
* backend/render_handler.h, backend/render_handler_agg.cpp,
backend/render_handler_tri.cpp, backend/render_handler_tri.h:
Changed corner_count argument of draw_poly() method to an
Index: macros/ogg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/ogg.m4,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- macros/ogg.m4 9 Oct 2006 04:39:06 -0000 1.9
+++ macros/ogg.m4 9 Oct 2006 07:59:23 -0000 1.10
@@ -110,10 +110,6 @@
fi
])
- if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ogg_lib}" = x; then
- ac_cv_path_ogg_lib=`$PKG_CONFIG --libs ogg`
- fi
-
dnl If the header doesn't exist, there is no point looking for the
library.
if test x"${ac_cv_path_ogg_lib}" = x; then
AC_CHECK_LIB(ogg, ogg_sync_init, [ac_cv_path_ogg_lib="-logg"],[
@@ -143,6 +139,10 @@
fi
fi
+ if test x"$PKG_CONFIG" != x -a x"${ac_cv_path_ogg_lib}" = x; then
+ ac_cv_path_ogg_lib=`$PKG_CONFIG --libs ogg`
+ fi
+
if test x"${ac_cv_path_ogg_lib}" != x ; then
OGG_LIBS="${ac_cv_path_ogg_lib}"
else
- [Gnash-commit] gnash ChangeLog macros/ogg.m4,
Sandro Santilli <=