X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=configure.ac;h=5bccf551f85ae63e6870e0dd31399f84d2cc2824;hb=9da85c7262325478e8730ae9f3e76bd0528a9a8c;hp=e519cd12d3b9710ce963cc2da1c0c5aa6e4af7a6;hpb=8aeb391a771302fa6818a37a76e1240c955ce8f5;p=platform%2Fupstream%2Fglib.git diff --git a/configure.ac b/configure.ac index e519cd1..5bccf55 100644 --- a/configure.ac +++ b/configure.ac @@ -30,8 +30,8 @@ m4_define(glib_configure_ac) # on the unstable (ie master), interface age = 0 m4_define([glib_major_version], [2]) -m4_define([glib_minor_version], [39]) -m4_define([glib_micro_version], [3]) +m4_define([glib_minor_version], [43]) +m4_define([glib_micro_version], [1]) m4_define([glib_interface_age], [0]) m4_define([glib_binary_age], [m4_eval(100 * glib_minor_version + glib_micro_version)]) @@ -61,7 +61,7 @@ AC_CONFIG_SRCDIR([glib/glib.h]) AC_CONFIG_MACRO_DIR([m4macros]) # Save this value here, since automake will set cflags later -cflags_set=${CFLAGS+set} +cflags_set=${CFLAGS:+set} AM_INIT_AUTOMAKE([1.11 -Wno-portability no-define no-dist-gzip dist-xz tar-ustar]) AM_MAINTAINER_MODE([enable]) @@ -213,13 +213,19 @@ AM_CONDITIONAL(MS_LIB_AVAILABLE, [test x$ms_librarian = xyes]) AS_IF([test "x$glib_have_carbon" = "xyes"], [ AC_DEFINE(HAVE_CARBON, 1, [define to 1 if Carbon is available]) - LDFLAGS="$LDFLAGS -Wl,-framework,Carbon" -]) + CARBON_LIBS="-Wl,-framework,Carbon" + LDFLAGS="$LDFLAGS $CARBON_LIBS" +], [CARBON_LIBS=""]) + +AC_SUBST([CARBON_LIBS]) -if test "x$glib_have_cocoa" = "xyes"; then +AS_IF([test "x$glib_have_cocoa" = "xyes"], [ AC_DEFINE(HAVE_COCOA, 1, [define to 1 if Cocoa is available]) - LDFLAGS="$LDFLAGS -Wl,-framework,Foundation" -fi + COCOA_LIBS="-Wl,-framework,Foundation" + LDFLAGS="$LDFLAGS $COCOA_LIBS" +], [COCOA_LIBS=""]) + +AC_SUBST([COCOA_LIBS]) dnl declare --enable-* args and collect ac_help strings AC_ARG_ENABLE(debug, @@ -239,6 +245,10 @@ AC_ARG_ENABLE(rebuilds, [AS_HELP_STRING([--disable-rebuilds], [disable all source autogeneration rules])],, [enable_rebuilds=yes]) +AC_ARG_ENABLE(kdbus, + [AS_HELP_STRING([--enable-kdbus], + [enable kdbus [default=no]])],, + [enable_kdbus=no]) GLIB_TESTS @@ -256,6 +266,13 @@ AS_IF([test "x$disable_mem_pools" = "xno"], [ AC_MSG_RESULT([yes]) ]) +AC_MSG_CHECKING([whether to enable kdbus]) +AM_CONDITIONAL(KDBUS_TRANSPORT, [test "x$enable_kdbus" = "xyes"]) +AS_IF([test "x$enable_kdbus" = "xyes"], [ + AC_DEFINE(KDBUS_TRANSPORT, 1, [Whether to enable kdbus]) + AC_MSG_RESULT([yes]) +], [ AC_MSG_RESULT([no]) ]) + dnl location to install runtime libraries, e.g. ../../lib to install dnl to /lib if libdir is /usr/lib AC_ARG_WITH(runtime-libdir, @@ -285,7 +302,7 @@ AC_SYS_LARGEFILE PKG_PROG_PKG_CONFIG(0.16) if test "x$enable_debug" = "xyes"; then - if test x$cflags_set != xset ; then + if test "x$cflags_set" != "x" ; then case " $CFLAGS " in *[[\ \ ]]-g[[\ \ ]]*) ;; *) CFLAGS="$CFLAGS -g" ;; @@ -771,11 +788,11 @@ fi # check for header files -AC_CHECK_HEADERS([sys/param.h sys/resource.h]) +AC_CHECK_HEADERS([sys/param.h sys/resource.h mach/mach_time.h]) AC_CHECK_HEADERS([sys/select.h stdint.h inttypes.h sched.h malloc.h]) AC_CHECK_HEADERS([sys/vfs.h sys/vmount.h sys/statfs.h sys/statvfs.h sys/filio.h]) AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h fstab.h]) -AC_CHECK_HEADERS([linux/magic.h sys/prctl.h]) +AC_CHECK_HEADERS([linux/magic.h linux/memfd.h sys/prctl.h]) # Some versions of MSC lack these AC_CHECK_HEADERS([dirent.h sys/time.h]) @@ -1665,8 +1682,7 @@ dnl ***************************** inotify_support=no AC_CHECK_HEADERS([sys/inotify.h], [ - inotify_support=yes - AC_CHECK_FUNCS(inotify_init1) + AC_CHECK_FUNCS(inotify_init1, [inotify_support=yes], [inotify_support=no]) ]) AM_CONDITIONAL(HAVE_INOTIFY, [test "$inotify_support" = "yes"]) @@ -2236,23 +2252,14 @@ AS_IF([ test x"$have_threads" = xposix], [ AC_DEFINE(HAVE_PTHREAD_CONDATTR_SETCLOCK,1, [Have function pthread_condattr_setclock])], [AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for pthread_cond_timedwait_monotonic) - AC_LINK_IFELSE( - [AC_LANG_PROGRAM( - [#include ], - [pthread_cond_timedwait_monotonic(NULL, NULL, NULL)])], - [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC,1, - [Have function pthread_cond_timedwait_monotonic])], - [AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for pthread_cond_timedwait_monotonic_np) + AC_MSG_CHECKING(for pthread_cond_timedwait_relative_np) AC_LINK_IFELSE( [AC_LANG_PROGRAM( [#include ], - [pthread_cond_timedwait_monotonic_np(NULL, NULL, NULL)])], + [pthread_cond_timedwait_relative_np(NULL, NULL, NULL)])], [AC_MSG_RESULT(yes) - AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_MONOTONIC_NP,1, - [Have function pthread_cond_timedwait_monotonic_np])], + AC_DEFINE(HAVE_PTHREAD_COND_TIMEDWAIT_RELATIVE_NP,1, + [Have function pthread_cond_timedwait_relative_np])], [AC_MSG_RESULT(no)]) CPPFLAGS="$glib_save_CPPFLAGS" ]) @@ -2282,9 +2289,6 @@ case $host in *-*-freebsd*|*-*-linux*) G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`" ;; - *-*-openbsd*) - LDFLAGS="$LDFLAGS -pthread" - ;; *) G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS" ;; @@ -2297,7 +2301,6 @@ AC_SUBST(G_THREAD_LIBS_EXTRA) AC_CHECK_FUNCS(clock_gettime, [], [ AC_CHECK_LIB(rt, clock_gettime, [ - AC_DEFINE(HAVE_CLOCK_GETTIME, 1) G_THREAD_LIBS="$G_THREAD_LIBS -lrt" G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS_FOR_GTHREAD -lrt" ]) @@ -2394,13 +2397,7 @@ AC_CACHE_CHECK(for futex(2) system call, #include #include ],[ -int -main (void) -{ - /* it is not like this actually runs or anything... */ syscall (__NR_futex, NULL, FUTEX_WAKE, FUTEX_WAIT); - return 0; -} ])],glib_cv_futex=yes,glib_cv_futex=no)) if test x"$glib_cv_futex" = xyes; then AC_DEFINE(HAVE_FUTEX, 1, [we have the futex(2) system call]) @@ -2411,12 +2408,7 @@ AC_CACHE_CHECK(for eventfd(2) system call, #include #include ],[ -int -main (void) -{ eventfd (0, EFD_CLOEXEC); - return 0; -} ])],glib_cv_eventfd=yes,glib_cv_eventfd=no)) if test x"$glib_cv_eventfd" = x"yes"; then AC_DEFINE(HAVE_EVENTFD, 1, [we have the eventfd(2) system call]) @@ -2593,7 +2585,7 @@ dnl ************************** # gtkdocize greps for ^GTK_DOC_CHECK and parses it, so you need to have # it on it's own line. m4_ifdef([GTK_DOC_CHECK], [ -GTK_DOC_CHECK([1.15], [--flavour no-tmpl]) +GTK_DOC_CHECK([1.20], [--flavour no-tmpl]) ],[ AM_CONDITIONAL([ENABLE_GTK_DOC],[false]) ]) @@ -2831,6 +2823,7 @@ _______EOF ### this should always be true in a modern C/C++ compiler + ### and is statically asserted by glib-init.c cat >>$outfile <<_______EOF typedef signed char gint8; typedef unsigned char guint8; @@ -3459,15 +3452,16 @@ dnl AC_ARG_ENABLE(Bsymbolic, [AS_HELP_STRING([--disable-Bsymbolic], [avoid linking with -Bsymbolic])],, - [SAVED_LDFLAGS="${LDFLAGS}" + [SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}" AC_MSG_CHECKING([for -Bsymbolic-functions linker flag]) LDFLAGS=-Wl,-Bsymbolic-functions - AC_TRY_LINK([], [int main (void) { return 0; }], + LIBS= + AC_TRY_LINK([], [return 0], AC_MSG_RESULT(yes) enable_Bsymbolic=yes, AC_MSG_RESULT(no) enable_Bsymbolic=no) - LDFLAGS="${SAVED_LDFLAGS}"]) + LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}"]) if test "x${enable_Bsymbolic}" = "xyes"; then GLIB_LINK_FLAGS=-Wl,-Bsymbolic-functions @@ -3476,6 +3470,41 @@ fi AC_SUBST(GLIB_LINK_FLAGS) dnl +dnl Check for -z,nodelete linker flag: the type system assumes that +dnl libgobject stays loaded for the lifetime of the process. +dnl Since ld.bfd does not treat wrong -z options as fatal by default, +dnl we also try to check for the --fatal-warnings linker flag if +dnl auto-detecting. +dnl + +AC_ARG_ENABLE([znodelete], + [AS_HELP_STRING([--disable-znodelete], + [avoid linking with -z,nodelete])],, + [SAVED_LDFLAGS="${LDFLAGS}" SAVED_LIBS="${LIBS}" + AC_MSG_CHECKING([for --fatal-warnings linker flag]) + LDFLAGS=-Wl,--fatal-warnings + LIBS= + AC_TRY_LINK([], [return 0], + AC_MSG_RESULT(yes) + [ldflags_fatal=-Wl,--fatal-warnings], + AC_MSG_RESULT(no) + ldflags_fatal=) + AC_MSG_CHECKING([for -z,nodelete linker flag]) + LDFLAGS="$ldflags_fatal -Wl,-z,nodelete" + AC_TRY_LINK([], [return 0], + AC_MSG_RESULT(yes) + enable_znodelete=yes, + AC_MSG_RESULT(no) + enable_znodelete=no) + LDFLAGS="${SAVED_LDFLAGS}" LIBS="${SAVED_LIBS}"]) + +if test "x${enable_znodelete}" = "xyes"; then + GOBJECT_LINK_FLAGS=-Wl,-z,nodelete +fi + +AC_SUBST(GOBJECT_LINK_FLAGS) + +dnl dnl Check for -fvisibility=hidden to determine if we can do GNU-style dnl visibility attributes for symbol export control dnl @@ -3492,7 +3521,7 @@ case "$host" in SAVED_CFLAGS="${CFLAGS}" CFLAGS="-fvisibility=hidden" AC_MSG_CHECKING([for -fvisibility=hidden compiler flag]) - AC_TRY_COMPILE([], [int main (void) { return 0; }], + AC_TRY_COMPILE([], [return 0], AC_MSG_RESULT(yes) enable_fvisibility_hidden=yes, AC_MSG_RESULT(no) @@ -3576,6 +3605,7 @@ build/win32/dirent/Makefile build/win32/vs9/Makefile build/win32/vs10/Makefile build/win32/vs11/Makefile +build/win32/vs12/Makefile glib/Makefile glib/glib.stp glib/libcharset/Makefile