Test where the DLLs actually are.

2003-06-15  Tor Lillqvist  <tml@iki.fi>

	* glib-zip.in (DLLDIR): Test where the DLLs actually are.

	* README.win32: Point to FSF's binary Win32 distributions of
	libiconv and gettext-runtime.

ChangeLog

@@ -1,3 +1,10 @@
+2003-06-15  Tor Lillqvist  <tml@iki.fi>
+
+	* glib-zip.in (DLLDIR): Test where the DLLs actually are.
+
+	* README.win32: Point to FSF's binary Win32 distributions of
+	libiconv and gettext-runtime.
+
 2003-06-11  Tor Lillqvist  <tml@iki.fi>
 
 	* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin

ChangeLog.pre-2-10

@@ -1,3 +1,10 @@
+2003-06-15  Tor Lillqvist  <tml@iki.fi>
+
+	* glib-zip.in (DLLDIR): Test where the DLLs actually are.
+
+	* README.win32: Point to FSF's binary Win32 distributions of
+	libiconv and gettext-runtime.
+
 2003-06-11  Tor Lillqvist  <tml@iki.fi>
 
 	* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin

ChangeLog.pre-2-12

@@ -1,3 +1,10 @@
+2003-06-15  Tor Lillqvist  <tml@iki.fi>
+
+	* glib-zip.in (DLLDIR): Test where the DLLs actually are.
+
+	* README.win32: Point to FSF's binary Win32 distributions of
+	libiconv and gettext-runtime.
+
 2003-06-11  Tor Lillqvist  <tml@iki.fi>
 
 	* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin

ChangeLog.pre-2-4

@@ -1,3 +1,10 @@
+2003-06-15  Tor Lillqvist  <tml@iki.fi>
+
+	* glib-zip.in (DLLDIR): Test where the DLLs actually are.
+
+	* README.win32: Point to FSF's binary Win32 distributions of
+	libiconv and gettext-runtime.
+
 2003-06-11  Tor Lillqvist  <tml@iki.fi>
 
 	* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin

ChangeLog.pre-2-6

@@ -1,3 +1,10 @@
+2003-06-15  Tor Lillqvist  <tml@iki.fi>
+
+	* glib-zip.in (DLLDIR): Test where the DLLs actually are.
+
+	* README.win32: Point to FSF's binary Win32 distributions of
+	libiconv and gettext-runtime.
+
 2003-06-11  Tor Lillqvist  <tml@iki.fi>
 
 	* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin

ChangeLog.pre-2-8

@@ -1,3 +1,10 @@
+2003-06-15  Tor Lillqvist  <tml@iki.fi>
+
+	* glib-zip.in (DLLDIR): Test where the DLLs actually are.
+
+	* README.win32: Point to FSF's binary Win32 distributions of
+	libiconv and gettext-runtime.
+
 2003-06-11  Tor Lillqvist  <tml@iki.fi>
 
 	* glib-zip.in (DEVZIP): libtool 1.5 installs DLLs in the bin

README.win32

@@ -72,17 +72,19 @@ Building GLib
 
 Again, first decide whether you really want to do this.
 
-Before building GLib you must also have the libiconv library, either
+Before building GLib you must also have the libiconv library and GNU
-from the same website mentioned above, or from it's homepage at
+gettext. Get prebuilt binaries of libiconv (1.9.1 or newer), and
-http://clisp.cons.org/~haible/packages-libiconv.html. Libiconv has
+gettext-runtime (0.12.1 or newer) from your nearest GNU ftp mirror. If
-makefiles for building with MS Visual C only, but as it is one source
+you use gcc, you will also have to edit the libintl.h file from
-file only, building it "by hand" with gcc isn't hard.
+gettext a tiny bit: Change the
 
-You must also have the "intl" library from GNU tettext 0.10.40 (or
+# if __GNUC__ >= 2 && !defined __APPLE_CC__ && (defined __STDC__ || defined __cplusplus)
-later). Get a prebuilt version from the website mentioned above.
 
-Edit the correct paths to those libraries in build/win32/module.defs
+line to
-as appropriate.
+
+# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && (defined __STDC__ || defined __cplusplus)
+
+around line 102.
 
 Where are the makefiles?
 ========================

glib-zip.in

@@ -7,15 +7,18 @@ ZIP=/tmp/glib-@GLIB_VERSION@.zip
 DEVZIP=/tmp/glib-dev-@GLIB_VERSION@.zip
 
 cd @prefix@
-
 rm $ZIP
+
+DLLDIR=lib
+[ -f bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll ] && DLLDIR=bin
+
 zip $ZIP -@ <<EOF
 COPYING.LIB-2
 bin/gspawn-win32-helper.exe
-bin/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
+$DLLDIR/libglib-2.0-@LT_CURRENT_MINUS_AGE@.dll
-bin/libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
+$DLLDIR/libgmodule-2.0-@LT_CURRENT_MINUS_AGE@.dll
-bin/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
+$DLLDIR/libgobject-2.0-@LT_CURRENT_MINUS_AGE@.dll
-bin/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
+$DLLDIR/libgthread-2.0-@LT_CURRENT_MINUS_AGE@.dll
 EOF
 
 zip -r $ZIP lib/locale/*/LC_MESSAGES/glib20.mo