From 8b09939b9dfb616aa3879118e2d7074484ec3136 Mon Sep 17 00:00:00 2001
From: Benjamin Franzke <benjaminfranzke@googlemail.com>
Date: Thu, 2 Jan 2014 14:57:51 +0100
Subject: autoconf/make: Support cygwin compilation

This makes the Makefile.cygwin superfluous. Removed.
---
 Makefile.cygwin | 7 -------
 configure.ac    | 9 +++++++++
 src/Makefile.am | 8 ++++++--
 win/pjctl.mm    | 6 +++---
 4 files changed, 18 insertions(+), 12 deletions(-)
 delete mode 100644 Makefile.cygwin

diff --git a/Makefile.cygwin b/Makefile.cygwin
deleted file mode 100644
index bbc147f..0000000
--- a/Makefile.cygwin
+++ /dev/null
@@ -1,7 +0,0 @@
-all: win/pjctl win/pjctl-no-console
-
-win/pjctl: src/pjctl.c src/ext/gnulib/md5.c
-	gcc -o $@ src/pjctl.c src/ext/gnulib/md5.c
-
-win/pjctl-no-console: src/pjctl.c src/ext/gnulib/md5.c
-	gcc -o $@ src/pjctl.c src/ext/gnulib/md5.c -mwindows
diff --git a/configure.ac b/configure.ac
index a353554..ed047dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,6 +24,15 @@ AC_SUBST([GCC_CFLAGS])
 # for src/ext/gnulib/md5.c
 AC_C_BIGENDIAN
 
+AC_CANONICAL_HOST
+have_windows="no"
+case "$host_os" in
+	*cygwin)
+	have_windows="yes"
+	;;
+esac
+AM_CONDITIONAL([HAVE_WINDOWS], [test "x$have_windows" = "xyes"])
+
 AC_CONFIG_FILES([Makefile
 		 src/Makefile])
 AC_OUTPUT
diff --git a/src/Makefile.am b/src/Makefile.am
index f9e81a0..2c5ed18 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,7 +2,11 @@ bin_PROGRAMS = pjctl
 
 pjctl_SOURCES = pjctl.c ext/gnulib/md5.c ext/gnulib/md5.h param.h
 
-pjctl_LDADD = $(crypto_LIBS)
-AM_CPPFLAGS = $(crypto_CFLAGS)
+if HAVE_WINDOWS
+# Create an executable that doesnt open a console
+bin_PROGRAMS += pjctl-no-console
+pjctl_no_console_SOURCES = pjctl.c ext/gnulib/md5.c ext/gnulib/md5.h
+pjctl_no_console_LDFLAGS = -mwindows
+endif
 
 AM_CFLAGS = $(GCC_CFLAGS)
diff --git a/win/pjctl.mm b/win/pjctl.mm
index 4272d68..b7dce3d 100644
--- a/win/pjctl.mm
+++ b/win/pjctl.mm
@@ -36,6 +36,6 @@
 
 ;--- Define default location where file should install and add files --------
 <$DirectoryTree Key="INSTALLDIR" Dir="c:\program files\pjctl\" CHANGE="\" PrimaryFolder="Y">
-<$Files "pjctl-no-console.exe" DestDir="INSTALLDIR">
-<$Files "pjctl.exe" DestDir="INSTALLDIR">
-<$Files "C:\cygwin\bin\cygwin1.dll" DestDir="INSTALLDIR">
\ No newline at end of file
+<$Files "..\src\pjctl-no-console.exe" DestDir="INSTALLDIR">
+<$Files "..\src\pjctl.exe" DestDir="INSTALLDIR">
+<$Files "C:\cygwin\bin\cygwin1.dll" DestDir="INSTALLDIR">
-- 
cgit