[GRASS-SVN] r36869 - grass/branches/develbranch_6

[svn_grass at osgeo.org]

Author: neteler
Date: 2009-04-22 10:18:36 -0400 (Wed, 22 Apr 2009)
New Revision: 36869

Modified:
   grass/branches/develbranch_6/configure
   grass/branches/develbranch_6/configure.in
Log:
Funda Wang <fundawang mandriva.org>: fix for CAIRO detection (trac #467)

Modified: grass/branches/develbranch_6/configure
===================================================================
--- grass/branches/develbranch_6/configure	2009-04-22 14:09:12 UTC (rev 36868)
+++ grass/branches/develbranch_6/configure	2009-04-22 14:18:36 UTC (rev 36869)
@@ -13940,8 +13940,8 @@
 
 CAIROLIB=`pkg-config --libs cairo`
 
-ac_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS $CAIROLIB"
+ac_save_libs="$LIBS"
+LIBS="$LIBS $CAIROLIB"
 echo $ac_n "checking for cairo_create""... $ac_c" 1>&6
 echo "configure:13947: checking for cairo_create" >&5
 
@@ -13990,7 +13990,7 @@
 
 fi
 
-LDFLAGS=${ac_save_ldflags}
+LIBS=${ac_save_libs}
 
 fi # $USE_CAIRO
 

Modified: grass/branches/develbranch_6/configure.in
===================================================================
--- grass/branches/develbranch_6/configure.in	2009-04-22 14:09:12 UTC (rev 36868)
+++ grass/branches/develbranch_6/configure.in	2009-04-22 14:18:36 UTC (rev 36869)
@@ -1485,12 +1485,12 @@
 
 CAIROLIB=`pkg-config --libs cairo`
 
-ac_save_ldflags="$LDFLAGS"
-LDFLAGS="$LDFLAGS $CAIROLIB"
+ac_save_libs="$LIBS"
+LIBS="$LIBS $CAIROLIB"
 AC_CHECK_FUNC(cairo_create,,[
 AC_MSG_ERROR([*** Unable to locate cairo_create() function.])
 ])
-LDFLAGS=${ac_save_ldflags}
+LIBS=${ac_save_libs}
 
 fi # $USE_CAIRO