Don't need -luuid on Win32. It was some leftover, and in fact occasionally

2005-07-14  Tor Lillqvist  <tml@novell.com>

	* 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.)

diff --git a/ChangeLog b/ChangeLog
index df555d5e62d6797a147f25ea647dd7ece72b953b..cda164976de2326adfe168258e5878c6b587340b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2005-07-14  Tor Lillqvist  <tml@novell.com>
+
+       * 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  <mclasen@redhat.com>
 
        * 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 df555d5e62d6797a147f25ea647dd7ece72b953b..cda164976de2326adfe168258e5878c6b587340b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,12 @@
+2005-07-14  Tor Lillqvist  <tml@novell.com>
+
+       * 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  <mclasen@redhat.com>
 
        * 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 df555d5e62d6797a147f25ea647dd7ece72b953b..cda164976de2326adfe168258e5878c6b587340b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,12 @@
+2005-07-14  Tor Lillqvist  <tml@novell.com>
+
+       * 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  <mclasen@redhat.com>
 
        * gdk/x11/gdkevents-x11.c (set_screen_from_root): Don't assert if 

diff --git a/configure.in b/configure.in
index 36b885974a7b268d8171aa21cc5553919a8d1cfe..b1b02b748c2f273c72f9a7c8479499195e4de91d 100644 (file)
--- 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)