Remove unecessary quote characters in the cc info files (were required by

configure.pl, but configure.py's parser is smart enough to deal with them
with or without quotes).

Add support for shared library generation with IBM xlC (untested).

Drop bcc - this was for the Borland's old compiler and almost certainly is
not right for the current Embarcadero C++Builder. Support for that should
be added (though I don't have access to this compiler personally).

15 files changed, 80 insertions, 107 deletions

diff --git a/src/build-data/cc/bcc.txt b/src/build-data/cc/bcc.txt
deleted file mode 100644
index 4315c379f..000000000
--- a/src/build-data/cc/bcc.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-macro_name "BORLAND"
-
-binary_name "bcc32"
-
-compile_option "-c "
-output_to_option "-o "
-add_include_dir_option "-I"
-add_lib_dir_option "-L"
-add_lib_option "-l"
-
-lib_opt_flags "-O2"
-check_opt_flags "-O2"
-debug_flags ""
-no_debug_flags ""
-lang_flags "-tWR -tWM -tWC"
-warning_flags "-w"
-
-dll_import_flags ""
-dll_export_flags ""
-
-ar_command "tlib /C /P256"
-
-makefile_style nmake
-
-<mach_opt>
-i486     -> "/G4"
-i586     -> "/G5"
-i686     -> "/G6"
-athlon   -> "/G6"
-pentium4 -> "/G6"
-</mach_opt>
diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt
index 18f3580ce..cb86a892f 100644
--- a/src/build-data/cc/clang.txt
+++ b/src/build-data/cc/clang.txt
@@ -1,14 +1,14 @@
 # Largely copied from the gcc config
 
-macro_name "CLANG"
+macro_name CLANG
 
 binary_name clang
 
 compile_option "-c "
 output_to_option "-o "
-add_include_dir_option "-I"
-add_lib_dir_option "-L"
-add_lib_option "-l"
+add_include_dir_option -I
+add_lib_dir_option -L
+add_lib_option -l
 
 lang_flags "-D_REENTRANT -ansi -Wno-long-long"
 warning_flags "-W -Wall"
@@ -18,7 +18,7 @@ makefile_style unix
 lib_opt_flags "-O2"
 check_opt_flags "-O2"
 shared_flags "-fPIC"
-debug_flags "-g"
+debug_flags -g
 no_debug_flags "-finline-functions"
 
 <so_link_flags>
diff --git a/src/build-data/cc/compaq.txt b/src/build-data/cc/compaq.txt
index 9ad6514ab..b5a080ae9 100644
--- a/src/build-data/cc/compaq.txt
+++ b/src/build-data/cc/compaq.txt
@@ -1,17 +1,17 @@
-macro_name "COMPAQ"
+macro_name COMPAQ
 
-binary_name "cxx"
+binary_name cxx
 
 compile_option "-c "
 output_to_option "-o "
-add_include_dir_option "-I"
-add_lib_dir_option "-L"
-add_lib_option "-l"
+add_include_dir_option -I
+add_lib_dir_option -L
+add_lib_option -l
 
 # -O3 and up seem to be unhappy with Botan
 lib_opt_flags "-O2"
 check_opt_flags "-O2"
-debug_flags "-g"
+debug_flags -g
 no_debug_flags ""
 lang_flags "-std ansi -D__USE_STD_IOSTREAM"
 
diff --git a/src/build-data/cc/ekopath.txt b/src/build-data/cc/ekopath.txt
index ecd813629..bff1ff460 100644
--- a/src/build-data/cc/ekopath.txt
+++ b/src/build-data/cc/ekopath.txt
@@ -1,12 +1,12 @@
-macro_name "PATHSCALE"
+macro_name PATHSCALE
 
-binary_name "pathCC"
+binary_name pathCC
 
 compile_option "-c "
 output_to_option "-o "
-add_include_dir_option "-I"
-add_lib_dir_option "-L"
-add_lib_option "-l"
+add_include_dir_option -I
+add_lib_dir_option -L
+add_lib_option -l
 
 lib_opt_flags "-O3 -OPT:Ofast:alias=disjoint"
 check_opt_flags "-O2"
@@ -16,7 +16,7 @@ warning_flags "-W -Wall"
 ar_command "pathCC -ar -o"
 
 shared_flags "-fPIC"
-debug_flags "-g"
+debug_flags -g
 
 dll_import_flags ""
 dll_export_flags ""
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt
index 3cb287f70..f0806fe7a 100644
--- a/src/build-data/cc/gcc.txt
+++ b/src/build-data/cc/gcc.txt
@@ -1,14 +1,14 @@
-macro_name "GCC"
+macro_name GCC
 
-binary_name "g++"
+binary_name g++
 
 compiler_has_tr1 yes
 
 compile_option "-c "
 output_to_option "-o "
-add_include_dir_option "-I"
-add_lib_dir_option "-L"
-add_lib_option "-l"
+add_include_dir_option -I
+add_lib_dir_option -L
+add_lib_option -l
 
 lang_flags "-D_REENTRANT -ansi -Wno-long-long"
 warning_flags "-W -Wall"
@@ -17,7 +17,7 @@ warning_flags "-W -Wall"
 lib_opt_flags "-O3"
 check_opt_flags "-O2"
 shared_flags "-fPIC"
-debug_flags "-g"
+debug_flags -g
 no_debug_flags "-finline-functions"
 
 dll_import_flags ""
diff --git a/src/build-data/cc/hpcc.txt b/src/build-data/cc/hpcc.txt
index 5bde87de9..614830f9e 100644
--- a/src/build-data/cc/hpcc.txt
+++ b/src/build-data/cc/hpcc.txt
@@ -1,16 +1,16 @@
-macro_name "HP_ACC"
+macro_name HP_ACC
 
-binary_name "aCC"
+binary_name aCC
 
 compile_option "-c "
 output_to_option "-o "
-add_include_dir_option "-I"
-add_lib_dir_option "-L"
-add_lib_option "-l"
+add_include_dir_option -I
+add_lib_dir_option -L
+add_lib_option -l
 
 lib_opt_flags "+O2"
 check_opt_flags "+O2"
-debug_flags "-g"
+debug_flags -g
 no_debug_flags ""
 lang_flags "-AA -ext +eh -z"
 warning_flags "" # +w
diff --git a/src/build-data/cc/icc.txt b/src/build-data/cc/icc.txt
index b5cad542c..10e689e1a 100644
--- a/src/build-data/cc/icc.txt
+++ b/src/build-data/cc/icc.txt
@@ -1,18 +1,18 @@
-macro_name "INTEL"
+macro_name INTEL
 
-binary_name "icpc"
+binary_name icpc
 
 compiler_has_tr1 yes
 
 compile_option "-c "
 output_to_option "-o "
-add_include_dir_option "-I"
-add_lib_dir_option "-L"
-add_lib_option "-l"
+add_include_dir_option -I
+add_lib_dir_option -L
+add_lib_option -l
 
 lib_opt_flags "-O2 -ip -unroll"
 check_opt_flags "-O2"
-debug_flags "-g"
+debug_flags -g
 no_debug_flags "-fomit-frame-pointer"
 lang_flags ""
 warning_flags "-w1"
diff --git a/src/build-data/cc/kai.txt b/src/build-data/cc/kai.txt
index d0ff1c28a..52fb7c5e1 100644
--- a/src/build-data/cc/kai.txt
+++ b/src/build-data/cc/kai.txt
@@ -1,19 +1,19 @@
-macro_name "KAI"
+macro_name KAI
 
-binary_name "KCC"
+binary_name KCC
 
 compile_option "-c "
 output_to_option "-o "
-add_include_dir_option "-I"
-add_lib_dir_option "-L"
-add_lib_option "-l"
+add_include_dir_option -I
+add_lib_dir_option -L
+add_lib_option -l
 
 ar_command "KCC -o"
 
 lib_opt_flags "+K3 --inline_auto_space_time=65 --abstract_pointer"
 check_opt_flags "+K3"
 lang_flags "-D__KAI_STRICT"
-debug_flags "-g"
+debug_flags -g
 no_debug_flags ""
 
 dll_import_flags ""
diff --git a/src/build-data/cc/mipspro.txt b/src/build-data/cc/mipspro.txt
index c518f4c26..2de03938a 100644
--- a/src/build-data/cc/mipspro.txt
+++ b/src/build-data/cc/mipspro.txt
@@ -1,12 +1,12 @@
-macro_name "MIPSPRO"
+macro_name MIPSPRO
 
-binary_name "CC"
+binary_name CC
 
 compile_option "-c "
 output_to_option "-o "
-add_include_dir_option "-I"
-add_lib_dir_option "-L"
-add_lib_option "-l"
+add_include_dir_option -I
+add_lib_dir_option -L
+add_lib_option -l
 
 lib_opt_flags "-O3 -OPT:alias=TYPED"
 check_opt_flags "-O3 -OPT:alias=TYPED"
diff --git a/src/build-data/cc/msvc.txt b/src/build-data/cc/msvc.txt
index 603ea449b..805093ce5 100644
--- a/src/build-data/cc/msvc.txt
+++ b/src/build-data/cc/msvc.txt
@@ -1,11 +1,11 @@
-macro_name "MSVC"
+macro_name MSVC
 
-binary_name "cl.exe"
+binary_name cl.exe
 
 compile_option "/nologo /c "
 output_to_option "/Fo"
 add_include_dir_option "/I"
-add_lib_dir_option "-L"
+add_lib_dir_option -L
 add_lib_option ""
 
 lib_opt_flags "/O2"
diff --git a/src/build-data/cc/open64.txt b/src/build-data/cc/open64.txt
index e794c755e..275d25f72 100644
--- a/src/build-data/cc/open64.txt
+++ b/src/build-data/cc/open64.txt
@@ -1,12 +1,12 @@
-macro_name "OPEN64"
+macro_name OPEN64
 
-binary_name "openCC"
+binary_name openCC
 
 compile_option "-c "
 output_to_option "-o "
-add_include_dir_option "-I"
-add_lib_dir_option "-L"
-add_lib_option "-l"
+add_include_dir_option -I
+add_lib_dir_option -L
+add_lib_option -l
 
 lib_opt_flags "-O3 -OPT:alias=TYPED"
 check_opt_flags "-O3 -OPT:alias=TYPED"
diff --git a/src/build-data/cc/pgi.txt b/src/build-data/cc/pgi.txt
index a6d2416ab..99f7bcea5 100644
--- a/src/build-data/cc/pgi.txt
+++ b/src/build-data/cc/pgi.txt
@@ -1,12 +1,12 @@
-macro_name "PORTLAND_GROUP"
+macro_name PORTLAND_GROUP
 
-binary_name "pgCC"
+binary_name pgCC
 
 compile_option "-c "
 output_to_option "-o "
-add_include_dir_option "-I"
-add_lib_dir_option "-L"
-add_lib_option "-l"
+add_include_dir_option -I
+add_lib_dir_option -L
+add_lib_option -l
 
 lib_opt_flags "-fast -Minline"
 check_opt_flags "-fast"
diff --git a/src/build-data/cc/sgipro64.txt b/src/build-data/cc/sgipro64.txt
index 073f2fec0..a359ef5ae 100644
--- a/src/build-data/cc/sgipro64.txt
+++ b/src/build-data/cc/sgipro64.txt
@@ -1,12 +1,12 @@
-macro_name "SGI_PRO64"
+macro_name SGI_PRO64
 
-binary_name "sgiCC"
+binary_name sgiCC
 
 compile_option "-c "
 output_to_option "-o "
-add_include_dir_option "-I"
-add_lib_dir_option "-L"
-add_lib_option "-l"
+add_include_dir_option -I
+add_lib_dir_option -L
+add_lib_option -l
 
 lib_opt_flags "-O3 -OPT:alias=TYPED"
 check_opt_flags "-O3 -OPT:alias=TYPED"
diff --git a/src/build-data/cc/sunwspro.txt b/src/build-data/cc/sunwspro.txt
index 7065d4129..ee41ebeca 100644
--- a/src/build-data/cc/sunwspro.txt
+++ b/src/build-data/cc/sunwspro.txt
@@ -1,18 +1,18 @@
-macro_name "SUN_WORKSHOP"
+macro_name SUN_WORKSHOP
 
-binary_name "CC"
+binary_name CC
 
 compile_option "-c "
 output_to_option "-o "
-add_include_dir_option "-I"
-add_lib_dir_option "-L"
-add_lib_option "-l"
+add_include_dir_option -I
+add_lib_dir_option -L
+add_lib_option -l
 
 # The compiler supports up to -xO5, but anything higher than -xO2 causes
 # incorrect results, infinite loops, other badness. :(
 lib_opt_flags "-xO2"
 check_opt_flags "-xO2"
-debug_flags "-g"
+debug_flags -g
 no_debug_flags ""
 shared_flags "-KPIC"
 warning_flags "+w"
diff --git a/src/build-data/cc/xlc.txt b/src/build-data/cc/xlc.txt
index 521624395..e9ae41c1a 100644
--- a/src/build-data/cc/xlc.txt
+++ b/src/build-data/cc/xlc.txt
@@ -1,17 +1,17 @@
-macro_name "IBM_XLC"
+macro_name IBM_XLC
 
-binary_name "xlC"
+binary_name xlC
 
 compile_option "-c "
 output_to_option "-o "
-add_include_dir_option "-I"
-add_lib_dir_option "-L"
-add_lib_option "-l"
+add_include_dir_option -I
+add_lib_dir_option -L
+add_lib_option -l
 
 lib_opt_flags "-O2"
 check_opt_flags "-O2"
 lang_flags ""
-debug_flags "-g"
+debug_flags -g
 no_debug_flags ""
 
 dll_import_flags ""
@@ -27,3 +27,7 @@ power5   -> "-qarch=pwr5"
 
 cellppu   -> "-qarch=cell"
 </mach_opt>
+
+<so_link_flags>
+default -> "$(CXX) -qmkshrobj"
+</so_link_flags>