Only build cygdrop when $host is cygwin.

diff --git a/ChangeLog b/ChangeLog
index afadc2f39a2472eb9f40259bad4c050bccfe5504..caeee8db4d60f41b591b16659e706e48e93f9f27 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-11-21  Charles Wilson  <cwilson@...>
+
+       Only build cygdrop when $host is cygwin.
+       * configure.ac: Arrange to build cygdrop only when CYGWIN.
+       * Makefile.am: Ditto.
+       * NEWS: Add cygdrop.
+
 2009-11-21  Christian Franke  <franke@computer.org>
 
        Add cygdrop utility.

diff --git a/Makefile.am b/Makefile.am
index 998a40d7b91139fd3ab933dc75a2fe0214397bc6..e976762eeddce658484122e2f4ad384b9ae71560 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,8 +12,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 if WITH_WINDOWS_PROGRAMS
 windows_progs = src/banner/banner src/clip/getclip src/clip/putclip \
        src/cygstart/cygstart src/lpr/lpr src/mkshortcut/mkshortcut \
-       src/readshortcut/readshortcut \
-       src/cygdrop/cygdrop
+       src/readshortcut/readshortcut
 windows_ltlibraries = src/cygicons/libicons.la
 windows_headers = src/cygicons/cygicons.h
 cygicons_docs   = src/cygicons/README
@@ -26,9 +25,13 @@ ipc_progs = src/ipc/semtool src/ipc/shmtool \
 ipc_scripts = src/ipc/ipck
 endif
 
+if WITH_CYGWIN_SPECIFIC_PROGRAMS
+cygwin_specific_progs = src/cygdrop/cygdrop
+endif
+
 bin_PROGRAMS = src/ascii/ascii $(windows_progs) src/conv/conv \
        src/dump/dump $(ipc_progs) \
-       src/realpath/realpath
+       src/realpath/realpath $(cygwin_specific_progs)
 
 bin_SCRIPTS = $(ipc_scripts)
 

diff --git a/NEWS b/NEWS
index cdcedb58c5b254403bd616ecdb0e2683f58360d2..d4a436fd51c7250e1f397fc48ebdbc9ef50f5e4d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@
   Add --help option to lpr.
   Build system improvements.
   Add support for building on MinGW.
+  Add new cygdrop utility (Christian Franke; requires w2k or better)
 
 1.4.0
   Add support to cygstart for filenames with UTF/wide chars.

diff --git a/configure.ac b/configure.ac
index 3a1d18bcdb1573fcb8d4a86adeb81023d0ec56b2..73edd6e257e720f35d3d5b26ec75e1787301b20d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -85,6 +85,11 @@ esac],dnl
 dnl Set Conditionals for Makefile.am
 AM_CONDITIONAL(WITH_WINDOWS_PROGRAMS, test "$ac_cv_func_OpenClipboard" = yes)
 AM_CONDITIONAL(WITH_NATIVE_IPC_PROGRAMS, test "$HAVE_INTRINSIC_IPC" = yes)
+host_is_cygwin=no
+case "$host" in
+*cygwin* ) host_is_cygwin=yes ;;
+esac
+AM_CONDITIONAL(WITH_CYGWIN_SPECIFIC_PROGRAMS, test "$host_is_cygwin" = yes)
 
 AC_CONFIG_FILES([Makefile po/Makefile.in src/cygicons/cygicons.rc])