[Kde-bindings] KDE_3_2_BRANCH: kdebindings

[Richard Dale]

CVS commit by rdale: 

Applied patch from James Ots to add a configure check for the csant tool. It isn't found qtsharp isn't built.
Applied to the KDE_3_2_BRANCH

CCMAIL: 69585-done at bugs.kde.org kdebindings
CCMAIL: kde-bindings at mail.kde.org


  M +27 -0     configure.in.in   1.36.2.2
  M +1 -2      qtsharp/README   1.1.4.1
  M +1 -0      qtsharp/configure.in.in   1.3.4.1
  M +1 -1      qtsharp/src/bindings/Makefile.am   1.3.2.1
  M +1 -1      qtsharp/src/binge/Makefile.am   1.2.2.1
  M +1 -1      qtsharp/src/examples/samples/Makefile.am   1.4.2.1
  M +1 -1      qtsharp/src/examples/tutorials/Makefile.am   1.4.2.1
  M +1 -1      qtsharp/src/generator/Makefile.am   1.2.2.1
  M +1 -1      qtsharp/src/parser/Makefile.am   1.2.2.1


--- kdebindings/configure.in.in  #1.36.2.1:1.36.2.2
@@ -112,4 +112,31 @@
 AC_DEFUN([KDE_CHECK_CSANT],[
 ])
+        AC_ARG_WITH(csant, [  --with-csant=FILE       csant executable is FILE ],
+        [
+                AC_MSG_CHECKING(for $with_csant)
+
+                if test -f $with_csant
+                then
+                        CSANT="$with_csant"
+                        AC_MSG_RESULT($CSANT)
+                else
+                        AC_MSG_RESULT(no)
+                        echo "ERROR: Unknown csant executable: $with_csant"
+                        echo "ERROR: Will not build qtsharp"
+                        DO_NOT_COMPILE="$DO_NOT_COMPILE qtsharp"
+                fi
+        ],
+        [
+                AC_PATH_PROG(CSANT, csant, [], $PATH:/usr/local/bin)
+                
+                if test -z "$CSANT"
+                then
+                        echo "ERROR: csant cannot be found"
+                        echo "ERROR: Will not build qtsharp"
+                        DO_NOT_COMPILE="$DO_NOT_COMPILE qtsharp"
+                fi
+        ])
+
+        AC_SUBST(CSANT)
 
 # Pick one of the available C# compilers.

--- kdebindings/qtsharp/configure.in.in  #1.3:1.3.4.1
@@ -6,4 +6,5 @@
 KDE_CHECK_CLI
 KDE_CHECK_CS_COMPILER
+KDE_CHECK_CSANT
 
 # Other stuff...

--- kdebindings/qtsharp/README  #1.1:1.1.4.1
@@ -1,4 +1,3 @@
-* Quick note ... you will need csant to build this module.  I haven't
-had a chance to put a ./configure check for csant yet, but I will soon.
+* Quick note ... you will need csant to build this module.
 
 You can find csant with the Portable.NET tools.  

--- kdebindings/qtsharp/src/parser/Makefile.am  #1.2:1.2.2.1
@@ -2,5 +2,5 @@
 
 all-local: $(CS_FILES)
-        csant -D$(CSC_NAME)=$(CSC) -C $(CSC_NAME)
+        $(CSANT) -D$(CSC_NAME)=$(CSC) -C $(CSC_NAME)
         chmod 755 parser.exe
 

--- kdebindings/qtsharp/src/generator/Makefile.am  #1.2:1.2.2.1
@@ -2,5 +2,5 @@
 
 generator.exe: $(wildcard *.cs)
-        csant -D$(CSC_NAME)=$(CSC) -C $(CSC_NAME)
+        $(CSANT) -D$(CSC_NAME)=$(CSC) -C $(CSC_NAME)
         chmod 755 $@
 

--- kdebindings/qtsharp/src/examples/tutorials/Makefile.am  #1.4:1.4.2.1
@@ -1,4 +1,4 @@
 all-local:
-        csant -D$(CSC_NAME)=$(CSC) -C $(CSC_NAME)
+        $(CSANT) -D$(CSC_NAME)=$(CSC) -C $(CSC_NAME)
         chmod 0755 *.exe
 

--- kdebindings/qtsharp/src/examples/samples/Makefile.am  #1.4:1.4.2.1
@@ -1,4 +1,4 @@
 all-local:
-        csant -D$(CSC_NAME)=$(CSC) -C $(CSC_NAME)
+        $(CSANT) -D$(CSC_NAME)=$(CSC) -C $(CSC_NAME)
         chmod 0755 *.exe
 

--- kdebindings/qtsharp/src/binge/Makefile.am  #1.2:1.2.2.1
@@ -1,4 +1,4 @@
 all-local:
-        csant -D$(CSC_NAME)=$(CSC) -C $(CSC_NAME)
+        $(CSANT) -D$(CSC_NAME)=$(CSC) -C $(CSC_NAME)
         chmod 755 binge.exe
 

--- kdebindings/qtsharp/src/bindings/Makefile.am  #1.3:1.3.2.1
@@ -6,5 +6,5 @@
 Qt.dll: QWidget.cs $(wildcard *.cs) $(wildcard static/*.cs)
         cp static/*.cs .
-        time csant -D$(CSC_NAME)=$(CSC) -C $(CSC_NAME)
+        time $(CSANT) -D$(CSC_NAME)=$(CSC) -C $(CSC_NAME)
 
 CLEANFILES = Qt.dll