Changeset 2912

Timestamp:

10/11/08 11:10:11 (5 years ago)

Author:

sam

Message:

Make the GTK# detection code more robust.

Location:

libpipi/trunk

Files:

• ThePimp/Makefile.am (modified) (2 diffs)
• configure.ac (modified) (1 diff)
• pipi-sharp/Makefile.am (modified) (1 diff)

libpipi/trunk/ThePimp/Makefile.am

@@ -29 +29 @@
 
 if USE_CSHARP
+if USE_GTKSHARP
 bin_SCRIPTS = Pimp.exe
+endif
 endif
 
@@ -38 +40 @@
         cp ../pipi-sharp/pipi-sharp.dll.config .
         cp ../pipi-sharp/pipi-sharp.dll.mdb .
-        gmcs -debug -out:$@ -lib:./ \
+        $(GMCS) -debug -out:$@ -lib:./ \
           $(addprefix $(srcdir)/, $(pimp_sources)) \
           $(foreach x, $(pimp_resources), \

libpipi/trunk/configure.ac

@@ -170 +170 @@
 fi
 
+# Build pipi-sharp?
+AC_PATH_PROG(GMCS, gmcs, no)
+AM_CONDITIONAL(USE_CSHARP, test "${gmcs}" != "no")
+
 # Build The Pimp?
-AC_PATH_PROG(GMCS, gmcs, no)
-PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0], [:])
-PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0], [:])
-PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0], [:])
-AM_CONDITIONAL(USE_CSHARP, test "${gmcs}" != "no")
-
+ac_cv_my_have_gtksharp=yes
+PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0], [:], [ac_cv_my_have_gtksharp=no])
+PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0], [:], [ac_cv_my_have_gtksharp=no])
+PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0], [:], [ac_cv_my_have_gtksharp=no])
+AM_CONDITIONAL(USE_GTKSHARP, test "${ac_cv_my_have_gtksharp}" != no)
 
 AC_CONFIG_FILES([

libpipi/trunk/pipi-sharp/Makefile.am

@@ -20 +20 @@
 
 pipi-sharp.dll: $(pipi_sources)
-        gmcs -debug -unsafe $(pipi_sources) -out:$@ -target:library
+        $(GMCS) -debug -unsafe $(pipi_sources) -out:$@ -target:library
 
 test.exe: $(test_sources) pipi-sharp.dll
-        gmcs -debug $(test_sources) -out:$@ -lib:./ \
+        $(GMCS) -debug $(test_sources) -out:$@ -lib:./ \
           -r:./pipi-sharp.dll