fix configure tests for various scripting languages, enable C#, Guile
authorellson <devnull@localhost>
Tue, 18 Oct 2005 21:05:32 +0000 (21:05 +0000)
committerellson <devnull@localhost>
Tue, 18 Oct 2005 21:05:32 +0000 (21:05 +0000)
.gitignore
configure.ac
tclpkg/gv/Makefile.am

index 67b3eaa54043644a829620be0cfb9ffb525f42d2..c0920e520e38d5d878f836fda1320fc6a293b1ba 100644 (file)
@@ -146,19 +146,32 @@ libltdl/*
 libtool
 stamp-h1
 tclpkg/gdtclft/pkgIndex.tcl
+tclpkg/gv/SWIGTYPE_p_Agedge_t.cs
+tclpkg/gv/SWIGTYPE_p_Agnode_t.cs
+tclpkg/gv/SWIGTYPE_p_Agraph_t.cs
+tclpkg/gv/SWIGTYPE_p_Agsym_t.cs
+tclpkg/gv/SWIGTYPE_p_FILE.cs
+tclpkg/gv/SWIGTYPE_p_p_void.cs
 tclpkg/gv/SWIGTYPE_p_Agedge_t.java
 tclpkg/gv/SWIGTYPE_p_Agnode_t.java
 tclpkg/gv/SWIGTYPE_p_Agraph_t.java
 tclpkg/gv/SWIGTYPE_p_Agsym_t.java
 tclpkg/gv/SWIGTYPE_p_FILE.java
 tclpkg/gv/SWIGTYPE_p_p_void.java
+tclpkg/gv/gv.cs
 tclpkg/gv/gv.java
+tclpkg/gv/gv.ml
+tclpkg/gv/gv.mli
 tclpkg/gv/gv.php
 tclpkg/gv/gv.pm
 tclpkg/gv/gv.py
 tclpkg/gv/gv.pyc
 tclpkg/gv/gvJNI.java
+tclpkg/gv/gvPINVOKE.cs
+tclpkg/gv/gv_csharp.cpp
+tclpkg/gv/gv_guile.cpp
 tclpkg/gv/gv_java.cpp
+tclpkg/gv/gv_ocaml.cpp
 tclpkg/gv/gv_perl.cpp
 tclpkg/gv/gv_php.cpp
 tclpkg/gv/gv_python.cpp
index 967c789f3d1a60b62391414d0a249b8c117b4b47..37a4a4d41e05a3b8771eac44f7532456bacf08d8 100644 (file)
@@ -303,102 +303,72 @@ dnl -----------------------------------
 dnl INCLUDES and LIBS for CSHARP
 
 AC_CHECK_PROG(CSHARP,mcs,mcs)
-if test "x$CSHARP" = "x"; then
-  HAVE_CSHARP=0
-else
-  HAVE_CSHARP=1
-  CSHARP_INCLUDES=
-  CSHARP_LIBS=
-fi
-AM_CONDITIONAL(WITH_CSHARP, [test "x$HAVE_CSHARP" = "x1"])
-AC_SUBST(HAVE_CSHARP)
+CSHARP_INCLUDES=
+CSHARP_LIBS=
 AC_SUBST(CSHARP_INCLUDES)
 AC_SUBST(CSHARP_LIBS)
+AM_CONDITIONAL(WITH_CSHARP, [test "x$CSHARP" != "x"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GUILE
 
 AC_CHECK_PROG(GUILE,guile,guile)
-if test "x$GUILE" = "x"; then
-  HAVE_GUILE=0
-else
-  HAVE_GUILE=1
-  GUILE_INCLUDES=
-  GUILE_LIBS=
-fi
+GUILE_INCLUDES=
+GUILE_LIBS=
 AC_CHECK_HEADER(libguile.h,,[
   AC_MSG_WARN([Unable to find header libguile.h. The Guile packages will not be built])
-  HAVE_GUILE=0])
-AM_CONDITIONAL(WITH_GUILE, [test "x$HAVE_GUILE" = "x1"])
-AC_SUBST(HAVE_GUILE)
+  GUILE=
+  ])
 AC_SUBST(GUILE_INCLUDES)
 AC_SUBST(GUILE_LIBS)
+AM_CONDITIONAL(WITH_GUILE, [test "x$GUILE" != "x"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for IO
 
 AC_CHECK_PROG(IO,io,io)
-if test "x$IO" = "x"; then
-  HAVE_IO=0
-else
-  HAVE_IO=1
-  IO_INCLUDES=
-  IO_LIBS=
-fi
-AM_CONDITIONAL(WITH_IO, [test "x$HAVE_IO" = "x1"])
-AC_SUBST(HAVE_IO)
+IO_INCLUDES=
+IO_LIBS=
 AC_SUBST(IO_INCLUDES)
 AC_SUBST(IO_LIBS)
+AM_CONDITIONAL(WITH_IO, [test "x$IO" != "x"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for JAVA
 
 AC_CHECK_PROG(JAVA,java,java)
-if test "x$JAVA" = "x"; then
-  HAVE_JAVA=0
-else
-  HAVE_JAVA=1
-  JAVA_INCLUDES=
-  JAVA_LIBS=
-fi
+JAVA_INCLUDES=
+JAVA_LIBS=
 AC_CHECK_HEADER(jni.h,,[
   AC_MSG_WARN([Unable to find header jni.h. The Java packages will not be built])
-  HAVE_JAVA=0])
-AM_CONDITIONAL(WITH_JAVA, [test "x$HAVE_JAVA" = "x1"])
-AC_SUBST(HAVE_JAVA)
+  JAVA=
+  ])
 AC_SUBST(JAVA_INCLUDES)
 AC_SUBST(JAVA_LIBS)
+AM_CONDITIONAL(WITH_JAVA, [test "x$JAVA" != "x"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for OCAML
 
 AC_CHECK_PROG(OCAML,ocaml,ocaml)
-if test "x$OCAML" = "x"; then
-  HAVE_OCAML=0
-else
-  HAVE_OCAML=1
-  OCAML_INCLUDES=-I/usr/lib$LIBPOSTFIX/ocaml
-  OCAML_LIBS=-L/usr/lib$LIBPOSTFIX/ocaml
-fi
+OCAML_INCLUDES=-I/usr/lib$LIBPOSTFIX/ocaml
+OCAML_LIBS=-L/usr/lib$LIBPOSTFIX/ocaml
 save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $OCAML_INCLUDES"
 AC_CHECK_HEADER(caml/mlvalues.h,,[
   AC_MSG_WARN([Unable to find header caml/mlvalues.h. The OCAML packages will not be built])
-  HAVE_OCAML=0])
+  OCAML=
+  ])
 CPPFLAGS=$save_CPPFLAGS
-AM_CONDITIONAL(WITH_OCAML, [test "x$HAVE_OCAML" = "x1"])
-AC_SUBST(HAVE_OCAML)
 AC_SUBST(OCAML_INCLUDES)
 AC_SUBST(OCAML_LIBS)
+AM_CONDITIONAL(WITH_OCAML, [test "x$OCAML" != "x"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PERL
 
 AC_CHECK_PROG(PERL,perl,perl)
-if test "x$PERL" = "x"; then
-  HAVE_PERL=0
-else
-  HAVE_PERL=1
+if test "x$PERL" != "x"; then
   PERL_ARCHLIB=`perl -e 'use Config; print $Config{archlib};'`
   PERL_INCLUDES=-I$PERL_ARCHLIB/CORE
   PERL_LIBS="-L$PERL_ARCHLIB/CORE -lperl"
@@ -407,57 +377,48 @@ save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $PERL_INCLUDES"
 AC_CHECK_HEADER(EXTERN.h,,[
   AC_MSG_WARN([Unable to find header EXTERN.h. The PERL packages will not be built])
-  HAVE_PERL=0]
-)
+  PERL=
+  ])
 CPPFLAGS=$save_CPPFLAGS
-AM_CONDITIONAL(WITH_PERL, [test "x$HAVE_PERL" = "x1"])
-AC_SUBST(HAVE_PERL)
 AC_SUBST(PERL_INCLUDES)
 AC_SUBST(PERL_LIBS)
+AM_CONDITIONAL(WITH_PERL, [test "x$PERL" != "x"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PHP
 
 AC_CHECK_PROG(PHP,php,php)
-if test "x$PHP" = "x"; then
-  HAVE_PHP=0
-else
-  HAVE_PHP=1
-  PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
-  PHP_LIBS=
-fi
+PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
+PHP_LIBS=
 save_CPPFLAGS=$CPPFLAGS
 CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
 AC_CHECK_HEADER(zend.h,,[
   AC_MSG_WARN([Unable to find header zend.h. The PHP packages will not be built])
-  HAVE_PHP=0])
+  PHP=i
+  ])
 CPPFLAGS=$save_CPPFLAGS
-AM_CONDITIONAL(WITH_PHP, [test "x$HAVE_PHP" = "x1"])
-AC_SUBST(HAVE_PHP)
 AC_SUBST(PHP_INCLUDES)
 AC_SUBST(PHP_LIBS)
+AM_CONDITIONAL(WITH_PHP, [test "x$HAVE_PHP" != "x"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for PYTHON
 
 AC_CHECK_PROG(PYTHON,python,python)
-if test "x$PYTHON" = "x"; then
-  HAVE_PYTHON=0
-else
-  HAVE_PYTHON=1
+if test "x$PYTHON" != "x"; then
   PYTHON_VERSION=`python -V 2>&1 | grep Python | cut -d ' ' -f 2`
   if test "x$PYTHON_VERSION" = "x"; then
-    HAVE_PYTHON=0
+    PYTHON=
   else
     PYTHON_VERSION_MAJOR=`echo $PYTHON_VERSION | cut -d '.' -f 1`
     PYTHON_VERSION_MINOR=`echo $PYTHON_VERSION | cut -d '.' -f 2`
     PYTHON_VERSION_SHORT=$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR
     if test $PYTHON_VERSION_MAJOR -lt 3; then
       if test $PYTHON_VERSION_MAJOR -lt 2; then
-       HAVE_PYTHON=0
+       PYTHON=
       else
         if test $PYTHON_VERSION_MINOR -lt 4; then
-         HAVE_PYTHON=0
+         PYTHON=
         fi
       fi
     fi
@@ -469,28 +430,25 @@ else
   CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES"
   AC_CHECK_HEADER(Python.h,,[
     AC_MSG_WARN([Unable to find header Python.h. The Python packages will not be built])
-    HAVE_PYTHON=0])
+    PYTHON=
+    ])
   CPPFLAGS=$save_CPPFLAGS
 fi
-AM_CONDITIONAL(WITH_PYTHON, [test "x$HAVE_PYTHON" = "x1"])
-AC_SUBST(HAVE_PYTHON)
 AC_SUBST(PYTHON_INCLUDES)
 AC_SUBST(PYTHON_LIBS)
+AM_CONDITIONAL(WITH_PYTHON, [test "x$PYTHON" != "x"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for RUBY
+
 AC_CHECK_PROG(RUBY,ruby,ruby)
-if test "x$RUBY" = "x"; then
-  HAVE_RUBY=0
-else
-  HAVE_RUBY=1
+if test "x$RUBY" != "x"; then
   RUBY_INCLUDES="-I`ruby $TOP_DIR/config/config_ruby.rb INCLUDES`"
   RUBY_LIBS="-L`ruby $TOP_DIR/config/config_ruby.rb lib` -lruby"
 fi
-AM_CONDITIONAL(WITH_RUBY, [test "x$HAVE_RUBY" = "x1"])
-AC_SUBST(HAVE_RUBY)
 AC_SUBST(RUBY_INCLUDES)
 AC_SUBST(RUBY_LIBS)
+AM_CONDITIONAL(WITH_RUBY, [test "x$RUBY" != "x"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for TCL
index 38e6746b93f4bfa0e51766d86e020b57ef6802ec..85d36f69c91059643e8ec9e8bce4569030eef171 100644 (file)
@@ -14,21 +14,21 @@ BASESOURCES = gv.cpp
 BASELIBS = $(top_builddir)/lib/gvc/libgvc.la
 
 
-#pkgcsharpdir = $(pkglibdir)/csharp
-#CSHARP_hdr = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs
-#libgv_csharp_la_SOURCES = $(BASESOURCES) gv_csharp.cpp
-#libgv_csharp_la_LIBADD = $(BASELIBS) @CSHARP_LIBS@ 
-#libgv_csharp_la_LDFLAGS = -module
-#gv_csharp.cpp $(CSHARP_hdr): gv.i
-#      $(SWIG) -c++ -csharp -namespace gv -o gv_csharp.cpp gv.i
-
-#pkgguiledir = $(pkglibdir)/guile
-#GUILE_hdr = 
-#libgv_guile_la_SOURCES = $(BASESOURCES) gv.gv_guile.cpp
-#libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@
-#libgv_guile_la_LDFLAGS = -module
-#gv_guile.cpp $(GUILE_hdr): gv.i
-#      $(SWIG) -c++ -guile -o gv_guile.cpp gv.i
+pkgcsharpdir = $(pkglibdir)/csharp
+CSHARP_hdr = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs
+libgv_csharp_la_SOURCES = $(BASESOURCES) gv_csharp.cpp
+libgv_csharp_la_LIBADD = $(BASELIBS) @CSHARP_LIBS@ 
+libgv_csharp_la_LDFLAGS = -module
+gv_csharp.cpp $(CSHARP_hdr): gv.i
+       $(SWIG) -c++ -csharp -namespace gv -o gv_csharp.cpp gv.i
+
+pkgguiledir = $(pkglibdir)/guile
+GUILE_hdr = 
+libgv_guile_la_SOURCES = $(BASESOURCES) gv_guile.cpp
+libgv_guile_la_LIBADD = $(BASELIBS) @GUILE_LIBS@
+libgv_guile_la_LDFLAGS = -module
+gv_guile.cpp $(GUILE_hdr): gv.i
+       $(SWIG) -c++ -guile -o gv_guile.cpp gv.i
 
 #pkgiodir = $(pkglibdir)/io
 #IO_hdr = 
@@ -98,16 +98,16 @@ pkginclude_DATA = gv.i gv.cpp
 pkglib_LTLIBRARIES = 
 TESTS =
 if WITH_SWIG
-#if WITH_CSHARP
-#pkgcsharp_DATA += $(CSHARP_hdr)
-#pkgcsharp_LTLIBRARIES += libgv_csharp.la
-#TESTS += test_csharp
-#endif
-#if WITH_GUILE
-#pkgguile_DATA += $(GUILE_hdr)
-#pkgguile_LTLIBRARIES += libgv_guile.la
-#TESTS += test_guile
-#endif
+if WITH_CSHARP
+pkgcsharp_DATA = $(CSHARP_hdr)
+pkgcsharp_LTLIBRARIES = libgv_csharp.la
+TESTS += test_csharp
+endif
+if WITH_GUILE
+pkgguile_DATA = $(GUILE_hdr)
+pkgguile_LTLIBRARIES = libgv_guile.la
+TESTS += test_guile
+endif
 #if WITH_IO
 #pkgio_DATA += $(IO_hdr)
 #pkgio_LTLIBRARIES += libgv_io.la
@@ -233,19 +233,19 @@ test_tcl: libgv_tcl.la
                $(TCLSH) ./test.tcl)
 
 EXTRA_DIST = demo/* gv.cpp gv.i \
+       gv_csharp.cpp $(CSHARP_hdr) \
+       gv_guile.cpp $(GUILE_hdr) \
        gv_java.cpp $(JAVA_hdr) \
+       gv_ocaml.cpp $(OCAML_hdr) \
        gv_perl.cpp $(PERL_hdr) \
        gv_php.cpp $(PHP_hdr) \
        gv_python.cpp $(PYTHON_hdr) \
        gv_ruby.cpp $(RUBY_hdr) \
        gv_tcl.cpp $(TCL_hdr)
 
-#      gv_csharp.cpp $(CSHARP_hdr) \
-#      gv_guile.cpp $(GUILE_hdr) \
 #      gv_io.cpp $(IO_hdr) \
-#      gv_ocaml.cpp $(OCAML_hdr) \
-#
 #
+
 CLEANFILES = test_*/*
 
 DISTCLEANFILES = \