changeset 4276:70a0c1a8705c

Automated merge with ssh://hg.atheme.org//hg/audacious
author Jonathan Schleifer <js-audacious@webkeks.org>
date Sun, 10 Feb 2008 21:32:54 +0100
parents 3e0a2cce15f6 (diff) 63abb992ff90 (current diff)
children 879109b7ea8b
files
diffstat 2 files changed, 11 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/buildsys.mk.in	Sun Feb 10 23:14:31 2008 +0300
+++ b/buildsys.mk.in	Sun Feb 10 21:32:54 2008 +0100
@@ -1,6 +1,8 @@
 #
 #  Copyright (c) 2007, Jonathan Schleifer <js-buildsys@webkeks.org>
 #
+#  https://webkeks.org/hg/buildsys/
+#
 #  Permission to use, copy, modify, and/or distribute this software for any
 #  purpose with or without fee is hereby granted, provided that the above
 #  copyright notice and this permission notice is present in all copies.
--- a/m4/buildsys.m4	Sun Feb 10 23:14:31 2008 +0300
+++ b/m4/buildsys.m4	Sun Feb 10 21:32:54 2008 +0100
@@ -1,6 +1,8 @@
 dnl
 dnl Copyright (c) 2007, Jonathan Schleifer <js-buildsys@webkeks.org>
 dnl
+dnl https://webkeks.org/hg/buildsys/
+dnl
 dnl Permission to use, copy, modify, and/or distribute this software for any
 dnl purpose with or without fee is hereby granted, provided that the above
 dnl copyright notice and this permission notice is present in all copies.
@@ -21,6 +23,11 @@
 AC_DEFUN([BUILDSYS_PROG_IMPLIB], [
 	AC_MSG_CHECKING(whether we need an implib)
 	case "$target" in
+		*-*-cygwin | *-*-mingw32)
+			AC_MSG_RESULT(yes)
+			PROG_IMPLIB_NEEDED='yes'
+			PROG_IMPLIB_LDFLAGS='-Wl,-export-all-symbols,--out-implib,lib${PROG}.a'
+			;;
 		*)
 			AC_MSG_RESULT(no)
 			PROG_IMPLIB_NEEDED='no'
@@ -106,8 +113,8 @@
 			PLUGIN_CFLAGS='-fPIC'
 			PLUGIN_LDFLAGS='-shared -fPIC'
 			PLUGIN_SUFFIX='.so'
-			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${LIBDIR}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${LIBDIR}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${LIBDIR}/$$i'
-			UNINSTALL_LIB='rm -f ${DESTDIR}${LIBDIR}/$$i ${DESTDIR}${LIBDIR}/$$i.${LIB_MAJOR} ${DESTDIR}${LIBDIR}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
+			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
+			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
 			CLEAN_LIB=''
 			;;
 	esac