Changeset 2912 for libpipi/trunk


Ignore:
Timestamp:
Oct 11, 2008, 11:10:11 AM (12 years ago)
Author:
Sam Hocevar
Message:

Make the GTK# detection code more robust.

Location:
libpipi/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • libpipi/trunk/ThePimp/Makefile.am

    r2910 r2912  
    2929
    3030if USE_CSHARP
     31if USE_GTKSHARP
    3132bin_SCRIPTS = Pimp.exe
     33endif
    3234endif
    3335
     
    3840        cp ../pipi-sharp/pipi-sharp.dll.config .
    3941        cp ../pipi-sharp/pipi-sharp.dll.mdb .
    40         gmcs -debug -out:$@ -lib:./ \
     42        $(GMCS) -debug -out:$@ -lib:./ \
    4143          $(addprefix $(srcdir)/, $(pimp_sources)) \
    4244          $(foreach x, $(pimp_resources), \
  • libpipi/trunk/configure.ac

    r2902 r2912  
    170170fi
    171171
     172# Build pipi-sharp?
     173AC_PATH_PROG(GMCS, gmcs, no)
     174AM_CONDITIONAL(USE_CSHARP, test "${gmcs}" != "no")
     175
    172176# Build The Pimp?
    173 AC_PATH_PROG(GMCS, gmcs, no)
    174 PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0], [:])
    175 PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0], [:])
    176 PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0], [:])
    177 AM_CONDITIONAL(USE_CSHARP, test "${gmcs}" != "no")
    178 
     177ac_cv_my_have_gtksharp=yes
     178PKG_CHECK_MODULES([GLADE_SHARP_20], [glade-sharp-2.0], [:], [ac_cv_my_have_gtksharp=no])
     179PKG_CHECK_MODULES([GLIB_SHARP_20], [glib-sharp-2.0], [:], [ac_cv_my_have_gtksharp=no])
     180PKG_CHECK_MODULES([GTK_SHARP_20], [gtk-sharp-2.0], [:], [ac_cv_my_have_gtksharp=no])
     181AM_CONDITIONAL(USE_GTKSHARP, test "${ac_cv_my_have_gtksharp}" != no)
    179182
    180183AC_CONFIG_FILES([
  • libpipi/trunk/pipi-sharp/Makefile.am

    r2874 r2912  
    2020
    2121pipi-sharp.dll: $(pipi_sources)
    22         gmcs -debug -unsafe $(pipi_sources) -out:$@ -target:library
     22        $(GMCS) -debug -unsafe $(pipi_sources) -out:$@ -target:library
    2323
    2424test.exe: $(test_sources) pipi-sharp.dll
    25         gmcs -debug $(test_sources) -out:$@ -lib:./ \
     25        $(GMCS) -debug $(test_sources) -out:$@ -lib:./ \
    2626          -r:./pipi-sharp.dll
    2727
Note: See TracChangeset for help on using the changeset viewer.