[tasque] [build] Fix debug and release build settings in autoconf

[Antonius Riha <antoniusri src gnome org>]

commit 8d817a9a1a5395f60c1f3a775985dbdb5c07a1de
Author: Antonius Riha <antoniusriha gmail com>
Date:   Wed Aug 22 22:01:34 2012 +0200

    [build] Fix debug and release build settings in autoconf
    
    Drop explicit --enable-release option. Release build is now the default. If
    Tasque is to be built in debug mode --enable-debug must be set.

 RtmNet/Makefile.am |    7 ++-----
 configure.ac       |   33 ++-------------------------------
 src/Makefile.am    |    8 +++-----
 3 files changed, 7 insertions(+), 41 deletions(-)
---
diff --git a/RtmNet/Makefile.am b/RtmNet/Makefile.am
index 2fc4200..b6bb001 100644
--- a/RtmNet/Makefile.am
+++ b/RtmNet/Makefile.am
@@ -3,10 +3,7 @@ CSC = $(DMCS)
 TARGET = RtmNet.dll
 
 if ENABLE_DEBUG
-CSFLAGS =  -t:library -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG
-endif
-if ENABLE_RELEASE
-CSFLAGS =  -t:library -noconfig -codepage:utf8 -warn:4
+CSFLAGS = -debug -d:DEBUG
 endif
 
 CSFILES = \
@@ -44,7 +41,7 @@ ASSEMBLIES =  \
 	-r:System.Xml
 
 $(TARGET): $(CSFILES)
-	$(CSC) -unsafe -out:$@ $(CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
+	$(CSC) -unsafe -out:$@ -t:library -noconfig -codepage:utf8 -warn:4 $(CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
 
 tasquelibdir = $(libdir)/tasque
 tasquelib_DATA = $(TARGET)	
diff --git a/configure.ac b/configure.ac
index 0feab7c..575149b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,37 +73,9 @@ fi
 AM_CONDITIONAL(ENABLE_APPINDICATOR, test "x$appindicator" != "xno")
 
 
-AC_ARG_ENABLE(debug,
-	AC_HELP_STRING([--enable-debug],
-		[Use 'Debug' Configuration [default=yes]]),
-		enable_debug=$enableval, enable_debug=no)
+AC_ARG_ENABLE(debug, AC_HELP_STRING([--enable-debug], [Use 'Debug' Configuration [default=no]]),
+	enable_debug=$enableval, enable_debug=no)
 AM_CONDITIONAL(ENABLE_DEBUG, test "x$enable_debug" != "xno")
-if test "x$enable_debug" != "xno" ; then
-#	DEBUG_CONFIG_LIBRARIES=' ${pkglibdir}/Db4objects.Db4o.dll'
-#	DEBUG_CONFIG_LIBS=' -r:${pkglibdir}/Db4objects.Db4o.dll'
-#	AC_SUBST(DEBUG_CONFIG_LIBRARIES)
-#	AC_SUBST(DEBUG_CONFIG_LIBS)
-	CONFIG_REQUESTED="yes"
-fi
-AC_ARG_ENABLE(release,
-	AC_HELP_STRING([--enable-release],
-		[Use 'Release' Configuration [default=no]]),
-		enable_release=$enableval, enable_release=no)
-AM_CONDITIONAL(ENABLE_RELEASE, test "x$enable_release" != "xno")
-if test "x$enable_release" != "xno" ; then
-#	RELEASE_CONFIG_LIBRARIES=' ${pkglibdir}/Db4objects.Db4o.dll'
-#	RELEASE_CONFIG_LIBS=' -r:${pkglibdir}/Db4objects.Db4o.dll'
-#	AC_SUBST(RELEASE_CONFIG_LIBRARIES)
-#	AC_SUBST(RELEASE_CONFIG_LIBS)
-	CONFIG_REQUESTED="yes"
-fi
-if test -z "$CONFIG_REQUESTED" ; then
-#	DEBUG_CONFIG_LIBRARIES=' ${pkglibdir}/Db4objects.Db4o.dll'
-#	DEBUG_CONFIG_LIBS=' -r:${pkglibdir}/Db4objects.Db4o.dll'
-#	AC_SUBST(DEBUG_CONFIG_LIBRARIES)
-#	AC_SUBST(DEBUG_CONFIG_LIBS)
-	AM_CONDITIONAL(ENABLE_DEBUG, true)
-fi
 
 
 #
@@ -296,7 +268,6 @@ Configuration:
 
 	Prefix:            ${prefix}
 	Debug build:       ${enable_debug}
-	Release build:     ${enable_release}
 	Notification:      ${enable_notify_sharp}
 	Dummy Backend:     ${final_backend_dummy}
 	Evolution Backend: ${final_backend_eds}
diff --git a/src/Makefile.am b/src/Makefile.am
index b79c4de..1333464 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -10,10 +10,7 @@ GTK_2_12_CSFLAGS = -define:GTK_2_12
 endif
 
 if ENABLE_DEBUG
-CSFLAGS =  -noconfig -codepage:utf8 -warn:4 -debug -d:DEBUG $(GTK_2_12_CSFLAGS)
-endif
-if ENABLE_RELEASE
-CSFLAGS =  -noconfig -codepage:utf8 -warn:4 $(GTK_2_12_CSFLAGS)
+CSFLAGS = -debug -d:DEBUG
 endif
 
 if ENABLE_NOTIFY_SHARP
@@ -174,7 +171,8 @@ ASSEMBLIES =  \
 	$(APPINDICATOR_SHARP_LIBS)
 
 $(TARGET): $(CSFILES) Defines.cs
-	$(CSC) -unsafe -out:$@ $(CSFLAGS) $(NOTIFY_SHARP_CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
+	$(CSC) -unsafe -out:$@ -noconfig -codepage:utf8 -warn:4 $(CSFLAGS) \
+	$(GTK_2_12_CSFLAGS) $(NOTIFY_SHARP_CSFLAGS) $^ $(ASSEMBLIES) $(RESOURCES)
 
 tasquelibdir = $(libdir)/tasque
 tasquelib_DATA = $(TARGET) $(TARGET).config $(TARGET).mdb