Clean up configure script a little, update default man page

directory...


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

1 files changed, 25 insertions, 22 deletions

diff --git a/configure.in b/configure.in
index cffd81a3a..7f3743d04 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 dnl -*- sh -*-
 dnl the "configure" script is made from this by running GNU "autoconf"
 dnl
-dnl "$Id: configure.in,v 1.33.2.31.2.16 2001/10/25 17:25:11 easysw Exp $"
+dnl "$Id: configure.in,v 1.33.2.31.2.17 2001/11/01 14:54:06 easysw Exp $"
 dnl
 dnl Configuration script for the Fast Light Tool Kit (FLTK).
 dnl
@@ -306,7 +306,7 @@ AC_SUBST(CAT3EXT)
 dnl Fix "mandir" variable...
 if test "$mandir" = "\${prefix}/man" -a "$prefix" = "/usr"; then
 	case "$uname" in
-        	FreeBSD* | NetBSD* | OpenBSD* | Linux*)
+        	*BSD* | Darwin* | Linux*)
         		# *BSD
         		mandir="\${prefix}/share/man"
         		;;
@@ -335,28 +335,31 @@ dnl do this last so messing with switches does not break tests
 MAKEDEPEND="\$(CXX) -M"
 
 if test -n "$GXX"; then
-    # Starting with GCC 3.0, the brainiacs in the GCC team decided
-    # that all C++ programs should depend on libstdc++.  Not only
-    # is this not necessary, but it *prevents* binary compatibility
-    # between different distributions of Linux (and even on other
-    # OS's that normally don't include the GCC version of libstdc++...)
+    # Starting with GCC 3.0, you must link C++ programs against either
+    # libstdc++ (shared by default), or libsupc++ (always static).  If
+    # you care about binary portability between Linux distributions,
+    # you need to either 1) build your own GCC with static C++ libraries
+    # or 2) link using gcc and libsupc++.  We choose the latter since
+    # FLTK doesn't (currently) use any of the stdc++ library.
     #
     # Also, GCC 3.0.x still has problems compiling some code.  You may
     # or may not have success with it.  USE 3.0.x WITH EXTREME CAUTION!
     #
-    # The following check uses "gcc" instead of "c++" or "g++"
-    # when compiling with older versions of GCC which don't have
-    # this ridiculous reliance on libstdc++.
+    # Previous versions of GCC do not have the reliance on the stdc++
+    # or g++ libraries, so the extra supc++ library is not needed.
 
     case "`$CXX --version`" in
     	3*)
-	    AC_MSG_WARN(GCC 3.x may not work properly and introduces unnecessary dependencies on libstdc++!)
+	    AC_MSG_WARN(GCC 3.0.x is known to produce incorrect code - use with caution!)
+	    LIBS="$LIBS -lsupc++"
 	    ;;
-	*)
-	    CXX="$CC"
+    	3.1*)
+	    LIBS="$LIBS -lsupc++"
 	    ;;
     esac
 
+    CXX="$CC"
+
     CFLAGS="-Wall $CFLAGS"
     CXXFLAGS="-Wall $CXXFLAGS"
     if test -z "$DEBUGFLAG"; then
@@ -377,26 +380,26 @@ if test -n "$GXX"; then
     fi
 
     # See if GCC supports -fno-exceptions...
-    AC_MSG_CHECKING(Testing if GCC supports -fno-exceptions...)
+    AC_MSG_CHECKING(Checking if GCC supports -fno-exceptions)
     OLDCFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -fno-exceptions"
     AC_TRY_COMPILE(,,
-	CXXFLAGS="$CXXFLAGS -fno-exceptions"
-	AC_MSG_RESULT(yes; disabling them for FLTK...),
-	CFLAGS="$OLDCFLAGS"
+	OPTIM="$OPTIM -fno-exceptions"
+	AC_MSG_RESULT(yes),
 	AC_MSG_RESULT(no))
+    CFLAGS="$OLDCFLAGS"
 
     # See if we are running Solaris; if so, try the -fpermissive option...
-    if test $uname = SunOS; then
-	AC_MSG_CHECKING(Testing if GCC supports -fpermissive...)
+    if test "$uname" = SunOS; then
+	AC_MSG_CHECKING(Checking if GCC supports -fpermissive)
 
 	OLDCFLAGS="$CFLAGS"
 	CFLAGS="$CFLAGS -fpermissive"
 	AC_TRY_COMPILE(,,
-	    CXXFLAGS="$CXXFLAGS -fpermissive"
+	    OPTIM="$OPTIM -fpermissive"
 	    AC_MSG_RESULT(yes),
-	    CFLAGS="$OLDCFLAGS"
 	    AC_MSG_RESULT(no))
+	CFLAGS="$OLDCFLAGS"
     fi
 else
     case `(uname) 2>/dev/null` in
@@ -491,5 +494,5 @@ AC_OUTPUT(makeinclude fltk-config)
 chmod +x fltk-config
 
 dnl
-dnl End of "$Id: configure.in,v 1.33.2.31.2.16 2001/10/25 17:25:11 easysw Exp $".
+dnl End of "$Id: configure.in,v 1.33.2.31.2.17 2001/11/01 14:54:06 easysw Exp $".
 dnl