Rename "csharp" to "sharp" to confirm with the emerging naming

convention now that Mono is in Fedora core

diff --git a/configure.ac b/configure.ac
index 370d8bfc908d27b2eb9f7c2e564e6a6c1cd267b3..a5da213817fc02d42de73e050c0fbaa51bda038f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -312,20 +312,20 @@ fi
 AM_CONDITIONAL(WITH_SWIG, [test "x$SWIG" != "x"])
 
 dnl -----------------------------------
-dnl INCLUDES and LIBS for CSHARP
+dnl INCLUDES and LIBS for C#
 
 if test "x$SWIG" != "x"; then
-AC_ARG_ENABLE(csharp,
-  [AC_HELP_STRING([--disable-csharp], [don't support csharp language bindings])])
-if test "x$enable_csharp" != "xno"; then
-AC_CHECK_PROG(CSHARP,mcs,mcs)
-CSHARP_INCLUDES=
-CSHARP_LIBS=
-AC_SUBST(CSHARP_INCLUDES)
-AC_SUBST(CSHARP_LIBS)
+AC_ARG_ENABLE(sharp,
+  [AC_HELP_STRING([--disable-sharp], ["don't support C# language bindings"])])
+if test "x$enable_sharp" != "xno"; then
+AC_CHECK_PROG(SHARP,mcs,mcs)
+SHARP_INCLUDES=
+SHARP_LIBS=
+AC_SUBST(SHARP_INCLUDES)
+AC_SUBST(SHARP_LIBS)
 fi
 fi
-AM_CONDITIONAL(WITH_CSHARP, [test "x$CSHARP" != "x"])
+AM_CONDITIONAL(WITH_SHARP, [test "x$SHARP" != "x"])
 
 dnl -----------------------------------
 dnl INCLUDES and LIBS for GUILE

diff --git a/graphviz.spec.in b/graphviz.spec.in
index 9aa9be8f6a2a0b72d8fe16c85536647c9f8a1671..de3345618d75f432154dae62702268e2af5ffa71 100644 (file)
--- a/graphviz.spec.in
+++ b/graphviz.spec.in
@@ -5,7 +5,7 @@
 # internal one for now.
 
 # Define a default set incase none of the conditionals apply
-%define CSHARP  0
+%define SHARP  0
 %define GUILE   0
 %define _IO     0
 %define JAVA    0
@@ -61,7 +61,7 @@
 %{?fc4: %{expand: %%define RUBY    1}}
 %{?fc4: %{expand: %%define TCL     1}}
 
-%{?fc5: %{expand: %%define CSHARP  1}}
+%{?fc5: %{expand: %%define SHARP   1}}
 %{?fc5: %{expand: %%define GUILE   1}}
 %{?fc5: %{expand: %%define JAVA    1}}
 %{?fc5: %{expand: %%define LUA     1}}
@@ -130,20 +130,20 @@ of graphs (as in nodes and edges, not as in barcharts).
 %exclude %{_libdir}/%{name}/*/*
 
 #------------------------------------------------------------------
-%if %{CSHARP}
-%package csharp
+%if %{SHARP}
+%package sharp
 Group: Applications/Multimedia
 Summary:       C# extension for %{name}
 Requires:      %{name} = %{version}-%{release}
 
-%description csharp
+%description sharp
 C# extensions for %{name}.
 
-%files csharp
+%files sharp
 %defattr(-,root,root,-)
-%dir %{_libdir}/%{name}/csharp
-%{_libdir}/%{name}/csharp/*
-%exclude %{_libdir}/%{name}/csharp/*.la
+%dir %{_libdir}/%{name}/sharp
+%{_libdir}/%{name}/sharp/*
+%exclude %{_libdir}/%{name}/sharp/*.la
 %endif
 
 #------------------------------------------------------------------

diff --git a/tclpkg/gv/Makefile.am b/tclpkg/gv/Makefile.am
index 995bb01293fe32c92a08dee7a0eb005f6a61f432..ba9fda3d652c9eeacbdcca6ebb9b225fc4aeef6f 100644 (file)
--- a/tclpkg/gv/Makefile.am
+++ b/tclpkg/gv/Makefile.am
@@ -13,13 +13,13 @@ LIBS =  @LIBS@ -lc
 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 SWIGTYPE_p_Agsym_t.cs SWIGTYPE_p_FILE.cs SWIGTYPE_p_p_void.cs
-libgv_csharp_la_SOURCES = $(BASESOURCES) gv_csharp.cpp $(CSHARP_hdr)
-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
+pkgsharpdir = $(pkglibdir)/sharp
+SHARP_hdr = gv.cs gvPINVOKE.cs SWIGTYPE_p_Agraph_t.cs SWIGTYPE_p_Agnode_t.cs SWIGTYPE_p_Agedge_t.cs SWIGTYPE_p_Agsym_t.cs SWIGTYPE_p_FILE.cs SWIGTYPE_p_p_void.cs
+libgv_sharp_la_SOURCES = $(BASESOURCES) gv_sharp.cpp $(SHARP_hdr)
+libgv_sharp_la_LIBADD = $(BASELIBS) @SHARP_LIBS@ 
+libgv_sharp_la_LDFLAGS = -module
+gv_sharp.cpp $(SHARP_hdr): gv.i
+       $(SWIG) -c++ -csharp -namespace gv -o gv_sharp.cpp gv.i
 
 pkgguiledir = $(pkglibdir)/guile
 GUILE_hdr = 
@@ -106,10 +106,10 @@ gv_tcl.cpp $(TCL_hdr): gv.i
 pkginclude_DATA = gv.i gv.cpp
 pkglib_LTLIBRARIES = 
 TESTS =
-if WITH_CSHARP
-pkgcsharp_DATA = $(CSHARP_hdr) gv_csharp.man
-pkgcsharp_LTLIBRARIES = libgv_csharp.la
-TESTS += test_csharp
+if WITH_SHARP
+pkgsharp_DATA = $(SHARP_hdr) gv_sharp.man
+pkgsharp_LTLIBRARIES = libgv_sharp.la
+TESTS += test_sharp
 endif
 if WITH_GUILE
 pkgguile_DATA = $(GUILE_hdr) gv_guile.man
@@ -167,7 +167,7 @@ pkgIndex.tcl: libgv_tcl.la
        sh $(top_srcdir)/tclpkg/mkpkgindex.sh libgv_tcl.la gv $(VERSION)
 endif
 
-gv_csharp.man gv_guile.man gv_io.man gv_java.man gv_lua.man \
+gv_sharp.man gv_guile.man gv_io.man gv_java.man gv_lua.man \
 gv_ocaml.man gv_perl.man gv_php.man gv_python.man gv_ruby.man \
 gv_tcl.man: gv.i gv_doc_writer.tcl gv_doc_template.tcl gv_doc_langs.tcl
        tclsh ./gv_doc_writer.tcl
@@ -188,12 +188,12 @@ uninstall-hook:
 
 test: $(TESTS)
 
-.PHONY: test_csharp
-test_csharp: libgv_csharp.la
-       -(mkdir -p test_csharp; cd test_csharp; \
-               ln -fs ../.libs/libgv_csharp.so libgv_csharp.so; \
+.PHONY: test_sharp
+test_sharp: libgv_sharp.la
+       -(mkdir -p test_sharp; cd test_sharp; \
+               ln -fs ../.libs/libgv_sharp.so libgv_sharp.so; \
                ln -fs ../*.dot ../*.cs .; \
-               $(CSHARP) *.cs -out:test.exe; \
+               $(SHARP) *.cs -out:test.exe; \
                mono test.exe)
 
 .PHONY: test_guile
@@ -271,7 +271,7 @@ test_tcl: libgv_tcl.la
 EXTRA_DIST = demo/* gv.cpp gv.i gv_doc_*.tcl
 
 CLEANFILES = test_*/* gv_*.man \
-       gv_csharp.cpp $(CSHARP_hdr) \
+       gv_sharp.cpp $(SHARP_hdr) \
        gv_guile.cpp $(GUILE_hdr) \
        gv_io.cpp $(IO_hdr) \
        gv_java.cpp $(JAVA_hdr) \

diff --git a/tclpkg/gv/gv_doc_langs.tcl b/tclpkg/gv/gv_doc_langs.tcl
index 1bf2e8f0c4e374e7f06757a3e9b0462925206b2a..26e8706c90e584a9d5322d1ebdc7ab2d128f313d 100644 (file)
--- a/tclpkg/gv/gv_doc_langs.tcl
+++ b/tclpkg/gv/gv_doc_langs.tcl
@@ -1,5 +1,5 @@
 array set LANGS {
-       csharp {
+       sharp {
                TYPES {
                        Agraph_t* SWIGTYPE_p_Agraph_t
                        Agnode_t* SWIGTYPE_p_Agnode_t