Fix linking error on Ubuntu 13.04

Change-Id: Ia75046455fc439a294b0aaf3ecfd51c435749c8c
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/Makefile.target b/Makefile.target
index a0175dfcdbf429da0d337ddacf5a2b8c93d7f988..c6dc96846a82edea637aaf273bc083f36ce43e7c 100755 (executable)
--- a/Makefile.target
+++ b/Makefile.target
@@ -303,7 +303,9 @@ CHECK_GL_LDFLAGS =
 CHECK_GL_TARGET =
 ifdef CONFIG_LINUX
 CHECK_GL_OBJS += gloffscreen_xcomposite.o
-CHECK_GL_LDFLAGS += -lGL -lXcomposite -lXext -lglib-2.0
+#CHECK_GL_LDFLAGS += -lGL -lXcomposite -lXext -lglib-2.0
+# Fix linking error on Ubuntu 13.04
+CHECK_GL_LDFLAGS += -lGL -lXcomposite -lX11 -lXext -lglib-2.0
 CHECK_GL_TARGET = check-gl
 endif
 ifdef CONFIG_WIN32

diff --git a/configure b/configure
index cd7fb0654eea625a3486e724c21d262caccd0435..6ca30b9f67460e989f828ed5ff1702d96ba81f96 100755 (executable)
--- a/configure
+++ b/configure
@@ -539,6 +539,8 @@ Haiku)
   if [ "$cpu" = "i386" -o "$cpu" = "x86_64" ] ; then
     audio_possible_drivers="$audio_possible_drivers fmod"
   fi
+# fix linking error on Ubuntu 13.04
+  libs_qga="-lrt $libs_qga"
 ;;
 esac
 
@@ -2725,7 +2727,10 @@ fi
 cat > $TMPC <<EOF
 #include <signal.h>
 #include <time.h>
+/* Fix linking error on Ubuntu 13.04
 int main(void) { return clock_gettime(CLOCK_REALTIME, NULL); }
+*/
+int main(void) { return timer_gettime(CLOCK_REALTIME, NULL); }
 EOF
 
 if compile_prog "" "" ; then