summaryrefslogtreecommitdiff
path: root/m4
diff options
context:
space:
mode:
authorPetri Hintukainen <phintuka@users.sourceforge.net>2012-06-05 12:47:26 +0300
committerPetri Hintukainen <phintuka@users.sourceforge.net>2012-06-05 12:47:26 +0300
commitb631217b97e6e63807a2e7195658d12de0236f58 (patch)
treeb478fb90aedd7925769e8a0b2887c0aa9734786e /m4
parent4e1f6c532f001e0aebc11738cb1ff2c70a1f4472 (diff)
parent8ef238a8cc53fe097808e79de0682b140ff07057 (diff)
downloadxine-lib-b631217b97e6e63807a2e7195658d12de0236f58.tar.gz
xine-lib-b631217b97e6e63807a2e7195658d12de0236f58.tar.bz2
Merge from 1.1
Diffstat (limited to 'm4')
-rw-r--r--m4/attributes.m42
-rw-r--r--m4/pthreads.m42
2 files changed, 3 insertions, 1 deletions
diff --git a/m4/attributes.m4 b/m4/attributes.m4
index 4e613f23a..9ad27b98b 100644
--- a/m4/attributes.m4
+++ b/m4/attributes.m4
@@ -114,7 +114,7 @@ AC_DEFUN([CC_NOUNDEFINED], [
dnl use it only for libraries in mingw32-w64
*-freebsd* | *-openbsd*) ;;
- *-mingw*)
+ *-mingw* | *-cygwin*)
LDFLAGS_NOUNDEFINED="-no-undefined"
;;
*)
diff --git a/m4/pthreads.m4 b/m4/pthreads.m4
index 6cbed9255..06a046a76 100644
--- a/m4/pthreads.m4
+++ b/m4/pthreads.m4
@@ -19,6 +19,7 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [
if test "${PTHREAD_CFLAGS-unset}" = "unset"; then
case $host in
*-mingw*) PTHREAD_CFLAGS="" ;;
+ *-cygwin*) PTHREAD_CFLAGS="" ;;
*-hpux11*) PTHREAD_CFLAGS="" ;;
*-darwin*) PTHREAD_CFLAGS="" ;;
*-solaris*|*-linux-gnu)
@@ -31,6 +32,7 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [
if test "${PTHREAD_LIBS-unset}" = "unset"; then
case $host in
*-mingw*) PTHREAD_LIBS="-lpthreadGC2" ;;
+ *-cygwin*) PTHREAD_LIBS="-lpthread" ;;
*-hpux11*) PTHREAD_LIBS="-lpthread" ;;
*-darwin*) PTHREAD_LIBS="" ;;
*-solaris*)