diff --git a/configure.ac b/configure.ac index e45cda3..eb2baab 100644 --- a/configure.ac +++ b/configure.ac @@ -775,7 +775,7 @@ fi [func_make_relpath () { dir=$1 - idir=${acl_final_bindir} + idir=${2-$acl_final_bindir} while true; do dfirst=`echo "$dir" | sed -n -e 's,^//*\([^/]*\).*$,/\1,p'` @@ -793,13 +793,17 @@ fi case "$relocatable_reason" in yes) - # Command-line option to include a relative search path for - # shared libraries if test "$enable_shared" != no; then case "$host" in *-linux*) + # Command-line option to include a relative search path for + # shared libraries RELOC_LDFLAGS='-Wl,-rpath,"\$$ORIGIN/'`func_make_relpath ${acl_final_libdir}`'"' ;; + *-mingw*|*-cygwin*) + # Command-line option to define the installation path for .dll files + RELOC_LIBFLAGS="-bindir `func_make_relpath $acl_final_bindir $acl_final_libdir`" + ;; esac fi @@ -846,6 +850,7 @@ RELOC_CPPFLAGS=$RELOC_CPPFLAGS' \ AC_MSG_RESULT([$relocatable_reason]) AC_SUBST(RELOC_CPPFLAGS) AC_SUBST(RELOC_LDFLAGS) +AC_SUBST(RELOC_LIBFLAGS) dnl dnl ------------------------------- FILE GENERATION ----------- diff --git a/libgst/Makefile.am b/libgst/Makefile.am index 05f2f19..4cf981e 100644 --- a/libgst/Makefile.am +++ b/libgst/Makefile.am @@ -27,7 +27,7 @@ libgst_la_LIBADD=$(top_builddir)/lib-src/library.la $(SOCKET_LIBS) \ libgst_la_DEPENDENCIES=$(top_builddir)/lib-src/library.la $(LIBSNPRINTFV) libgst_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined \ - -export-symbols-regex "^gst_.*" + -export-symbols-regex "^gst_.*" $(RELOC_LIBFLAGS) libgst_la_SOURCES = \ gstpub.c files.c gst-parse.c lex.c \ diff --git a/packages/glib/Makefile.am b/packages/glib/Makefile.am index 4c810e5..851c5f8 100644 --- a/packages/glib/Makefile.am +++ b/packages/glib/Makefile.am @@ -8,7 +8,7 @@ ALL_LIBS = $(GLIB_LIBS) $(GTHREAD_LIBS) include_HEADERS = gst-gobject.h lib_LTLIBRARIES = libgst-gobject.la libgst_gobject_la_SOURCES = gst-gobject.c -libgst_gobject_la_LDFLAGS = -version-info 1:0:0 -no-undefined +libgst_gobject_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(RELOC_LIBFLAGS) libgst_gobject_la_LIBADD = $(ALL_LIBS) ../../libgst/libgst.la moduleexec_LTLIBRARIES = gst-glib.la