[Pkg-ocaml-maint-commits] [SCM] eliom packaging branch, master, updated. debian/2.2.2-1-10-ge585570

[Stephane Glondu]

The following commit has been merged in the master branch:
commit c442bccc6c7a8b84e587bb878ead17f73fe75e34
Merge: 2a7a63322eff3a43d83e5843aa37f772a00e1e5f 071e47175b1033183183dcebb9eb35a14eb79fda
Author: Stephane Glondu <steph at glondu.net>
Date:   Sat Dec 8 09:59:12 2012 +0100

    Merge tag 'upstream/3.0.0'
    
    Upstream version 3.0.0

diff --combined configure
index 469a112,b44ef2c..b44ef2c
mode 100755,100644..100755
--- a/configure
+++ b/configure
@@@ -79,7 -79,6 +79,6 @@@ set_defaults () 
      enable_debug=0
      enable_annot=0
      with_preempt=1
-     with_ocamlduce=1
      root=""
      temproot=""
      prefix="/usr/local"
@@@ -87,6 -86,7 +86,7 @@@
      mandir=""
      libdir=""
      docdir=""
+     datadir=""
  }
  
  set_defaults
@@@ -101,11 -101,10 +101,10 @@@ full_pwd=$(pwd
  ehelp_debug="Enable/disable debug output"
  ehelp_annot="Enable/disable .annot files"
  ehelp_natdynlink="Enable/disable nativecode dynamic linking"
  
  ## Which options exist? eoptions for enable/disable, woptions for with/without:
  eoptions="debug annot natdynlink"
- woptions="ocamlduce preempt"
+ woptions="preempt"
  
  print_options () {
  	for opt in $eoptions; do
@@@ -148,6 -147,11 +147,11 @@@
              *) docdir2=$docdir;;
          esac
  
+         case "$datadir" in
+             "") datadir2="<prefix>/share/\$(PROJECTNAME)";;
+             *) datadir2=$datadir;;
+         esac
+ 
  	echo "    --name $name"
  	echo "    --root $root"
  	echo "    --temproot $temproot"
@@@ -156,6 -160,7 +160,7 @@@
  	echo "    --mandir $mandir2"
  	echo "    --libdir $libdir2"
  	echo "    --docdir $docdir2"
+ 	echo "    --datadir $datadir2"
  }
  
  usage () {
@@@ -168,7 -173,7 +173,7 @@@ usage: ./configure [ options 
    --enable-natdynlink,	--disable-natdynlink	Enable/disable nativecode dynamic linking
  
    --with-preempt,	--without-preempt	compile with preemptive threads support.
-   --with-ocamlduce,	--without-ocamlduce	Compile ocamlduce based libraries.
+ 
  
    --name=NAME		The name of the library and ocamlfind package.
  
@@@ -180,6 -185,7 +185,7 @@@
    --mandir=DIR		Install manpages into this directory
    --libdir=DIR		Common directory for Ocsigen server's libraries
    --docdir=DIR		Install documentation in this directory
+   --datadir=DIR		Install additional data files in this directory
  
  Defaults are:
  
@@@ -279,6 -285,11 +285,11 @@@ while [ "$#" -gt 0 ]; d
  			shift
  			shift
  			;;
+                 --datadir)
+                         datadir="$2"
+                         shift
+                         shift
+                         ;;
  		*)
                          echo "Unknown option: $1" >&2
  			usage
@@@ -302,6 -313,10 +313,10 @@@ case "$docdir" i
    "") docdir="$prefix/share/doc/\$(PROJECTNAME)";;
  esac
  
+ case "$datadir" in
+   "") datadir="$prefix/share/\$(PROJECTNAME)";;
+ esac
+ 
  
  check_binary ocamlc "See: http://www.ocaml.org/"
  
@@@ -358,21 -373,6 +373,6 @@@ check_library lwt.react "Missing suppor
  check_library calendar "See: http://calendar.forge.ocamlcore.org/"
  check_library cryptokit "See: http://pauillac.inria.fr/~xleroy/software.html#cryptokit"
  
- # Check ocamlduce
- if [ "$with_ocamlduce" -gt 0 ]; then
-     if test_binary ocamlduce; then
- 	echo -n
-     elif [ "$with_ocamlduce" -gt 1 ]; then
- 	fail_binary ocamlduce "http://ocamlduce.forge.ocamlcore.org/"
-     else
-         with_ocamlduce=0
-     fi
- fi
- 
- if [ "$with_ocamlduce" -gt 0 ]; then
-     check_library tyxml.duce "Missing support for 'ocamlduce' in tyxml."
- fi
- 
  ######################################################################
  # Summary
  
@@@ -397,11 -397,6 +397,6 @@@ if [ $enable_natdynlink -gt 0 ] ; the
  else
  	enable_natdynlink="NO"
  fi
- if [ $with_ocamlduce -gt 0 ] ; then
- 	with_ocamlduce="YES"
- else
- 	with_ocamlduce="NO"
- fi
  if [ $with_preempt -gt 0 ] ; then
  	with_preempt="YES"
  else
@@@ -425,17 -420,11 +420,11 @@@ JS_OF_OCAML := js_of_ocam
  CC          := gcc
  INSTALL     := install
  
- # optionnal
- OCAMLDUCEFIND := ocamlducefind
  
  
  
  ### Options ###
  
- # Do you want the ocamlduce extension? YES/NO
- # (You need ocamlduce to be installed)
- OCAMLDUCE:=$with_ocamlduce
- 
  # Do you want preemptive threads ? YES/NO
  PREEMPTIVE:=$with_preempt
  
@@@ -470,6 -459,9 +459,9 @@@ LIBDIR := $libdi
  # Where to put Eliom documentation:
  DOCDIR := $root$docdir
  
+ # Where to install additional data:
+ DATADIR := $datadir
+ 
  # The source directory (needed for local testing)
  SRC := $full_pwd
  
@@@ -499,4 -491,3 +491,3 @@@ ech
  echo "   make install"
  echo "   make install.doc"
  echo
- 

-- 
eliom packaging