diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | gendarme/framework/Makefile.am | 2 | ||||
| -rw-r--r-- | gui-compare/Makefile.am | 2 |
4 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2008-02-01 Andrew Jorgensen <ajorgensen@novell.com> + + * configure.in: get the path to Mono.Cecil.dll during configure + 2008-01-28 Wade Berrier <wberrier@novell.com> * configure.in: version bump -> 1.9 diff --git a/configure.in b/configure.in index afb493cc..07a64686 100644 --- a/configure.in +++ b/configure.in @@ -77,6 +77,9 @@ else AC_MSG_ERROR([You are missing Cecil (cecil.pc for packageconfig) required for gui-compare]) fi +CECIL_ASM=`pkg-config --variable=Libraries cecil` +AC_SUBST(CECIL_ASM) + dnl Intl GETTEXT_PACKAGE=mono-tools AC_SUBST(GETTEXT_PACKAGE) diff --git a/gendarme/framework/Makefile.am b/gendarme/framework/Makefile.am index 582dc936..0ed9b5f7 100644 --- a/gendarme/framework/Makefile.am +++ b/gendarme/framework/Makefile.am @@ -33,7 +33,7 @@ framework_build_sources += $(framework_generated_sources) mkdir ../bin $(top_builddir)/gendarme/bin/Mono.Cecil.dll: ../bin/ - cp `pkg-config --variable=Libraries cecil` $(top_builddir)/gendarme/bin/ + cp $(CECIL_ASM) $(top_builddir)/gendarme/bin/ ../bin/Gendarme.Framework.dll: ../bin/ $(framework_build_sources) $(top_builddir)/gendarme/bin/Mono.Cecil.dll $(GMCS) -debug -target:library -langversion:linq -r:$(top_builddir)/gendarme/bin/Mono.Cecil.dll -r:System.Xml.dll -out:$@ $(framework_build_sources) diff --git a/gui-compare/Makefile.am b/gui-compare/Makefile.am index 98273ecc..96bf1037 100644 --- a/gui-compare/Makefile.am +++ b/gui-compare/Makefile.am @@ -58,7 +58,7 @@ assemblies = -r:System -r:Mono.Posix -r:System.Xml ress= $(foreach res,$(gui_compare_resources), $(addprefix -resource:,$(res)),$(notdir $(res))) Mono.Cecil.dll: - cp `pkg-config --variable=Libraries cecil` . + cp $(CECIL_ASM) . gui-compare.exe: $(gui_compare_sources) $(gui_compare_resources) Mono.Cecil.dll $(GMCS) -noconfig -codepage:utf8 -warn:4 -optimize+ -debug -define:DEBUG -target:exe -out:gui-compare.exe $(gui_compare_sources) $(ress) $(packages) $(assemblies) |