[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash/macros agg.m4
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash/macros agg.m4 |
Date: |
Sat, 07 Oct 2006 17:14:28 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 06/10/07 17:14:28
Modified files:
macros : agg.m4
Log message:
Handle the --with-options correctly. Set -I or -L for the paths.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.2&r2=1.3
Patches:
Index: agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- agg.m4 7 Oct 2006 02:54:24 -0000 1.2
+++ agg.m4 7 Oct 2006 17:14:28 -0000 1.3
@@ -43,17 +43,16 @@
AC_ARG_WITH(agg_incl, [ --with-agg-incl directory where AGG headers
are], with_agg_incl=${withval})
AC_CACHE_VAL(ac_cv_path_agg_incl,[
if test x"${with_agg_incl}" != x ; then
- if test -f ${with_agg_incl}/agg_rasterizer_compound_aa.h.h ; then
- ac_cv_path_agg_incl=`(cd ${with_agg_incl}; pwd)`
- elif test -f ${with_agg_incl}/agg_rasterizer_compound_aa.h ; then
- ac_cv_path_agg_incl=`(cd ${with_agg_incl}; pwd)`
+ if test -f ${with_agg_incl}/agg_rasterizer_compound_aa.h ; then
+ ac_cv_path_agg_incl="-I`(cd ${with_agg_incl}; pwd)`"
+ agg24=yes
else
AC_MSG_ERROR([${with_agg_incl} directory doesn't contain any headers])
+ agg24=no
fi
fi
])
- agg24=no
if test x"${ac_cv_path_agg_incl}" = x ; then
AC_MSG_CHECKING([for AGG headers])
incllist="${prefix}/include /sw/include /usr/local/include
/home/latest/include /opt/include /usr/include .. ../.."
@@ -87,7 +86,7 @@
AC_CACHE_VAL(ac_cv_path_agg_lib,[
if test x"${with_agg_lib}" != x ; then
if test -f ${with_agg_lib}/libagg.a -o -f ${with_agg_lib}/libagg.so; then
- ac_cv_path_agg_lib=`(cd ${with_agg_incl}; pwd)`
+ ac_cv_path_agg_lib="-L`(cd ${with_agg_incl}; pwd)`"
else
AC_MSG_ERROR([${with_agg_lib} directory doesn't contain AGG libraries.])
fi
- [Gnash-commit] gnash/macros agg.m4,
Rob Savoye <=