From 66f25564159d4040cc1070b136f7ee547316ba7e Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 14 Jul 2005 17:27:24 +0000 Subject: [PATCH] Don't need -luuid on Win32. It was some leftover, and in fact occasionally 2005-07-14 Tor Lillqvist * configure.in (GDK_EXTRA_LIBS): Don't need -luuid on Win32. It was some leftover, and in fact occasionally caused issues with libtool as it made its way into the libgdk-win32-2.0.la file and that way into the .la files of all libraries that depend on GDK. (This happened only when building from CVS and not using a full "make install" which would run the sanitize-la.sh script.) --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ configure.in | 2 +- 4 files changed, 28 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index df555d5e62..cda164976d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-07-14 Tor Lillqvist + + * configure.in (GDK_EXTRA_LIBS): Don't need -luuid on Win32. It + was some leftover, and in fact occasionally caused issues with + libtool as it made its way into the libgdk-win32-2.0.la file and + that way into the .la files of all libraries that depend on + GDK. (This happened only when building from CVS and not using a + full "make install" which would run the sanitize-la.sh script.) + 2005-07-14 Matthias Clasen * gdk/x11/gdkevents-x11.c (set_screen_from_root): Don't assert if diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index df555d5e62..cda164976d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2005-07-14 Tor Lillqvist + + * configure.in (GDK_EXTRA_LIBS): Don't need -luuid on Win32. It + was some leftover, and in fact occasionally caused issues with + libtool as it made its way into the libgdk-win32-2.0.la file and + that way into the .la files of all libraries that depend on + GDK. (This happened only when building from CVS and not using a + full "make install" which would run the sanitize-la.sh script.) + 2005-07-14 Matthias Clasen * gdk/x11/gdkevents-x11.c (set_screen_from_root): Don't assert if diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index df555d5e62..cda164976d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2005-07-14 Tor Lillqvist + + * configure.in (GDK_EXTRA_LIBS): Don't need -luuid on Win32. It + was some leftover, and in fact occasionally caused issues with + libtool as it made its way into the libgdk-win32-2.0.la file and + that way into the .la files of all libraries that depend on + GDK. (This happened only when building from CVS and not using a + full "make install" which would run the sanitize-la.sh script.) + 2005-07-14 Matthias Clasen * gdk/x11/gdkevents-x11.c (set_screen_from_root): Don't assert if diff --git a/configure.in b/configure.in index 36b885974a..b1b02b748c 100644 --- a/configure.in +++ b/configure.in @@ -1366,7 +1366,7 @@ if test "x$gdktarget" = "xwin32"; then AC_SUBST(GDK_WIN32_EXTRA_CFLAGS) fi - GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -user32 -limm32 -lshell32 -lole32 -luuid" + GDK_EXTRA_LIBS="$GDK_EXTRA_LIBS -lgdi32 -user32 -limm32 -lshell32 -lole32" AM_CONDITIONAL(USE_WIN32, true) else AM_CONDITIONAL(USE_WIN32, false)