[gmime/gmime-2-4] Added --with-gacdir configure switch

[Jeffrey Stedfast <fejj src gnome org>]

commit addf8cdcfd80e6006f9aa533f2b4dccd5140131d
Author: Jeffrey Stedfast <fejj gnome org>
Date:   Sat Feb 4 15:41:03 2012 -0500

    Added --with-gacdir configure switch
    
    2012-02-04  Jeffrey Stedfast  <fejj gnome org>
    
    	* configure.in: Added --with-gacdir to fix bug #667072

 ChangeLog        |    4 ++++
 configure.in     |    7 ++++++-
 mono/Makefile.am |   16 ++++++++--------
 3 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 738a938..208947c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-02-04  Jeffrey Stedfast  <fejj gnome org>
+
+	* configure.in: Added --with-gacdir to fix bug #667072
+
 2012-01-08  Jeffrey Stedfast  <fejj gnome org>
 
 	* README: Bumped version
diff --git a/configure.in b/configure.in
index 93997c8..b464e8f 100644
--- a/configure.in
+++ b/configure.in
@@ -425,7 +425,7 @@ if test "x$enable_mono" != "xno"; then
 	# mcs, such as Tru64's /usr/bin/mcs, for manipulating object file
 	# comment sections of eCOFF object files.
 	if test "x$CSC" != "xno"; then
-		AC_MSG_CHECKING([whether $CSC is GNU Mono])
+		AC_MSG_CHECKING([whether $CSC is Mono])
 		$CSC --version > /dev/null 2>&1
 		if test $? -ne 0; then
 			CSC=no
@@ -489,6 +489,11 @@ if test "x$enable_mono" = "xyes"; then
 	AC_SUBST(API_VERSION)
 fi
 
+AC_ARG_WITH([gacdir], AC_HELP_STRING([--with-gacdir], [Specify the Global Assembly Cache root directory]),,
+            [with_gacdir=$prefix/lib])
+gacdir=$(cd "$with_gacdir" && pwd)
+AC_SUBST(gacdir)
+
 dnl Extra libs
 EXTRA_LIBS="$ZLIB"
 if test "x$LIBSOCKET" != "x"; then
diff --git a/mono/Makefile.am b/mono/Makefile.am
index dedee06..c57552c 100644
--- a/mono/Makefile.am
+++ b/mono/Makefile.am
@@ -73,22 +73,22 @@ $(ASSEMBLY): $(build_sources) generated-stamp $(srcdir)/$(ASSEMBLY_NAME).snk
 install-data-hook:
 	@if test -n '$(TARGET)'; then									\
 	  if test -n '$(DESTDIR)'; then									\
-	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir)";	\
-	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir) || exit 1;	\
+	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(gacdir)";	\
+	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /root $(DESTDIR)$(gacdir) || exit 1;	\
 	  else												\
-	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(libdir)";		\
-	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(libdir) || exit 1;		\
+	    echo "$(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(gacdir)";		\
+	    $(GACUTIL) /i $(ASSEMBLY) /f /package $(PACKAGE_SHARP) /gacdir $(gacdir) || exit 1;		\
 	  fi;												\
 	fi
 
 uninstall-local:
 	@if test -n '$(TARGET)'; then									\
 	  if test -n '$(DESTDIR)'; then									\
-	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir)";	\
-	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(libdir) || exit 1;  \
+	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(gacdir)";	\
+	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /root $(DESTDIR)$(gacdir) || exit 1;  \
 	  else												\
-	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(libdir)";		\
-	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(libdir) || exit 1;	\
+	    echo "$(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(gacdir)";		\
+	    $(GACUTIL) /u $(ASSEMBLY_NAME) /package $(PACKAGE_SHARP) /gacdir $(gacdir) || exit 1;	\
 	  fi;												\
 	fi