summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Doligez <damien.doligez-inria.fr>1999-12-09 18:53:52 +0000
committerDamien Doligez <damien.doligez-inria.fr>1999-12-09 18:53:52 +0000
commite6343bfb447c8fb170981d46b5debb7855d95e47 (patch)
tree625b95eccbdc9f13100bb22bb3effb3cdaecd221
parentb328a6a414a78c8c38ad2fac971f4d66b20c4995 (diff)
passage des fichiers de config sous LGPL
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2683 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--LICENSE2
-rw-r--r--config/Makefile-templ2
-rw-r--r--config/Makefile.nt2
-rw-r--r--config/auto-aux/align.c2
-rw-r--r--config/auto-aux/ansi.c2
-rw-r--r--config/auto-aux/async_io.c2
-rw-r--r--config/auto-aux/bytecopy.c2
-rw-r--r--config/auto-aux/dblalign.c2
-rw-r--r--config/auto-aux/elf.c2
-rw-r--r--config/auto-aux/endian.c2
-rw-r--r--config/auto-aux/getgroups.c2
-rw-r--r--config/auto-aux/schar.c2
-rw-r--r--config/auto-aux/schar2.c2
-rw-r--r--config/auto-aux/sighandler.c2
-rw-r--r--config/auto-aux/signals.c2
-rw-r--r--config/auto-aux/sizes.c2
-rw-r--r--config/config.Mac4
-rw-r--r--config/m-nt.h2
-rw-r--r--config/m-templ.h2
-rw-r--r--config/s-nt.h2
-rw-r--r--config/s-templ.h2
-rw-r--r--config/sm-Mac.h2
-rwxr-xr-xconfigure42
23 files changed, 45 insertions, 43 deletions
diff --git a/LICENSE b/LICENSE
index dfcebc3e1..9245f6279 100644
--- a/LICENSE
+++ b/LICENSE
@@ -2,7 +2,7 @@ All files marked "Copyright INRIA" in the following directories and
their sub-directories are distributed under the terms of the GNU
Library General Public License (included below):
- asmrun, byterun, maccaml, otherlibs, stdlib
+ asmrun, byterun, config, maccaml, otherlibs, stdlib
All files marked "Copyright INRIA" in the other directories and their
sub-directories are distributed under the terms of the Q Public
diff --git a/config/Makefile-templ b/config/Makefile-templ
index 9c93f3f49..e928e4da0 100644
--- a/config/Makefile-templ
+++ b/config/Makefile-templ
@@ -6,7 +6,7 @@
# #
# Copyright 1999 Institut National de Recherche en Informatique et #
# en Automatique. All rights reserved. This file is distributed #
-# under the terms of the Q Public License version 1.0. #
+# under the terms of the GNU Library General Public License. #
# #
#########################################################################
diff --git a/config/Makefile.nt b/config/Makefile.nt
index 79b5d82c8..e27ae9366 100644
--- a/config/Makefile.nt
+++ b/config/Makefile.nt
@@ -6,7 +6,7 @@
# #
# Copyright 1999 Institut National de Recherche en Informatique et #
# en Automatique. All rights reserved. This file is distributed #
-# under the terms of the Q Public License version 1.0. #
+# under the terms of the GNU Library General Public License. #
# #
#########################################################################
diff --git a/config/auto-aux/align.c b/config/auto-aux/align.c
index 3c35817c6..6cebc7609 100644
--- a/config/auto-aux/align.c
+++ b/config/auto-aux/align.c
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/auto-aux/ansi.c b/config/auto-aux/ansi.c
index 773748b10..fd86c6055 100644
--- a/config/auto-aux/ansi.c
+++ b/config/auto-aux/ansi.c
@@ -6,7 +6,7 @@
/* */
/* Copyright 1997 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/auto-aux/async_io.c b/config/auto-aux/async_io.c
index 7bfc24286..8cf2f7446 100644
--- a/config/auto-aux/async_io.c
+++ b/config/auto-aux/async_io.c
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/auto-aux/bytecopy.c b/config/auto-aux/bytecopy.c
index e5edfc5a6..029c2a8eb 100644
--- a/config/auto-aux/bytecopy.c
+++ b/config/auto-aux/bytecopy.c
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/auto-aux/dblalign.c b/config/auto-aux/dblalign.c
index f883dde50..7ea78bd83 100644
--- a/config/auto-aux/dblalign.c
+++ b/config/auto-aux/dblalign.c
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/auto-aux/elf.c b/config/auto-aux/elf.c
index 68110f7bd..222cbb8ca 100644
--- a/config/auto-aux/elf.c
+++ b/config/auto-aux/elf.c
@@ -6,7 +6,7 @@
/* */
/* Copyright 1999 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/auto-aux/endian.c b/config/auto-aux/endian.c
index b95ca8f71..7af0f997b 100644
--- a/config/auto-aux/endian.c
+++ b/config/auto-aux/endian.c
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/auto-aux/getgroups.c b/config/auto-aux/getgroups.c
index d81ecf71f..850403b78 100644
--- a/config/auto-aux/getgroups.c
+++ b/config/auto-aux/getgroups.c
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/auto-aux/schar.c b/config/auto-aux/schar.c
index bed3e7b39..412ae7dc9 100644
--- a/config/auto-aux/schar.c
+++ b/config/auto-aux/schar.c
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/auto-aux/schar2.c b/config/auto-aux/schar2.c
index 1cf309176..d6bbf65ba 100644
--- a/config/auto-aux/schar2.c
+++ b/config/auto-aux/schar2.c
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/auto-aux/sighandler.c b/config/auto-aux/sighandler.c
index 66af63c8b..417edaa80 100644
--- a/config/auto-aux/sighandler.c
+++ b/config/auto-aux/sighandler.c
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/auto-aux/signals.c b/config/auto-aux/signals.c
index c9d82524d..07aaa816b 100644
--- a/config/auto-aux/signals.c
+++ b/config/auto-aux/signals.c
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/auto-aux/sizes.c b/config/auto-aux/sizes.c
index 73a8491e1..a35c97444 100644
--- a/config/auto-aux/sizes.c
+++ b/config/auto-aux/sizes.c
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/config.Mac b/config/config.Mac
index 5a7c79266..2d0745b1e 100644
--- a/config/config.Mac
+++ b/config/config.Mac
@@ -6,7 +6,7 @@
# #
# Copyright 1999 Institut National de Recherche en Informatique et #
# en Automatique. All rights reserved. This file is distributed #
-# under the terms of the Q Public License version 1.0. #
+# under the terms of the GNU Library General Public License. #
# #
#########################################################################
@@ -53,7 +53,7 @@ set -e NATIVECC MrC
############# Version numbers (do not change)
set -e OCAMLMAJOR 2
-set -e OCAMLMINOR 03
+set -e OCAMLMINOR 04
set -e MAJOR 1
set -e MINOR 0
set -e STAGE a
diff --git a/config/m-nt.h b/config/m-nt.h
index ef6c34917..fc8cbc1f5 100644
--- a/config/m-nt.h
+++ b/config/m-nt.h
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/m-templ.h b/config/m-templ.h
index 045a8ebb8..c54dd1c4f 100644
--- a/config/m-templ.h
+++ b/config/m-templ.h
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/s-nt.h b/config/s-nt.h
index 7c88bad21..ebf078ec0 100644
--- a/config/s-nt.h
+++ b/config/s-nt.h
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/s-templ.h b/config/s-templ.h
index d4c409d47..7b0635b43 100644
--- a/config/s-templ.h
+++ b/config/s-templ.h
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/config/sm-Mac.h b/config/sm-Mac.h
index f8189d946..e9e6bb98c 100644
--- a/config/sm-Mac.h
+++ b/config/sm-Mac.h
@@ -6,7 +6,7 @@
/* */
/* Copyright 1996 Institut National de Recherche en Informatique et */
/* en Automatique. All rights reserved. This file is distributed */
-/* under the terms of the Q Public License version 1.0. */
+/* under the terms of the GNU Library General Public License. */
/* */
/***********************************************************************/
diff --git a/configure b/configure
index 6065a012d..0e467e446 100755
--- a/configure
+++ b/configure
@@ -1,16 +1,16 @@
#! /bin/sh
-#*********************************************************************#
-# #
-# Objective Caml #
-# #
-# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
-# #
-# Copyright 1995 Institut National de Recherche en Informatique et #
-# en Automatique. All rights reserved. This file is distributed #
-# under the terms of the Q Public License version 1.0. #
-# #
-#*********************************************************************#
+#########################################################################
+# #
+# Objective Caml #
+# #
+# Xavier Leroy, projet Cristal, INRIA Rocquencourt #
+# #
+# Copyright 1999 Institut National de Recherche en Informatique et #
+# en Automatique. All rights reserved. This file is distributed #
+# under the terms of the GNU Library General Public License. #
+# #
+#########################################################################
# $Id$
@@ -30,6 +30,8 @@ tk_libs=''
posix_threads=no
verbose=no
+gcc_warnings="-Wall -Wno-unused"
+
# Parse command-line arguments
while : ; do
@@ -175,22 +177,22 @@ bytecclinkopts=""
case "$bytecc,$host" in
cc,*-*-nextstep*)
# GNU C extensions disabled, but __GNUC__ still defined!
- bytecccompopts="-fno-defer-pop -Wall -U__GNUC__ -posix"
+ bytecccompopts="-fno-defer-pop $gcc_warnings -U__GNUC__ -posix"
bytecclinkopts="-posix";;
cc,*-*-rhapsody*)
# Almost the same as NeXTStep
- bytecccompopts="-fno-defer-pop -Wall -DSHRINKED_GNUC"
+ bytecccompopts="-fno-defer-pop $gcc_warnings -DSHRINKED_GNUC"
mathlib="";;
*,*-*-beos*)
- bytecccompopts="-fno-defer-pop -Wall"
+ bytecccompopts="-fno-defer-pop $gcc_warnings"
# No -lm library
mathlib="";;
gcc,alpha-*-osf*)
- bytecccompopts="-fno-defer-pop -Wall"
+ bytecccompopts="-fno-defer-pop $gcc_warnings"
# -taso puts code in lower 4GB
bytecclinkopts="-Xlinker -taso";;
gcc*)
- bytecccompopts="-fno-defer-pop -Wall";;
+ bytecccompopts="-fno-defer-pop $gcc_warnings";;
cc,mips-*-irix6*)
# Add -n32 flag to ensure compatibility with native-code compiler
bytecccompopts="-n32"
@@ -334,10 +336,10 @@ case "$arch,$nativecc,$system" in
alpha,cc*,digital) nativecccompopts=-std1;;
mips,cc*,irix) nativecccompopts=-n32
nativecclinkopts="-n32 -Wl,-woff,84";;
- *,*,nextstep) nativecccompopts="-Wall -U__GNUC__ -posix"
+ *,*,nextstep) nativecccompopts="$gcc_warnings -U__GNUC__ -posix"
nativecclinkopts="-posix";;
- *,*,rhapsody) nativecccompopts="-Wall -DSHRINKED_GNUC";;
- *,gcc*,*) nativecccompopts=-Wall;;
+ *,*,rhapsody) nativecccompopts="$gcc_warnings -DSHRINKED_GNUC";;
+ *,gcc*,*) nativecccompopts="$gcc_warnings";;
esac
asflags=''
@@ -941,4 +943,4 @@ echo " options for compiling .... $tk_defs"
echo " options for linking ...... $tk_libs"
else
echo "The \"labltk\" library: configuration failed"
-fi \ No newline at end of file
+fi