Install debug libraries only if -debug is passed to ./configure.

Strip non-debug libraries.

Makefile

@@ -78,8 +78,10 @@ apronglpktop:
 rebuild:
 	@echo "$(MAKE) rebuild is no longer necessary"
 
-OCAMLFIND_PROTO = xxx.cma $(call OCAMLOPT_TARGETS, xxx) libxxx_caml.a	\
-		  libxxx_caml_debug.a
+OCAMLFIND_PROTO = xxx.cma $(call OCAMLOPT_TARGETS, xxx) libxxx_caml.a
+ifneq ($(HAS_DEBUG),)
+OCAMLFIND_PROTO += $(call OCAMLOPT_TARGETS, xxx.d)  libxxx_caml_debug.a
+endif
 ifneq ($(HAS_SHARED),)
 OCAMLFIND_PROTO += dllxxx_caml.$(EXT_DLL)
 endif
@@ -111,13 +113,13 @@ disjunction) \
 
 ifneq ($(HAS_PPL),)
 OCAMLFIND_FILES += \
-	$(patsubst %,ppl/%, ppl.idl ppl.mli ppl.cmi ppl.cma ppl.cmx $(call OCAMLOPT_TARGETS, ppl) libap_ppl_caml.a libap_ppl_caml_debug.a dllap_ppl_caml.$(EXT_DLL)) \
+	$(patsubst %,ppl/%, ppl.idl ppl.mli ppl.cmi ppl.cma ppl.cmx $(call OCAMLOPT_TARGETS, ppl) libap_ppl_caml.a dllap_ppl_caml.$(EXT_DLL)) \
 	$(patsubst %,products/%, polkaGrid.idl polkaGrid.mli polkaGrid.cmi polkaGrid.cmx) \
 	$(patsubst %,products/%, $(subst xxx,polkaGrid, $(OCAMLFIND_PROTO)))
 endif
 ifneq ($(HAS_PPLITE),)
 OCAMLFIND_FILES += \
-	$(patsubst %,pplite/%, pplite.idl pplite.mli pplite.cmi pplite.cma pplite.cmx $(call OCAMLOPT_TARGETS, pplite) libap_pplite_caml.a libap_pplite_caml_debug.a dllap_pplite_caml.$(EXT_DLL))
+	$(patsubst %,pplite/%, pplite.idl pplite.mli pplite.cmi pplite.cma pplite.cmx $(call OCAMLOPT_TARGETS, pplite) libap_pplite_caml.a dllap_pplite_caml.$(EXT_DLL))
 endif
 ifneq ($(HAS_GLPK),)
 OCAMLFIND_FILES += \
@@ -184,11 +186,7 @@ ifneq ($(HAS_GLPK),)
 endif
 else
 	$(OCAMLFIND) remove apron
-	$(OCAMLFIND) install apron mlapronidl/META $(OCAMLFIND_FILES)	\
-		$(call OCAMLOPT_TARGETS, mlapronidl/apron.d		\
-					 newpolka/polkaMPQ.d		\
-					 newpolka/polkaRll.d		\
-					 taylor1plus/t1pMPQ.d taylor1plus/t1pD.d taylor1plus/t1pMPFR.d)
+	$(OCAMLFIND) install apron mlapronidl/META $(OCAMLFIND_FILES)
 endif
 endif
 ifneq ($(HAS_CPP),)
@@ -199,7 +197,7 @@ ifneq ($(HAS_JAVA),)
 endif
 
 ifneq ($(OCAMLFIND),)
-install: mlapronidl/META
+ml: mlapronidl/META
 mlapronidl/META: mlapronidl/META.in mlapronidl/META.ppl.in mlapronidl/META.pplite.in
 	$(SED) -e "s!@VERSION@!$(VERSION_STR)!g;" $< > $@;
   ifneq ($(HAS_PPL),)

Makefile.config.model

@@ -182,6 +182,7 @@ RANLIB = ranlib
 SED = sed
 PERL = perl
 INSTALL = install
+INSTALLSTRIP = install --strip
 INSTALLd = install -d
 
 OCAMLC = ocamlc.opt

apron.opam

@@ -17,6 +17,7 @@ build: [
     "--prefix"
     "%{share}%/apron"
     "--no-ppl" {!conf-ppl:installed}
+    "--no-pplite" {!conf-pplite:installed}
     "--no-ocaml-plugins" {os = "freebsd"}
     "--absolute-dylibs" {os = "macos"}
     "--ext-dll" {os = "win32"} "dll" {os = "win32"}
@@ -36,6 +37,7 @@ depends: [
 ]
 depopts: [
   "conf-ppl"
+  "conf-pplite"
 ]
 description:"""
 Apron is a library to represent properties of numeric variables, such as variable bounds or linear relations between variables, and to manipulate these properties through semantic operations, such as variable assignments, tests, conjunctions, entailment. Apron is intended to be used in static program analyzers, in order to infer invariants of numeric variables, i.e., properties that hold for all executions of a program. It is based on the theory of Abstract Interpretation."""

apron/Makefile

@@ -53,12 +53,14 @@ LDFLAGS += $(MP_LIFLAGS) -lm -lmpfr -lgmp
 # Rules
 #---------------------------------------
 
-LIB_FILES = libapron.a libapron_debug.a
+LIB_FILES = libapron.a
+LIB_FILES_DEBUG = libapron_debug.a
 ifneq ($(HAS_SHARED),)
-LIB_FILES += libapron.$(EXT_DLL) libapron_debug.$(EXT_DLL)
+LIB_FILES += libapron.$(EXT_DLL)
+LIB_FILES_DEBUG += libapron_debug.$(EXT_DLL)
 endif
 
-all: $(LIB_FILES)
+all: $(LIB_FILES) $(LIB_FILES_DEBUG)
 
 #---------------------------------------
 # Misc rules
@@ -82,7 +84,10 @@ install: all
 	mkdir -p $(APRON_INCLUDE)
 	cp $(H_FILES) $(APRON_INCLUDE)
 	mkdir -p $(APRON_LIB)
-	for i in $(LIB_FILES); do if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); fi; done
+	for i in $(LIB_FILES); do if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; done
+ifneq ($(HAS_DEBUG),)
+	for i in $(LIB_FILES_DEBUG); do if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); fi; done
+endif
 
 uninstall:
 	/bin/rm -f $(H_FILES:%=$(APRON_INCLUDE)/%)

apronxx/Makefile

@@ -52,6 +52,14 @@ CCINC = \
 LIBS = $(LDFLAGS) -lapron  -lmpfr -lgmpxx -lgmp -lm
 LIBS_DEBUG = $(LDFLAGS) -lapron_debug -lmpfr -lgmpxx -lgmp -lm
 
+CCLIB_TO_INSTALL = libapronxx.a
+CCLIB_TO_INSTALL_DEBUG = libapronxx_debug.a
+
+ifneq ($(HAS_SHARED),)
+CCLIB_TO_INSTALL += libapronxx.$(EXT_DLL)
+CCLIB_TO_INSTALL_DEBUG += libapronxx_debug.$(EXT_DLL)
+endif
+
 ifneq ($(HAS_PPL),)
   DEFS := $(DEFS) -DHAS_PPL
   LIBS := $(LIBS) $(PPL_LIFLAGS) -L../ppl -L../products -lap_pkgrid -lap_ppl -lppl
@@ -77,7 +85,10 @@ distclean: clean
 install:
 	$(INSTALLd) $(APRON_INCLUDE) $(APRON_INCLUDE)/apronxx $(APRON_LIB)
 	$(INSTALL) $(CCINC) $(APRON_INCLUDE)/apronxx
-	$(INSTALL) libapronxx.* libapronxx_debug.* $(APRON_LIB)
+	$(INSTALLSTRIP) $(CCLIB_TO_INSTALL) $(APRON_LIB)
+ifneq ($(HAS_DEBUG),)
+	$(INSTALL) $(CCLIB_TO_INSTALL_DEBUG) $(APRON_LIB)
+endif
 
 uninstall:
 	/bin/rm -rf $(APRON_INCLUDE)/apronxx

avoct/Makefile

@@ -40,6 +40,24 @@ CCINC = avo_internal.h avo_fun.h
 LIBS = -lapron -lmpfr -lgmp -lm
 LIBS_DEBUG = -lapron_debug -lmpfr -lgmp -lm
 
+CCLIB_TO_INSTALL = libavoIl.a libavoIll.a libavoMPZ.a libavoRl.a libavoRll.a  libavoMPQ.a libavoD.a  libavoDl.a  libavoMPFR.a
+CCLIB_TO_INSTALL_DEBUG = libavoIl_debug.a libavoIll_debug.a libavoMPZ_debug.a libavoRl_debug.a libavoRll_debug.a  libavoMPQ_debug.a libavoD_debug.a  libavoDl_debug.a  libavoMPFR_debug.a
+CAMLLIB_TO_INSTALL = libavoIl_caml.a libavoIll_caml.a libavoMPZ_caml.a libavoRl_caml.a libavoRll_caml.a  libavoMPQ_caml.a libavoD_caml.a  libavoDl_caml.a  libavoMPFR_caml.a
+CAMLLIB_TO_INSTALL_DEBUG = libavoIl_caml_debug.a libavoIll_caml_debug.a libavoMPZ_caml_debug.a libavoRl_caml_debug.a libavoRll_caml_debug.a  libavoMPQ_caml_debug.a libavoD_caml_debug.a  libavoDl_caml_debug.a  libavoMPFR_caml_debug.a
+
+ifneq ($(HAS_OCAMLOPT),)
+CAMLLIB_TO_INSTALL += $(call OCAMLOPT_TARGETS, avoIl avoIll avoMPZ avoRl avoRll avoMPQ avoD avoDl avoMPFR)
+CAMLLIB_TO_INSTALL_DEBUG += $(call OCAMLOPT_TARGETS, avoIl.d avoIll.d avoMPZ.d avoRl.d avoRll.d avoMPQ.d avoD.d avoDl.d avoMPFR.d)
+endif
+
+ifneq ($(HAS_SHARED),)
+CCLIB_TO_INSTALL += libavoIl.$(EXT_DLL) libavoIll.$(EXT_DLL) libavoMPZ.$(EXT_DLL) libavoRl.$(EXT_DLL) libavoRll.$(EXT_DLL)  libavoMPQ.$(EXT_DLL) libavoD.$(EXT_DLL)  libavoDl.$(EXT_DLL)  libavoMPFR.$(EXT_DLL)
+CCLIB_TO_INSTALL_DEBUG += libavoIl_debug.$(EXT_DLL) libavoIll_debug.$(EXT_DLL) libavoMPZ_debug.$(EXT_DLL) libavoRl_debug.$(EXT_DLL) libavoRll_debug.$(EXT_DLL)  libavoMPQ_debug.$(EXT_DLL) libavoD_debug.$(EXT_DLL)  libavoDl_debug.$(EXT_DLL)  libavoMPFR_debug.$(EXT_DLL)
+CAMLLIB_TO_INSTALL += dllavoIl_caml.$(EXT_DLL) dllavoIll_caml.$(EXT_DLL) dllavoMPZ_caml.$(EXT_DLL) dllavoRl_caml.$(EXT_DLL) dllavoRll_caml.$(EXT_DLL)  dllavoMPQ_caml.$(EXT_DLL) dllavoD_caml.$(EXT_DLL)  dllavoDl_caml.$(EXT_DLL)  dllavoMPFR_caml.$(EXT_DLL)
+CAMLLIB_TO_INSTALL_DEBUG += dllavoIl_caml_debug.$(EXT_DLL) dllavoIll_caml_debug.$(EXT_DLL) dllavoMPZ_caml_debug.$(EXT_DLL) dllavoRl_caml_debug.$(EXT_DLL) dllavoRll_caml_debug.$(EXT_DLL)  dllavoMPQ_caml_debug.$(EXT_DLL) dllavoD_caml_debug.$(EXT_DLL)  dllavoDl_caml_debug.$(EXT_DLL)  dllavoMPFR_caml_debug.$(EXT_DLL)
+endif
+
+
 #---------------------------------------
 # Rules
 #---------------------------------------
@@ -113,20 +131,30 @@ install:
 	$(INSTALLd) $(APRON_INCLUDE) $(APRON_INCLUDE)/avo $(APRON_LIB) $(APRON_BIN)
 	$(INSTALL) avo.h $(APRON_INCLUDE)
 	$(INSTALL) $(CCINC) $(APRON_INCLUDE)/avo
-	for i in avotest* avotop* avorun*; do \
-		if test -f $$i; then $(INSTALL) $$i $(APRON_BIN); fi; \
+	for i in avotop* avorun*; do \
+		if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_BIN); fi; \
 	done
-	for i in libavo*.* libavo*_debug.*; do \
-		if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); fi; \
+	for i in $(CCLIB_TO_INSTALL); do \
+		if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
 	done
 ifeq ($(OCAMLFIND),)
-	for i in libavo*_caml.* dllavo*_caml.$(EXT_DLL); do \
-		if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); fi; \
+	for i in $(CAMLLIB_TO_INSTALL); do \
+		if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
 	done
 	for i in avo.idl avo.mli avo.cmi avo.cmx avo*.cma avo*.cmxa avo*.a; do \
+		if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
+	done
+endif
+ifneq ($(HAS_DEBUG),)
+	for i in $(CCLIB_TO_INSTALL_DEBUG); do \
+		if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); fi; \
+	done
+ifeq ($(OCAMLFIND),)
+	for i in $(CAMLLIB_TO_INSTALL_DEBUG); do \
 		if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); fi; \
 	done
 endif
+endif
 
 uninstall:
 	/bin/rm -fr $(APRON_INCLUDE)/avo.h
@@ -241,15 +269,15 @@ mlD: ml avoD.cma libavoD_caml.a libavoD_caml_debug.a
 mlDl: ml avoDl.cma libavoDl_caml.a libavoDl_caml_debug.a
 mlMPFR: ml avoMPFR.cma libavoMPFR_caml.a libavoMPFR_caml_debug.a
 ifneq ($(HAS_OCAMLOPT),)
-mlIl: $(call OCAMLOPT_TARGETS, avoIl)
-mlIll: $(call OCAMLOPT_TARGETS, avoIll)
-mlMPZ: $(call OCAMLOPT_TARGETS, avoMPZ)
-mlRi: $(call OCAMLOPT_TARGETS, avoRi)
-mlRll: $(call OCAMLOPT_TARGETS, avoRll)
-mlMPQ: $(call OCAMLOPT_TARGETS, avoMPQ)
-mlD: $(call OCAMLOPT_TARGETS, avoD)
-mlDl: $(call OCAMLOPT_TARGETS, avoDl)
-mlMPFR: $(call OCAMLOPT_TARGETS, avoMPFR)
+mlIl: $(call OCAMLOPT_TARGETS, avoIl avoIl.d)
+mlIll: $(call OCAMLOPT_TARGETS, avoIll avoIll.d)
+mlMPZ: $(call OCAMLOPT_TARGETS, avoMPZ avoMPZ.d)
+mlRi: $(call OCAMLOPT_TARGETS, avoRi avoRi.d)
+mlRll: $(call OCAMLOPT_TARGETS, avoRll avoRll.d)
+mlMPQ: $(call OCAMLOPT_TARGETS, avoMPQ avoMPQ.d)
+mlD: $(call OCAMLOPT_TARGETS, avoD avoD.d)
+mlDl: $(call OCAMLOPT_TARGETS, avoDl avoDl.d)
+mlMPFR: $(call OCAMLOPT_TARGETS, avoMPFR avoMPFR.d)
 endif
 ifneq ($(HAS_SHARED),)
 mlIl: dllavoIl_caml.$(EXT_DLL) 
@@ -274,6 +302,9 @@ avo%.cma: avo.cmo libavo%_caml.a libavo%.a
 avo%.cmxa avo%.a: avo.cmx libavo%_caml.a libavo%.a
 	$(OCAMLMKLIB) -o avo$* -oc avo$*_caml avo.cmx -lavo$* $(LIBS)
 
+avo%.d.cmxa avo%.d.a: avo.cmx libavo%_caml_debug.a libavo%_debug.a
+	$(OCAMLMKLIB) -o avo$*.d -oc avo$*_caml_debug avo.cmx -lavo$*_debug $(LIBS_DEBUG)
+
 dllavo%_caml.$(EXT_DLL) libavo%_caml.a: avo_caml.o libavo%.a
 	$(OCAMLMKLIB) -o avo$*_caml $< -L. -lavo$* $(LDFLAGS) $(LIBS)
 

box/Makefile

@@ -23,28 +23,30 @@ CCSRC = box_config.h box.h $(CCMODULES:%=%.h) $(CCMODULES:%=%.c)
 
 CCINC_TO_INSTALL = box.h
 CCBIN_TO_INSTALL =
-CCLIB_TO_INSTALL = libboxMPQ.a libboxD.a libboxMPFR.a	\
-libboxMPQ_debug.a libboxD_debug.a libboxMPFR_debug.a
+CCLIB_TO_INSTALL = libboxMPQ.a libboxD.a libboxMPFR.a
+CCLIB_TO_INSTALL_DEBUG = libboxMPQ_debug.a libboxD_debug.a libboxMPFR_debug.a
 ifneq ($(HAS_SHARED),)
-  CCLIB_TO_INSTALL := $(CCLIB_TO_INSTALL) libboxMPQ.$(EXT_DLL) libboxD.$(EXT_DLL)	\
-  libboxMPFR.$(EXT_DLL) libboxMPQ_debug.$(EXT_DLL) libboxD_debug.$(EXT_DLL)			\
-  libboxMPFR_debug.$(EXT_DLL)
+  CCLIB_TO_INSTALL := $(CCLIB_TO_INSTALL) libboxMPQ.$(EXT_DLL) libboxD.$(EXT_DLL) libboxMPFR.$(EXT_DLL)
+  CCLIB_TO_INSTALL_DEBUG := $(CCLIB_TO_INSTALL_DEBUG) libboxMPQ_debug.$(EXT_DLL) libboxD_debug.$(EXT_DLL) libboxMPFR_debug.$(EXT_DLL)
 endif
 
-ifneq ($(HAS_OCAML),)
-  CAML_TO_INSTALL = box.idl box.ml box.mli box.cmi boxMPQ.cma	\
-  boxD.cma boxMPFR.cma libboxMPQ_caml.a libboxD_caml.a		\
-  libboxMPFR_caml.a libboxMPQ_caml_debug.a libboxD_caml_debug.a	\
-  libboxMPFR_caml_debug.a
-  ifneq ($(HAS_OCAMLOPT),)
-    CAML_TO_INSTALL += $(call OCAMLOPT_TARGETS, boxMPQ boxD boxMPFR)
-  endif
-  ifneq ($(HAS_SHARED),)
-    CAML_TO_INSTALL += dllboxMPQ_caml.$(EXT_DLL) dllboxD_caml.$(EXT_DLL)	\
-    dllboxMPFR_caml.$(EXT_DLL)
-  endif
+CAML_TO_INSTALL = box.idl box.ml box.mli box.cmi boxMPQ.cma	\
+boxD.cma boxMPFR.cma libboxMPQ_caml.a libboxD_caml.a		\
+libboxMPFR_caml.a
+CAML_TO_INSTALL_DEBUG = libboxMPQ_caml_debug.a libboxD_caml_debug.a	\
+libboxMPFR_caml_debug.a
+ifneq ($(HAS_OCAMLOPT),)
+  CAML_TO_INSTALL += $(call OCAMLOPT_TARGETS, boxMPQ boxD boxMPFR)
+  CAML_TO_INSTALL_DEBUG += $(call OCAMLOPT_TARGETS, boxMPQ.d boxD.d boxMPFR.d)
+endif
+ifneq ($(HAS_SHARED),)
+  CAML_TO_INSTALL += dllboxMPQ_caml.$(EXT_DLL) dllboxD_caml.$(EXT_DLL)	\
+  dllboxMPFR_caml.$(EXT_DLL)
+  CAML_TO_INSTALL_DEBUG += dllboxMPQ_caml_debug.$(EXT_DLL) dllboxD_caml_debug.$(EXT_DLL)	\
+  dllboxMPFR_caml_debug.$(EXT_DLL)
 endif
 
+
 LIBS = -lapron -lmpfr -lgmp -lm
 LIBS_DEBUG = -lapron_debug -lmpfr -lgmp -lm
 
@@ -73,9 +75,9 @@ mlMPQ: boxMPQ.cma libboxMPQ_caml.a libboxMPQ_caml_debug.a
 mlD: boxD.cma libboxD_caml.a libboxD_caml_debug.a
 mlMPFR: boxMPFR.cma libboxMPFR_caml.a libboxMPFR_caml_debug.a
 ifneq ($(HAS_OCAMLOPT),)
-  mlMPQ: $(call OCAMLOPT_TARGETS, boxMPQ)
-  mlD: $(call OCAMLOPT_TARGETS, boxD)
-  mlMPFR: $(call OCAMLOPT_TARGETS, boxMPFR)
+  mlMPQ: $(call OCAMLOPT_TARGETS, boxMPQ boxMPQ.d)
+  mlD: $(call OCAMLOPT_TARGETS, boxD boxD.d)
+  mlMPFR: $(call OCAMLOPT_TARGETS, boxMPFR boxMPFR.d)
 endif
 ifneq ($(HAS_SHARED),)
   mlMPQ: dllboxMPQ_caml.$(EXT_DLL) 
@@ -103,13 +105,23 @@ install: $(CCINC_TO_INSTALL) $(CCLIB_TO_INSTALL)
 	$(INSTALLd) $(APRON_INCLUDE) $(APRON_LIB)
 	$(INSTALL) $(CCINC_TO_INSTALL) $(APRON_INCLUDE)
 	for i in $(CCLIB_TO_INSTALL); do \
-		if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); fi; \
+		if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
 	done
 ifeq ($(OCAMLFIND),)
 	for i in $(CAML_TO_INSTALL); do \
+		if test -f $$i; then $(INSTALLSTRIP) $$i $(APRON_LIB); fi; \
+	done
+endif
+ifneq ($(HAS_DEBUG),)
+	for i in $(CCLIB_TO_INSTALL_DEBUG); do \
+		if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); fi; \
+	done
+ifeq ($(OCAMLFIND),)
+	for i in $(CAML_TO_INSTALL_DEBUG); do \
 		if test -f $$i; then $(INSTALL) $$i $(APRON_LIB); fi; \
 	done
 endif
+endif
 
 uninstall:
 	for i in $(CCINC_TO_INSTALL); do /bin/rm -f $(APRON_INCLUDE)/$$i; done
@@ -193,6 +205,9 @@ box%.cma: box.cmo libbox%_caml.a libbox%.a
 box%.cmxa box%.a: box.cmx libbox%_caml.a libbox%.a
 	$(OCAMLMKLIB) -o box$* -oc box$*_caml box.cmx -lbox$* $(LIBS)
 
+box%.d.cmxa box%.d.a: box.cmx libbox%_caml_debug.a libbox%_debug.a
+	$(OCAMLMKLIB) -o box$*.d -oc box$*_caml_debug box.cmx -lbox$*_debug $(LIBS_DEBUG)
+
 #---------------------------------------
 # IDL rules
 #---------------------------------------

configure

@@ -32,6 +32,8 @@ where options include:
   -no-glpk             disable GLPK support
   -no-java             disable Java support
   -absolute-dylibs     force absolute library names (OSX only)
+  -debug               install also debug library version
+  -no-strip            don't strip libraries
 
 Environment variables that affect configuration:
   CC                   C compiler to use (default: gcc)
@@ -68,6 +70,8 @@ has_ocaml_plugins=1
 has_java=1
 force_absolute_dylib_install_names=0;
 ext_dll=so
+has_debug=0
+do_strip=--strip
 while : ; do
     case "$1" in
         "") 
@@ -119,6 +123,10 @@ while : ; do
             has_java=0;;
 	-absolute-dylibs|--absolute-dylibs)
 	    force_absolute_dylib_install_names=1;;
+        -debug|--debug)
+            has_debug=1;;
+        -no-strip|--no-strip)
+            do_strip=;;
         -help|--help)
             help;;
         *)
@@ -600,9 +608,11 @@ detected configuration:
    optional PPL support         $has_ppl
    optional PPLite support      $has_pplite
    optional GLPK support        $has_glpk
+   optional debug libraries     $has_debug
    
    installation path            $apron_prefix
    dynamic libraries extension  $ext_dll
+   install (stripped) command   $install ($do_strip)
 
 EOF
 
@@ -622,6 +632,8 @@ if test "$has_java" -eq 0; then has_java=; fi
 if test "$has_ppl" -eq 0; then has_ppl=; fi
 if test "$has_pplite" -eq 0; then has_pplite=; fi
 if test "$has_glpk" -eq 0; then has_glpk=; fi
+if test "$has_debug" -eq 0; then has_debug=; fi
+
 
 cat > Makefile.config <<EOF
 # generated by ./configure
@@ -637,6 +649,7 @@ HAS_CPP = $has_cxx
 HAS_LONG_DOUBLE = 1
 HAS_SHARED = 1
 HAS_JAVA = $has_java
+HAS_DEBUG = $has_debug
 
 APRON_PREFIX = $apron_prefix
 
@@ -677,6 +690,7 @@ RANLIB = $ranlib
 SED = $sed
 PERL = perl
 INSTALL = $install
+INSTALLSTRIP = $install $do_strip
 INSTALLd = $install -d
 
 CAML_PREFIX = $caml_prefix