Define DLL_VARIABLE to empty while compiling the relocwrapper.

diff --git a/ChangeLog b/ChangeLog
index f50ab354845e6891dbf42443a7327a862e93fcea..d7595f45dbfb33e41166eaa2b9fd0e4c1faf77ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@
 
        * gettext-0.16 released.
 
+2006-10-25  Bruno Haible  <bruno@clisp.org>
+
+       * build-aux/install-reloc: Define IN_RELOCWRAPPER for the compilation.
+
 2006-10-24  Bruno Haible  <bruno@clisp.org>
 
        * version.sh: Bump version number to 0.16.

diff --git a/build-aux/install-reloc b/build-aux/install-reloc
index 4dc5ffe78ba93afc82e63541bed17c306f675bf5..851f11f425d7af9f1489c9e920b3ce63a6e75614 100755 (executable)
--- a/build-aux/install-reloc
+++ b/build-aux/install-reloc
@@ -1,6 +1,6 @@
 #!/bin/sh
 # install-reloc - install a program including a relocating wrapper
-# Copyright (C) 2003, 2005 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
 # Written by Bruno Haible <bruno@clisp.org>, 2003.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -119,7 +119,7 @@ test -n "$libdirs" || exit 0
 
 # Compile wrapper.
 installdir=`echo "$destprog" | sed -e 's,/[^/]*$,,'`
-func_verbose $compile_command -I"$builddir" -I"$srcdir" -I"$config_h_dir" -DHAVE_CONFIG_H -DNO_XMALLOC -D"INSTALLPREFIX=\"$prefix\"" -D"INSTALLDIR=\"$installdir\"" -D"LIBPATHVAR=\"$library_path_var\"" -D"LIBDIRS=$libdirs" -D"EXEEXT=\"$exeext\"" "$srcdir"/relocwrapper.c "$srcdir"/progname.c "$srcdir"/progreloc.c "$srcdir"/xreadlink.c "$srcdir"/readlink.c "$srcdir"/canonicalize.c "$srcdir"/allocsa.c "$srcdir"/relocatable.c "$srcdir"/setenv.c "$srcdir"/strerror.c -o "$destprog.wrapper$exeext" || exit $?
+func_verbose $compile_command -I"$builddir" -I"$srcdir" -I"$config_h_dir" -DHAVE_CONFIG_H -DIN_RELOCWRAPPER -DNO_XMALLOC -D"INSTALLPREFIX=\"$prefix\"" -D"INSTALLDIR=\"$installdir\"" -D"LIBPATHVAR=\"$library_path_var\"" -D"LIBDIRS=$libdirs" -D"EXEEXT=\"$exeext\"" "$srcdir"/relocwrapper.c "$srcdir"/progname.c "$srcdir"/progreloc.c "$srcdir"/xreadlink.c "$srcdir"/readlink.c "$srcdir"/canonicalize.c "$srcdir"/allocsa.c "$srcdir"/relocatable.c "$srcdir"/setenv.c "$srcdir"/strerror.c -o "$destprog.wrapper$exeext" || exit $?
 
 # Rename $destprog.wrapper -> $destprog -> $destprog.bin.
 ln -f "$destprog$exeext" "$destprog.bin$exeext" \

diff --git a/gettext-runtime/ChangeLog b/gettext-runtime/ChangeLog
index a9f72779d6e61a003410f8f7de42e18590f27cfc..1e4369271ec53385fc40d7d2e1e025902408d36f 100644 (file)
--- a/gettext-runtime/ChangeLog
+++ b/gettext-runtime/ChangeLog
@@ -2,6 +2,11 @@
 
        * gettext-0.16 released.
 
+2006-10-25  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac (DLL_VARIABLE): Define to empty if IN_RELOCWRAPPER is
+       defined.
+
 2006-10-14  Bruno Haible  <bruno@clisp.org>
 
        * COPYING: Clarify copyright of the programs.

diff --git a/gettext-runtime/configure.ac b/gettext-runtime/configure.ac
index 03f6426351d678bbadb389fd4d8624f31e9cdabc..dd28a427b9d3d480a9a40bf3d75f1f49de1c4481 100644 (file)
--- a/gettext-runtime/configure.ac
+++ b/gettext-runtime/configure.ac
@@ -83,7 +83,7 @@ AC_CHECK_FUNCS([setlocale])
 dnl Put some default definitions into config.h.
 AH_BOTTOM([
 /* On Windows, variables that may be in a DLL must be marked specially.  */
-#if (defined _MSC_VER && defined _DLL)
+#if (defined _MSC_VER && defined _DLL) && !defined IN_RELOCWRAPPER
 # define DLL_VARIABLE __declspec (dllimport)
 #else
 # define DLL_VARIABLE

diff --git a/gettext-tools/ChangeLog b/gettext-tools/ChangeLog
index c3d5900eb2e2b342e95602731a2f3cea27eee7cc..94bc64b8175d582fdc7bf1e4969c2ad84583deee 100644 (file)
--- a/gettext-tools/ChangeLog
+++ b/gettext-tools/ChangeLog
@@ -2,6 +2,11 @@
 
        * gettext-0.16 released.
 
+2006-10-25  Bruno Haible  <bruno@clisp.org>
+
+       * configure.ac (DLL_VARIABLE): Define to empty if IN_RELOCWRAPPER is
+       defined.
+
 2006-10-20  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (ACLOCAL_AMFLAGS): Add -I libgettextpo/gnulib-m4.

diff --git a/gettext-tools/configure.ac b/gettext-tools/configure.ac
index 88f49da119bf6f36c9f480bb01b09dac58e471db..d517e15e541e89f540cba3ce48f30efc982fda2d 100644 (file)
--- a/gettext-tools/configure.ac
+++ b/gettext-tools/configure.ac
@@ -216,7 +216,7 @@ AH_BOTTOM([
 #define PAGE_WIDTH 79
 
 /* On Windows, variables that may be in a DLL must be marked specially.  */
-#if (defined _MSC_VER && defined _DLL) || defined WOE32DLL
+#if ((defined _MSC_VER && defined _DLL) || defined WOE32DLL) && !defined IN_RELOCWRAPPER
 # define DLL_VARIABLE __declspec (dllimport)
 #else
 # define DLL_VARIABLE