--- gigedit/trunk/configure.ac	2008/02/12 14:13:46	1679
+++ gigedit/trunk/configure.ac	2009/01/10 11:47:00	1824
@@ -33,6 +33,7 @@
 SHARED_VERSION_INFO="$LIBGIGEDIT_LT_CURRENT:$LIBGIGEDIT_LT_REVISION:$LIBGIGEDIT_LT_AGE"
 AC_LANG_CPLUSPLUS
 AC_PROG_CXX
+AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 AC_SUBST(SHLIB_VERSION_ARG)
 AC_SUBST(SHARED_VERSION_INFO)
@@ -58,6 +59,12 @@
 IT_PROG_INTLTOOL(0.35.0)
 AM_GLIB_GNU_GETTEXT
 
+case $host in
+    *mingw*|*cygwin*) windows=yes ;;
+    *)                windows=no ;;
+esac
+AM_CONDITIONAL(WINDOWS, test "$windows" = "yes")
+
 PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 >= 2.4.10 gthread-2.0)
 PKG_CHECK_MODULES(GIG, gig >= 3.2.0)
 
@@ -67,14 +74,14 @@
 AC_SUBST(SNDFILE_LIBS)
 
 # check for loop functionality in libsndfile
-gigedit_save_CFLAGS=$CFLAGS
-CFLAGS="$SNDFILE_CFLAGS $CFLAGS"
+gigedit_save_CXXFLAGS=$CXXFLAGS
+CXXFLAGS="$SNDFILE_CFLAGS $CXXFLAGS"
 AC_CHECK_MEMBERS([SF_INSTRUMENT.loops],,
 		 [AC_MSG_WARN([Your version of libsndfile does not support
     reading of loop information. Gigedit will not be able to
     extract loop information from sample files.])],
 		 [#include <sndfile.h>])
-CFLAGS=$gigedit_save_CFLAGS
+CXXFLAGS=$gigedit_save_CXXFLAGS
 
 # check for (optional) presence of liblinuxsampler
 liblinuxsampler_version="0.5.0"
@@ -187,5 +194,6 @@
 	win32/gigedit.dev
 	win32/gigedit.nsi
 	win32/Makefile
+	gigedit.spec
 ])
 AC_OUTPUT