Fix use of relocatable so that relocatable.c is correctly built

See http://lists.gnu.org/archive/html/bug-gnulib/2017-12/msg00012.html

7 files changed, 63 insertions, 6 deletions

diff --git a/.gitignore b/.gitignore
index e169b05..b92351b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,7 +21,6 @@ Makefile.in
 /enchant-*.pc
 /gnulib
 /install-sh
-/lib
 /libtool
 /ltmain.sh
 /missing
diff --git a/bootstrap.conf b/bootstrap.conf
index 62c8b77..7659cc5 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -1,4 +1,4 @@
-# bootstrap.conf (Enchant) version 2017-08-09
+# bootstrap.conf (Enchant) version 2017-12-09
 
 # This file is part of Enchant.
 #
@@ -40,6 +40,7 @@ gnulib_git_submodules=gl-mod/bootstrap
 # Additional gnulib-tool options to use.
 gnulib_tool_options='
         --lgpl
+        --makefile-name=Makefile.gnulib
 '
 
 # gnulib modules used by this package.
diff --git a/configure.ac b/configure.ac
index 3f252f8..3e2c9aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -140,6 +140,8 @@ esac
 AC_MSG_RESULT([$native_win32])
 AM_CONDITIONAL(OS_WIN32, test "x$native_win32" = "xyes")
 
+AM_CONDITIONAL([SHLIBS_IN_BINDIR], [case "$host_os" in mingw* | cygwin*) true;; *) false;; esac])
+
 dnl ===========================================================================
 
 m4_copy([AC_DEFUN],[glib_DEFUN])
diff --git a/lib/.gitignore b/lib/.gitignore
new file mode 100644
index 0000000..510a000
--- /dev/null
+++ b/lib/.gitignore
@@ -0,0 +1,35 @@
+/Makefile.gnulib
+/_Noreturn.h
+/alloca.c
+/alloca.in.h
+/arg-nonnull.h
+/c++defs.h
+/flock.c
+/malloc.c
+/msvc-inval.c
+/msvc-inval.h
+/msvc-nothrow.c
+/msvc-nothrow.h
+/rawmemchr.c
+/rawmemchr.valgrind
+/relocatable.c
+/relocatable.h
+/relocatable.valgrind
+/stddef.in.h
+/stdlib.in.h
+/strchrnul.c
+/strchrnul.valgrind
+/strdup.c
+/string.in.h
+/sys_file.in.h
+/sys_types.in.h
+/unistd.c
+/unistd.in.h
+/unused-parameter.h
+/warn-on-use.h
+/alloca.h
+/configmake.h
+/stdlib.h
+/string.h
+/sys/
+/unistd.h
diff --git a/lib/Makefile.am b/lib/Makefile.am
new file mode 100644
index 0000000..b0e0069
--- /dev/null
+++ b/lib/Makefile.am
@@ -0,0 +1,21 @@
+## Makefile for the lib subdirectory of Enchant
+
+# Initialize variables that will be added to by Makefile.gnulib
+EXTRA_DIST =
+BUILT_SOURCES =
+MOSTLYCLEANFILES =
+MOSTLYCLEANDIRS =
+CLEANFILES =
+noinst_LTLIBRARIES =
+
+# Set compilation flags needed for relocatable.c used by relocatable-lib-lgpl
+AM_CPPFLAGS = -DIN_LIBRARY -DENABLE_COSTLY_RELOCATABLE
+
+if SHLIBS_IN_BINDIR
+AM_CPPFLAGS += -DINSTALLDIR=\"$(bindir)\"
+else
+AM_CPPFLAGS += -DINSTALLDIR=\"$(libdir)\"
+endif
+
+# Include auto-generated makefile
+include Makefile.gnulib
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index 16797aa..1b37ed9 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -11,7 +11,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+# along with this file.  If not, see <https://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License,
 # this file may be distributed as part of a program that
@@ -27,7 +27,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --local-dir=gl --local-dir=gl-mod/bootstrap --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --no-conditional-dependencies --libtool --macro-prefix=gl alloca bootstrap c99 configmake flock manywarnings relocatable-lib-lgpl snippet/unused-parameter ssize_t strchrnul strdup-posix valgrind-tests
+#   gnulib-tool --import --local-dir=gl --local-dir=gl-mod/bootstrap --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --makefile-name=Makefile.gnulib --no-conditional-dependencies --libtool --macro-prefix=gl alloca bootstrap c99 configmake flock manywarnings relocatable-lib-lgpl snippet/unused-parameter ssize_t strchrnul strdup-posix valgrind-tests
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([gl:gl-mod/bootstrap])
@@ -53,7 +53,7 @@ gl_DOC_BASE([doc])
 gl_TESTS_BASE([tests])
 gl_LIB([libgnu])
 gl_LGPL
-gl_MAKEFILE_NAME([])
+gl_MAKEFILE_NAME([Makefile.gnulib])
 gl_LIBTOOL
 gl_MACRO_PREFIX([gl])
 gl_PO_DOMAIN([])
diff --git a/src/Makefile.am b/src/Makefile.am
index 015553b..46f67d5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,4 @@
 AM_CPPFLAGS = -I$(top_srcdir) $(ISYSTEM)$(top_builddir)/lib $(ISYSTEM)$(top_srcdir)/lib $(ENCHANT_CFLAGS) $(WARN_CFLAGS)
-DEFS = -DENABLE_COSTLY_RELOCATABLE -DIN_LIBRARY -DINSTALLDIR=\"$(libdir)\"
 
 lib_LTLIBRARIES = libenchant-@ENCHANT_MAJOR_VERSION@.la