Add --cc and --cxx options to fltk-config, which show the compilers that

were used to compile FLTK...


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4488 ea41ed52-d2ee-0310-a9c1-e6b18d33e121

3 files changed, 20 insertions, 2 deletions

diff --git a/CHANGES b/CHANGES
index 7ff29a1cc..8dda331d7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,9 @@ CHANGES IN FLTK 1.1.7
 	- Documentation fixes (STR #571, STR #648, STR #692, STR
 	  #730, STR #744, STR #745, STR #931, STR #942, STR #960,
 	  STR #969)
+	- The fltk-config utility now supports "--cc" and "--cxx"
+	  options to get the C and C++ compilers that were used
+	  to compile FLTK (STR #868)
 	- Fl_Valuator-derived widgets could show more digits than
 	  were necessary (STR #971)
 	- Fl_GIF_Image did not handle images with an incorrect
diff --git a/documentation/fltk-config.man b/documentation/fltk-config.man
index 9a19f8cd4..423e7538a 100644
--- a/documentation/fltk-config.man
+++ b/documentation/fltk-config.man
@@ -1,4 +1,4 @@
-.TH fltk-config 1 "Fast Light Tool Kit" "24 April 2002"
+.TH fltk-config 1 "Fast Light Tool Kit" "8 August 2005"
 .SH NAME
 fltk-config \- script to get information about the installed version of fltk.
 .sp
@@ -8,6 +8,7 @@ fltk-config [ --prefix
 ] [ --exec-prefix
 .I [=DIR]
 ] [ --version ] [ --api-version ] [ --use-gl ] [ --use-images ] [ --use-glut ]
+[ --cc ] [ --cxx ]
 [ --cflags ] [ --cxxflags ] [ --ldflags ] [ --ldstaticflags ] [ --libs ]
 [ -g ] [ --compile
 .I program.cxx
@@ -26,6 +27,12 @@ The following options are supported:
 .br
 Displays the current FLTK API version number, e.g. "1.1".
 .TP 5
+--cc
+.TP 5
+--cxx
+.br
+Displays the C/C++ compiler that was used to compile FLTK.
+.TP 5
 --cflags
 .TP 5
 --cxxflags
diff --git a/fltk-config.in b/fltk-config.in
index 92aa6760f..c714943ef 100755
--- a/fltk-config.in
+++ b/fltk-config.in
@@ -51,8 +51,8 @@ libdir=@libdir@
 srcdir=@srcdir@
 
 # compiler names
-CXX="@CXX@"
 CC="@CC@"
+CXX="@CXX@"
 
 # post-process command (only needed for MacOS)
 POSTBUILD="@POSTBUILD@"
@@ -111,6 +111,8 @@ Options telling what we are doing:
 	[--use-forms]     use forms compatibility layer
 
 Options telling what information we request:
+	[--cc]            return C compiler used to compile FLTK
+	[--cxx]           return C++ compiler used to compile FLTK
 	[--cflags]        return flags to compile C using FLTK
 	[--cxxflags]      return flags to compile C++ using FLTK
 	[--ldflags]       return flags to link against FLTK
@@ -154,6 +156,12 @@ do
 	--api-version)
 	    echo $APIVERSION
 	    ;;
+	--cc)
+	    echo $CC
+	    ;;
+	--cxx)
+	    echo $CXX
+	    ;;
 	--use-gl | --use-glut)
 	    use_gl=yes
 	    ;;