Attachment #510856 for bug #639108




   echo "DEBUG: GLUT_CFLAGS = $GLUT_CFLAGS" >&5
   echo "DEBUG: GLUT_LIBS = $GLUT_LIBS" >&5

   AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h libnotify/notify.h gtk/gtk.h locale.h])

   AC_CHECK_LIB([jpeg], [jpeg_start_compress],[have_jpeg=1],[have_jpeg=0])
   AC_CHECK_HEADER([jpeglib.h],[have_jpeg=1],[have_jpeg=0])

#ifdef HAVE_LOCALE_H
#include <locale.h>
#endif
#ifdef HAVE_XLOCALE_H
#include <xlocale.h>
#endif
]])

dnl Checks for typedefs, structures, and compiler characteristics.

Lines 807-813 Link Here

(-)a/lib/gui_rpc_client.h (-1 lines)
807		807
808	#elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)	808	#elif defined(__APPLE__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)
809	// uselocale() is not available in OS 10.3.9 so use weak linking	809	// uselocale() is not available in OS 10.3.9 so use weak linking
810	#include <xlocale.h>
811	extern int freelocale(locale_t) __attribute__((weak_import));	810	extern int freelocale(locale_t) __attribute__((weak_import));
812	extern locale_t newlocale(int, __const char *, locale_t) __attribute__((weak_import));	811	extern locale_t newlocale(int, __const char *, locale_t) __attribute__((weak_import));
813	extern locale_t uselocale(locale_t) __attribute__((weak_import));	812	extern locale_t uselocale(locale_t) __attribute__((weak_import));

Lines 20-26 Link Here

(-)a/clientgui/AsyncRPC.cpp (-1 / +1 lines)
20	#endif	20	#endif
21		21
22	#if !(defined(_WIN32) \|\| (defined(__WXMAC__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)))	22	#if !(defined(_WIN32) \|\| (defined(__WXMAC__) && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_4)))
23	#include <xlocale.h>	23	#include <locale.h>
24	#endif	24	#endif
25		25
26	#include "stdwx.h"	26	#include "stdwx.h"

Return to bug 639108

Lines 602-608 Link Here

(-)a/configure.ac (-4 / +1 lines)
602	echo "DEBUG: GLUT_CFLAGS = $GLUT_CFLAGS" >&5	602	echo "DEBUG: GLUT_CFLAGS = $GLUT_CFLAGS" >&5
603	echo "DEBUG: GLUT_LIBS = $GLUT_LIBS" >&5	603	echo "DEBUG: GLUT_LIBS = $GLUT_LIBS" >&5
604		604
605	AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h libnotify/notify.h gtk/gtk.h locale.h xlocale.h])	605	AC_CHECK_HEADERS([gl.h glu.h glut.h glaux.h GL/gl.h GL/glu.h GL/glut.h GL/glaux.h OpenGL/gl.h OpenGL/glu.h OpenGL/glut.h OpenGL/glaux.h GLUT/glut.h MesaGL/gl.h MesaGL/glu.h MesaGL/glut.h MesaGL/glaux.h libnotify/notify.h gtk/gtk.h locale.h])
606		606
607	AC_CHECK_LIB([jpeg], [jpeg_start_compress],[have_jpeg=1],[have_jpeg=0])	607	AC_CHECK_LIB([jpeg], [jpeg_start_compress],[have_jpeg=1],[have_jpeg=0])
608	AC_CHECK_HEADER([jpeglib.h],[have_jpeg=1],[have_jpeg=0])	608	AC_CHECK_HEADER([jpeglib.h],[have_jpeg=1],[have_jpeg=0])
Lines 986-994 Link Here
986	#ifdef HAVE_LOCALE_H	986	#ifdef HAVE_LOCALE_H
987	#include <locale.h>	987	#include <locale.h>
988	#endif	988	#endif
989	#ifdef HAVE_XLOCALE_H
990	#include <xlocale.h>
991	#endif
992	]])	989	]])
993		990
994	dnl Checks for typedefs, structures, and compiler characteristics.	991	dnl Checks for typedefs, structures, and compiler characteristics.