From 9d4af5714ac4ff60ea2d65980ad37af89d2ad61f Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Fri, 13 Dec 2002 04:11:32 +0000 Subject: [PATCH] Fixes from Johannes Stezenbach Thu Dec 12 23:08:29 2002 Owen Taylor Fixes from Johannes Stezenbach * configure.in: When adding extra libraries to $LIBS for tests, always put them at the front, since that's how they'll be used in the actual Makefiles. * configure.in: Add a couple of missing ','s in AC_LINK_IFELSE() * m4macros/glib-gettext.m4: Remove a stray setting of $LIBS. --- ChangeLog | 12 ++++++++++++ ChangeLog.pre-2-10 | 12 ++++++++++++ ChangeLog.pre-2-12 | 12 ++++++++++++ ChangeLog.pre-2-2 | 12 ++++++++++++ ChangeLog.pre-2-4 | 12 ++++++++++++ ChangeLog.pre-2-6 | 12 ++++++++++++ ChangeLog.pre-2-8 | 12 ++++++++++++ configure.in | 16 ++++++++-------- 8 files changed, 92 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 76d1963..8df4f65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +Thu Dec 12 23:08:29 2002 Owen Taylor + + Fixes from Johannes Stezenbach + + * configure.in: When adding extra libraries to $LIBS for + tests, always put them at the front, since that's how + they'll be used in the actual Makefiles. + + * configure.in: Add a couple of missing ','s in AC_LINK_IFELSE() + + * m4macros/glib-gettext.m4: Remove a stray setting of $LIBS. + Thu Dec 12 20:46:26 2002 Owen Taylor * configure.in: Allow not setting glib_cv_long_long_format diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 76d1963..8df4f65 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,15 @@ +Thu Dec 12 23:08:29 2002 Owen Taylor + + Fixes from Johannes Stezenbach + + * configure.in: When adding extra libraries to $LIBS for + tests, always put them at the front, since that's how + they'll be used in the actual Makefiles. + + * configure.in: Add a couple of missing ','s in AC_LINK_IFELSE() + + * m4macros/glib-gettext.m4: Remove a stray setting of $LIBS. + Thu Dec 12 20:46:26 2002 Owen Taylor * configure.in: Allow not setting glib_cv_long_long_format diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 76d1963..8df4f65 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,3 +1,15 @@ +Thu Dec 12 23:08:29 2002 Owen Taylor + + Fixes from Johannes Stezenbach + + * configure.in: When adding extra libraries to $LIBS for + tests, always put them at the front, since that's how + they'll be used in the actual Makefiles. + + * configure.in: Add a couple of missing ','s in AC_LINK_IFELSE() + + * m4macros/glib-gettext.m4: Remove a stray setting of $LIBS. + Thu Dec 12 20:46:26 2002 Owen Taylor * configure.in: Allow not setting glib_cv_long_long_format diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 76d1963..8df4f65 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,15 @@ +Thu Dec 12 23:08:29 2002 Owen Taylor + + Fixes from Johannes Stezenbach + + * configure.in: When adding extra libraries to $LIBS for + tests, always put them at the front, since that's how + they'll be used in the actual Makefiles. + + * configure.in: Add a couple of missing ','s in AC_LINK_IFELSE() + + * m4macros/glib-gettext.m4: Remove a stray setting of $LIBS. + Thu Dec 12 20:46:26 2002 Owen Taylor * configure.in: Allow not setting glib_cv_long_long_format diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 76d1963..8df4f65 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,15 @@ +Thu Dec 12 23:08:29 2002 Owen Taylor + + Fixes from Johannes Stezenbach + + * configure.in: When adding extra libraries to $LIBS for + tests, always put them at the front, since that's how + they'll be used in the actual Makefiles. + + * configure.in: Add a couple of missing ','s in AC_LINK_IFELSE() + + * m4macros/glib-gettext.m4: Remove a stray setting of $LIBS. + Thu Dec 12 20:46:26 2002 Owen Taylor * configure.in: Allow not setting glib_cv_long_long_format diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 76d1963..8df4f65 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,15 @@ +Thu Dec 12 23:08:29 2002 Owen Taylor + + Fixes from Johannes Stezenbach + + * configure.in: When adding extra libraries to $LIBS for + tests, always put them at the front, since that's how + they'll be used in the actual Makefiles. + + * configure.in: Add a couple of missing ','s in AC_LINK_IFELSE() + + * m4macros/glib-gettext.m4: Remove a stray setting of $LIBS. + Thu Dec 12 20:46:26 2002 Owen Taylor * configure.in: Allow not setting glib_cv_long_long_format diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 76d1963..8df4f65 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,15 @@ +Thu Dec 12 23:08:29 2002 Owen Taylor + + Fixes from Johannes Stezenbach + + * configure.in: When adding extra libraries to $LIBS for + tests, always put them at the front, since that's how + they'll be used in the actual Makefiles. + + * configure.in: Add a couple of missing ','s in AC_LINK_IFELSE() + + * m4macros/glib-gettext.m4: Remove a stray setting of $LIBS. + Thu Dec 12 20:46:26 2002 Owen Taylor * configure.in: Allow not setting glib_cv_long_long_format diff --git a/configure.in b/configure.in index 7a870b6..aefdc75 100644 --- a/configure.in +++ b/configure.in @@ -342,7 +342,7 @@ if test "$gt_cv_have_gettext" != "yes" ; then ]) fi -LIBS="$LIBS $INTLLIBS" +LIBS="$INTLLIBS $LIBS" GETTEXT_PACKAGE=glib20 AC_SUBST(GETTEXT_PACKAGE) @@ -998,7 +998,7 @@ dnl *** additional checks for G_MODULE_IMPL_DL if test "$G_MODULE_IMPL" = "G_MODULE_IMPL_DL"; then LIBS_orig="$LIBS" LDFLAGS_orig="$LDFLAGS" - LIBS="$LIBS $G_MODULE_LIBS" + LIBS="$G_MODULE_LIBS $LIBS" LDFLAGS="$LDFLAGS $G_MODULE_LDFLAGS" dnl *** check for OSF1/5.0 RTLD_GLOBAL brokenness AC_CACHE_CHECK([for RTLD_GLOBAL brokenness], @@ -1448,14 +1448,14 @@ case $have_threads in defattr=pthread_attr_default fi - LIBS="$glib_save_LIBS $add_thread_lib" + LIBS="$add_thread_lib $glib_save_LIBS" AC_MSG_CHECKING(for pthread_create/pthread_join$IN) AC_TRY_RUN(glib_thread_test, glib_result=yes, glib_result=no, [AC_LINK_IFELSE(glib_thread_test, - glib_result=yes + glib_result=yes, glib_result=no)]) AC_MSG_RESULT($glib_result) @@ -1481,14 +1481,14 @@ case $have_threads in add_thread_lib="-l$thread_lib" IN=" in -l$thread_lib" fi - LIBS="$glib_save_LIBS $add_thread_lib" + LIBS="$add_thread_lib $glib_save_LIBS" AC_MSG_CHECKING(for sched_get_priority_min$IN) AC_TRY_RUN(glib_sched_priority_test, glib_result=yes, glib_result=no, [AC_LINK_IFELSE(glib_sched_priority_test, - glib_result=yes + glib_result=yes, glib_result=no)]) AC_MSG_RESULT($glib_result) @@ -1596,7 +1596,7 @@ int main () { fi fi fi - LIBS="$LIBS $G_THREAD_LIBS" + LIBS="$G_THREAD_LIBS $LIBS" if test x"$have_threads" = xposix; then glib_save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES" @@ -1726,7 +1726,7 @@ dnl mutex_default_type, mutex_default_init and mutex_header_file if test $mutex_has_default = yes ; then glib_save_CPPFLAGS="$CPPFLAGS" glib_save_LIBS="$LIBS" - LIBS="$LIBS $G_THREAD_LIBS" + LIBS="$G_THREAD_LIBS $LIBS" CPPFLAGS="$CPPFLAGS $GTHREAD_COMPILE_IMPL_DEFINES" GLIB_SIZEOF([#include <$mutex_header_file>], $mutex_default_type, -- 2.7.4