From d793148d0690c72dfdd7f024028edb229ad1b4bf Mon Sep 17 00:00:00 2001 From: Arch Librarian Date: Thu, 14 Jul 2005 13:05:20 +0000 Subject: 2002-09-13 Tor Lillqvist Author: tml Date: 2002-09-12 20:47:07 GMT 2002-09-13 Tor Lillqvist * Makefile.am (USE_INSTALLED_GLIB): Seems that the automake version used by Havoc doesn't recognize pkg_config_CFLAGS and pkg_config_LDFLAGS, thus failing builds on Win32 directly from the tarball. Set included_glib_includes and pkg_config_LDADD instead, then, like in the !USE_INSTALLED_GLIB branch. * findme.c (X_OK): If X_OK undefined, define as 1, always, not only if G_OS_WIN32, which is never defined here. Fixes a corner case on Win32 with MSYS and mingw where configure as included in the release tarball for some reason doesn't find unistd.h. --- ChangeLog | 13 +++++++++++++ Makefile.am | 4 ++-- README.win32 | 32 +++++++++++++++++--------------- findme.c | 2 +- 4 files changed, 33 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a80eb1..fe96575 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2002-09-13 Tor Lillqvist + + * Makefile.am (USE_INSTALLED_GLIB): Seems that the automake + version used by Havoc doesn't recognize pkg_config_CFLAGS and + pkg_config_LDFLAGS, thus failing builds on Win32 directly from the + tarball. Set included_glib_includes and pkg_config_LDADD instead, + then, like in the !USE_INSTALLED_GLIB branch. + + * findme.c (X_OK): If X_OK undefined, define as 1, always, not + only if G_OS_WIN32, which is never defined here. Fixes a corner + case on Win32 with MSYS and mingw where configure as included in + the release tarball for some reason doesn't find unistd.h. + 2002-09-09 Havoc Pennington * pkg.c (fill_list_single_package): fix uninitialized variable, diff --git a/Makefile.am b/Makefile.am index 7368e8a..18a597e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ if USE_INSTALLED_GLIB -pkg_config_CFLAGS = @GLIB_CFLAGS@ -pkg_config_LDFLAGS = @GLIB_LIBS@ +included_glib_includes = @GLIB_CFLAGS@ +pkg_config_LDADD=@GLIB_LIBS@ else SUBDIRS = glib-1.2.8 included_glib_includes = -I./glib-1.2.8 diff --git a/README.win32 b/README.win32 index 34b71c0..04ea456 100644 --- a/README.win32 +++ b/README.win32 @@ -1,11 +1,11 @@ pkg-config on Win32 =================== -This file describes pkg-config for "pure" Win32. (With Cygwin, -pkg-config 0.8.0 builds fine right out of the box. Cygwin is just -another Unix variant, as far as pkg-config is concerned.) I don't to -call this "pure" Win32 target mingw, as pkg-config is usable also by -MSVC users. +This file describes pkg-config for "native" Win32. (On Cygwin, +pkg-config builds fine right out of the box. Cygwin is just another +Unix variant, as far as pkg-config is concerned.) I don't call this +"native" Win32 target MinGW, as pkg-config on Windows is supposed to +be useable also by MSVC users. There should be no compile-time paths built into the executable of pkg-config. Likewise, not in the libraries it describes either. @@ -38,13 +38,15 @@ site. This works as long as the .pc file uses the variable name GTK does this. On Unix, pkg-config is built using its own copy of GLib 1.2.8. On -Windows, we use the normal GLib available for Windows (1.3.10 -currently). Yes, this does introduce a circular dependency, but that -can be worked around. The circular dependency only appears if one uses -the configure mechanism to build GLib. GLib's configure script checks -for pkg-config. pkg-config depends on GLib. Thus, starting from -scratch, with no GLib and no pkg-config, using configure, there would -indeed be a Catch-22 situation. However, GLib can be built just fine -using the manually written makefiles for mingw or MSVC. And if -somebody does want to build GLib on Win32 using configure, she can -first install a prebuilt pkgconfig. +Windows, we use the normal GLib available for Windows (2.0.x). Yes, +this does introduce a kind of circular dependency. But, that can be +worked around. The circular dependency only appears if one uses the +configure mechanism to build GLib. GLib's configure script checks for +pkg-config. pkg-config depends on GLib. Thus, starting from scratch, +with no GLib and no pkg-config, using configure, there would indeed be +a Catch-22 situation. However, GLib can be built just fine using the +manually written makefiles for mingw or MSVC. And if somebody does +want to build GLib on Win32 using configure, she can first install a +prebuilt pkgconfig. + +--Tor Lillqvist diff --git a/findme.c b/findme.c index 373e2c4..be72e63 100644 --- a/findme.c +++ b/findme.c @@ -44,7 +44,7 @@ #include "findme.h" -#if defined(G_OS_WIN32) && !defined(X_OK) +#if !defined(X_OK) #define X_OK 1 #endif -- cgit v1.2.3