@@ -1,7 +1,10 @@ 2008-07-03 Jeffrey Stedfast <fejj@novell.com> + * acinclude.m4: Add some pthread lib checking action. + * configure.ac: Include the FreeType2 and FontConfig CFLAGS/LIBS - in the MOON_CFLAGS/LIBS variable. Same for zlib. + in the MOON_CFLAGS/LIBS variable. Same for zlib. Call our new + PTHREAD_CHECK macro and add PTHREAD_LIBS to MOON_LIBS. 2008-06-27 Larry Ewing <lewing@novell.com> ChangeLog @@ -175,3 +175,20 @@ AC_SUBST(LTCOMPILE) AC_SUBST(LTCXXCOMPILE) # end dolt ]) + + +# PTHREAD_CHECK +AC_DEFUN([PTHREAD_CHECK],[ + PTHREAD_LIBS="" + AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS="-lpthread", + [AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIBS="-lpthreads", + [AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIBS="-lc_r", + [AC_CHECK_LIB(pthread, __pthread_attr_init_system, PTHREAD_LIBS="-lpthread", + [AC_CHECK_FUNC(pthread_create)] + )] + )] + )] + ) + AC_SUBST(PTHREAD_LIBS) + AC_PROVIDE([PTHREAD_CHECK]) +]) acinclude.m4 @@ -31,6 +31,11 @@ AC_CHECK_HEADERS(zlib.h) AC_CHECK_LIB(z, inflate, ZLIB="-lz") dnl +dnl Pthread checks +dnl +PTHREAD_CHECK() + +dnl dnl Pipeline checks dnl AC_ARG_WITH(ffmpeg,[ --with-ffmpeg=yes,no If you want to enable support for ffmpeg],[],[with_ffmpeg=yes]) @@ -385,7 +390,7 @@ AC_SUBST(AGVIEWER_LIBS) MOON_CFLAGS="$CAIRO_CFLAGS $FREETYPE2_CFLAGS $FONTCONFIG_CFLAGS $GTK_CFLAGS $ALSA_CFLAGS $FFMPEG_CFLAGS $SWSCALE_CFLAGS $MONO_CFLAGS" dnl MOON_LIBS is partially defined above for the user-plugin build -MOON_LIBS="$MOON_LIBS $CAIRO_LIBS $FREETYPE2_LIBS $FONTCONFIG_LIBS $GTK_LIBS $ALSA_LIBS $ZLIB" +MOON_LIBS="$MOON_LIBS $CAIRO_LIBS $FREETYPE2_LIBS $FONTCONFIG_LIBS $GTK_LIBS $ALSA_LIBS $ZLIB $PTHREAD_LIBS" # Remove glitz from the link flags (fixes Bug 338506) MOON_LIBS="$(echo $MOON_LIBS | sed -e s/-lglitz//g)" @@ -393,13 +398,13 @@ MOON_LIBS="$(echo $MOON_LIBS | sed -e s/-lglitz//g)" AC_SUBST(MOON_CFLAGS) AC_SUBST(MOON_LIBS) -MOON_EXTRA_CFLAGS="$GTK_CFLAGS $FREETYPE2_CFLAGS $FONTCONFIG_CFLAGS $ALSA_CFLAGS $FFMPEG_CFLAGS $SWSCALE_CFLAGS" -MOON_EXTRA_LIBS="$GTK_LIBS $FREETYPE2_LIBS $FONTCONFIG_LIBS $ALSA_LIBS $FFMPEG_LIBS $SWSCALE_LIBS $ZLIB" +MOON_EXTRA_CFLAGS="$GTK_CFLAGS $ALSA_CFLAGS $FFMPEG_CFLAGS $SWSCALE_CFLAGS" +MOON_EXTRA_LIBS="$GTK_LIBS $ALSA_LIBS $FFMPEG_LIBS $SWSCALE_LIBS" AC_SUBST(MOON_EXTRA_CFLAGS) AC_SUBST(MOON_EXTRA_LIBS) -MOON_PROG_CFLAGS="$GTK_CFLAGS $FREETYPE2_CFLAGS $FONTCONFIG_CFLAGS $ALSA_CFLAGS $FFMPEG_CFLAGS $SWSCALE_CFLAGS -I\$(top_srcdir)/src/" -MOON_PROG_LIBS="$GTK_LIBS $FREETYPE2_LIBS $FONTCONFIG_LIBS $ALSA_LIBS $FFMPEG_LIBS $SWSCALE_LIBS $ZLIB \$(top_builddir)/src/libmoon.la" +MOON_PROG_CFLAGS="$GTK_CFLAGS $ALSA_CFLAGS $FFMPEG_CFLAGS $SWSCALE_CFLAGS -I\$(top_srcdir)/src/" +MOON_PROG_LIBS="$GTK_LIBS $ALSA_LIBS $FFMPEG_LIBS $SWSCALE_LIBS \$(top_builddir)/src/libmoon.la" AC_SUBST(MOON_PROG_CFLAGS) AC_SUBST(MOON_PROG_LIBS) configure.ac @@ -20,12 +20,10 @@ #include <gtk/gtk.h> #include <glib.h> -#define Visual _XVisual -#define Region _joe_ball +#define Visual _XxVisual +#define Region _XxRegion #include <gdk/gdkx.h> - #include <gdk/gdkkeysyms.h> - #include <cairo-xlib.h> #undef Visual #undef Region src/runtime.cpp 4be2dc51a418a7fb6a556170acd7575080681045 fejj fejj@e3ebcda4-bce8-0310-ba0a-eca2169e7518 http://github.com/myabc/moonlight/commit/fef629e904939af63e41aa302b90c31e6aa01d57 fef629e904939af63e41aa302b90c31e6aa01d57 2008-07-03T10:50:04-07:00 2008-07-03T10:50:04-07:00 2008-07-03 Jeffrey Stedfast <fejj@novell.com> * acinclude.m4: Add some pthread lib checking action. * configure.ac: Include the FreeType2 and FontConfig CFLAGS/LIBS in the MOON_CFLAGS/LIBS variable. Same for zlib. Call our new PTHREAD_CHECK macro and add PTHREAD_LIBS to MOON_LIBS. git-svn-id: svn://anonsvn.mono-project.com/source/trunk/moon@107167 e3ebcda4-bce8-0310-ba0a-eca2169e7518 c09a3d239186358aa2958cb0361dc80a5cb2f00c fejj fejj@e3ebcda4-bce8-0310-ba0a-eca2169e7518