From d24c1c68d1406a3b149e9d6387cd1d385f70a7f8 Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Sun, 22 Jul 2001 05:16:44 +0000
Subject: [PATCH] try this

SVN revision: 4976
---
 legacy/evas/configure.in    | 10 +++++-----
 legacy/evas/src/evas_text.c | 10 ++++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index 85266d18d2..d3c190e080 100644
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -96,7 +96,7 @@ AC_MSG_ERROR([Fatal Error: no Imlib2 detected.]); exit],
 `$IMLIB2_CONFIG --libs` `$IMLIB2_CONFIG --cflags`)
 )
 
-AC_CHECK_LIB(ttf, TT_Init_FreeType, TTF_LIBS=-lttf $LIBS_TTF, [
+AC_CHECK_LIB(ttf, TT_Init_FreeType, TTF_LIBS="-lttf "$LIBS_TTF, [
 echo ""
 echo "ERROR: Evas needs a system with libttf.so (TrueType Font Library)"
 echo "You can obtain it from:"
@@ -142,21 +142,21 @@ gl_includes=""
 #### Find out about OpenGL
 PREV_CPPFLAGS=$CPPFLAGS
 CPPFLAGS=$CPPFLAGS" -I/usr/include -I/usr/local/include "$x_cflags
-AC_TRY_CPP(GL/gl.h,
+AC_TRY_CPP([#include <GL/gl.h>],
 echo "checking for GL/gl.h... yes"
 gl_includes=$CPPFLAGS" -I/usr/include -I/usr/local/include "$x_cflags
 AC_CHECK_LIB(GL, glBindTexture, have_gl=yes,[
-], -L/usr/local/lib -lGL $X_LDFLAGS $X_EXTRA_LIBS $X_LIBS $LIBS_GL)
+], -L/usr/local/lib -lGL $X_LDFLAGS $X_EXTRA_LIBS $X_LIBS $LIBS_GL -lm)
 )
 if test "x$have_gl" = "xyes"; then
   gl_includes=$gl_includes
   gl_ldflags=$gl_ldflags" -L/usr/local/lib "$X_LDFLAGS" "$X_EXTRA_LIBS" "$X_LIBS" "$LIBS_GL
   gl_libs=$gl_libs" -lGL"
   AC_DEFINE(HAVE_GL)
-  AC_TRY_CPP(GL/glu.h,
+  AC_TRY_CPP([#include <GL/glu.h>],
   echo "checking for GL/glu.h... yes"
   AC_CHECK_LIB(GLU, gluBuild2DMipmaps, have_glu=yes,[
-  ], $gl_ldflags -lGL -lGLU)
+  ], $gl_ldflags -lGL -lGLU -lm)
   )
   AC_CHECK_LIB(GLU, gluTessBeginPolygon, ,[
    echo ""
diff --git a/legacy/evas/src/evas_text.c b/legacy/evas/src/evas_text.c
index c85ca5856b..c67767f963 100644
--- a/legacy/evas/src/evas_text.c
+++ b/legacy/evas/src/evas_text.c
@@ -830,6 +830,8 @@ evas_set_text(Evas e, Evas_Object o, char *text)
 	     oo->current.text = NULL;
 	     if (text)
 		oo->current.text = strdup(text);
+	     else
+	       oo->current.text = strdup("");	     
 	     oo->previous.text = NULL;
 	       {	     
 		  switch (e->current.render_method)
@@ -935,9 +937,9 @@ evas_set_text(Evas e, Evas_Object o, char *text)
 	       }
 	     o->current.w = (double)oo->current.string.w;
 	     o->current.h = (double)oo->current.string.h;
+	     o->changed = 1;
+	     e->changed = 1;
 	  }
-	o->changed = 1;
-	e->changed = 1;
 	break;
      default:
 	break;
@@ -1070,9 +1072,9 @@ evas_set_font(Evas e, Evas_Object o, char *font, int size)
 	       }
 	     o->current.w = (double)oo->current.string.w;
 	     o->current.h = (double)oo->current.string.h;
+	     o->changed = 1;
+	     e->changed = 1;
 	  }
-	o->changed = 1;
-	e->changed = 1;
 	break;
      default:
 	break;