oln-0.10 10.251: Clean up
by Roland Levillain
2006-08-25 Roland Levillain <roland(a)lrde.epita.fr>
Clean up.
* oln/lrde/ufmt/bin/fiorio.cc: Remove dead code.
* oln/lrde/ufmt/fiorio-1.hh, oln/lrde/ufmt/fiorio-2.hh: Likewise.
Adjust header guards.
Don't use non-ASCII characters.
* oln/lrde/ufmt/README (find_root): Don't use non-ASCII
characters.
--- 10.250/olena/oln/lrde/ufmt/README Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/x/22_README 1.3 644)
+++ 10.251/olena/oln/lrde/ufmt/README Fri, 25 Aug 2006 18:19:26 +0200 levill_r (oln/x/22_README 1.4 644)
@@ -134,4 +134,4 @@
** fiorio-2.hh
My second implementation of the max-tree computation using Fiorio's and
-Gustedt's algorithm, using routines of Tho's (anc, insert, etc.)
+Gustedt's algorithm, using routines of Theo's (anc, insert, etc.)
--- 10.250/olena/oln/lrde/ufmt/fiorio-1.hh Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/x/27_fiorio-1.h 1.1 644)
+++ 10.251/olena/oln/lrde/ufmt/fiorio-1.hh Fri, 25 Aug 2006 18:19:26 +0200 levill_r (oln/x/27_fiorio-1.h 1.2 644)
@@ -37,8 +37,8 @@
started to work on August 25th, 2006. */
-#ifndef OLENA_LRDE_UFMT_FIORIO_HH
-# define OLENA_LRDE_UFMT_FIORIO_HH
+#ifndef OLENA_LRDE_UFMT_FIORIO_1_HH
+# define OLENA_LRDE_UFMT_FIORIO_1_HH
# include <algorithm>
@@ -59,27 +59,18 @@
typedef oln_point_type(I) point;
typedef oln_value_type(I) value;
typedef oln_iter_type(I) piter;
- // typedef oln_neighborhood_type(I) Nbh;
- // typedef oln_iter_type(Nbh) niter;
typedef typename mute<I, point>::ret parent_type;
- // FIXME: Should be elsewhere!
- typedef oln::image2d<unsigned> area_type;
-
public:
fiorio(const abstract::image<I>& ima) :
ima_(ima.exact().clone()), parent_(ima.size())
, n_level_roots_cpt_(ima.npoints())
-// , area_(ima_.size())
{
// Init the image of parents.
piter p (parent_);
for_all (p)
parent_[p] = p;
- // FIXME: Should be elsewhere!
- // Init the image of data.
-// oln::level::fill (area_, 1);
}
/// Entry point of the algorithm.
@@ -144,7 +135,7 @@
protected:
- // Improve to handle other neighborhoods than 4-c.
+ // FIXME: Improve to handle other neighborhoods than 4-c.
void scan_line()
{
// Special treatment of the first line (no merge).
@@ -184,13 +175,9 @@
{
point p (row, col );
point upper (row - 1, col );
- point left (row, col - 1);
- // FIXME: Disabled, since /a priori/ useless.
- // (Remove it?)
-#if 0
- // Merge with left pixel.
- merge(p, left);
-#endif
+
+ // Note: merging with the left pixel is useless.
+
// Merge with upper pixel.
merge(p, upper);
}
@@ -198,7 +185,7 @@
// FIXME: Turn this recursive method into a loop!
// FIXME: Get rid of the swap, using an introductory method.
- /// \note Th�o calls this method ``update'.
+ /// \note Theo calls this method ``update'.
void merge(const point& p, const point& q)
{
point r = find_level_root(p);
@@ -227,7 +214,7 @@
merge(t, s);
}
- /// \note Th�o calls this function ``is_root'.
+ /// \note Theo calls this function ``is_root'.
bool is_top(const point& p) const
{
return parent_[p] == p;
@@ -257,60 +244,13 @@
}
protected:
- /// \note Th�o calls this image ``f''.
+ /// \note Theo calls this image ``f''.
I ima_;
- /// \note Th�o calls this image ``par''.
+ /// \note Theo calls this image ``par''.
parent_type parent_;
// Counter of level roots (method 1).
unsigned n_level_roots_cpt_;
-
-
-// ----------------------------------------------------------------
-
-// FIXME: Should be elsewhere!
-
-// public:
-// void area_opening (unsigned size)
-// {
-// oln_iter_type_(area_type) p(area_);
-
-// // First pass: sum areas.
-// for_all(p)
-// {
-// point p_parent = parent_[p];
-// while (p != p_parent)
-// {
-// area_[p_parent] += 1;
-// }
-// }
-
-// // Second pass: cut branches in the max-tree.
-// for_all(p)
-// merge(p, size);
-// }
-
-// protected:
-// // Attach P to Q.
-// // FIXME: The criterion should be passed as a function object.
-// point merge (const point& p, unsigned size)
-// {
-// if (not is_top(p) && area_[p] < size)
-// {
-// // Find the component satisfying the criterion.
-// point new_level_root = merge(parent_[p], size);
-// // Attach P to its new component representant (level root).
-// parent_[p] = new_level_root;
-// // Take the color of the new component.
-// ima_[p] = ima_[new_level_root];
-// return new_level_root;
-// }
-// else
-// return p;
-// }
-
-// protected:
-// area_type area_;
};
} // end of namespace oln::lrde::ufmt
@@ -319,4 +259,4 @@
} // end of namespace oln
-#endif // ! OLENA_LRDE_UFMT_FIORIO_HH
+#endif // ! OLENA_LRDE_UFMT_FIORIO_1_HH
--- 10.250/olena/oln/lrde/ufmt/fiorio-2.hh Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/x/28_fiorio-2.h 1.1 644)
+++ 10.251/olena/oln/lrde/ufmt/fiorio-2.hh Fri, 25 Aug 2006 18:19:26 +0200 levill_r (oln/x/28_fiorio-2.h 1.2 644)
@@ -34,11 +34,11 @@
Science, 1996.
\note This is the second version of my implementation, augmented
- with Th�o's (better) routines and ideas. */
+ with Theo's (better) routines and ideas. */
-#ifndef OLENA_LRDE_UFMT_FIORIO_HH
-# define OLENA_LRDE_UFMT_FIORIO_HH
+#ifndef OLENA_LRDE_UFMT_FIORIO_2_HH
+# define OLENA_LRDE_UFMT_FIORIO_2_HH
# include <algorithm>
@@ -59,27 +59,17 @@
typedef oln_point_type(I) point;
typedef oln_value_type(I) value;
typedef oln_iter_type(I) piter;
- // typedef oln_neighborhood_type(I) Nbh;
- // typedef oln_iter_type(Nbh) niter;
typedef typename mute<I, point>::ret parent_type;
- // FIXME: Should be elsewhere!
- typedef oln::image2d<unsigned> area_type;
-
public:
fiorio(const abstract::image<I>& ima) :
ima_(ima.exact().clone()), parent_(ima.size())
, n_level_roots_cpt_(ima.npoints())
-// , area_(ima_.size())
{
// Init the image of parents.
piter p (parent_);
for_all (p)
parent_[p] = p;
-
- // FIXME: Should be elsewhere!
- // Init the image of data.
-// oln::level::fill (area_, 1);
}
/// Entry point of the algorithm.
@@ -144,7 +134,7 @@
protected:
- // Improve to handle other neighborhoods than 4-c.
+ // FIXME: Improve to handle other neighborhoods than 4-c.
void scan_line()
{
// Special treatment of the first line (no merge).
@@ -204,7 +194,8 @@
}
}
- /// Front-end to \a merge_.
+ /// \brief Front-end to \a merge_.
+ /// \note Theo calls this method ``update'.
void merge(const point& p, const point& q)
{
// The \a merge_ routine assumes that P has a value greater
@@ -216,8 +207,6 @@
}
// FIXME: Turn this recursive method into a loop!
- // FIXME: Get rid of the swap, using an introductory method.
- /// \note Th�o calls this method ``update'.
void merge_(const point& p, const point& q)
{
precondition (p != q);
@@ -231,9 +220,6 @@
if (r == s)
return;
- // FIXME: Have a look at Th�o's ``update'' routine to see
- // if we can improve this method.
- // \{
point t = parent_[s];
if (ima_[s] == ima_[r])
@@ -251,7 +237,7 @@
merge_(r, t);
}
- /// \note Th�o calls this function ``is_root'.
+ /// \note Theo calls this function ``is_root'.
bool is_top(const point& p) const
{
return parent_[p] == p;
@@ -265,7 +251,7 @@
}
/// \brief Find the level root of the component that P belongs to.
- /// \note From Th�o.
+ /// \note From Theo.
point find_level_root(const point& p)
{
// Is P a level root at the end the routine?
@@ -276,8 +262,8 @@
return parent_[p] = find_level_root(parent_[p]);
}
- /// \note From Th�o.
- /// \note Th�o calls this method ``anc''.
+ /// \note From Theo.
+ /// \note Theo calls this method ``anc''.
point find_ancestor(point p, const value& level)
{
while (not is_top(p) and ima_[parent_[p]] >= level)
@@ -286,60 +272,13 @@
}
protected:
- /// \note Th�o calls this image ``f''.
+ /// \note Theo calls this image ``f''.
I ima_;
- /// \note Th�o calls this image ``par''.
+ /// \note Theo calls this image ``par''.
parent_type parent_;
// Counter of level roots (method 1).
unsigned n_level_roots_cpt_;
-
-
-// ----------------------------------------------------------------
-
-// FIXME: Should be elsewhere!
-
-// public:
-// void area_opening (unsigned size)
-// {
-// oln_iter_type_(area_type) p(area_);
-
-// // First pass: sum areas.
-// for_all(p)
-// {
-// point p_parent = parent_[p];
-// while (p != p_parent)
-// {
-// area_[p_parent] += 1;
-// }
-// }
-
-// // Second pass: cut branches in the max-tree.
-// for_all(p)
-// merge(p, size);
-// }
-
-// protected:
-// // Attach P to Q.
-// // FIXME: The criterion should be passed as a function object.
-// point merge (const point& p, unsigned size)
-// {
-// if (not is_top(p) && area_[p] < size)
-// {
-// // Find the component satisfying the criterion.
-// point new_level_root = merge(parent_[p], size);
-// // Attach P to its new component representant (level root).
-// parent_[p] = new_level_root;
-// // Take the color of the new component.
-// ima_[p] = ima_[new_level_root];
-// return new_level_root;
-// }
-// else
-// return p;
-// }
-
-// protected:
-// area_type area_;
};
} // end of namespace oln::lrde::ufmt
@@ -348,4 +287,4 @@
} // end of namespace oln
-#endif // ! OLENA_LRDE_UFMT_FIORIO_HH
+#endif // ! OLENA_LRDE_UFMT_FIORIO_2_HH
--- 10.250/olena/oln/lrde/ufmt/bin/fiorio.cc Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/x/30_fiorio.cc 1.1 644)
+++ 10.251/olena/oln/lrde/ufmt/bin/fiorio.cc Fri, 25 Aug 2006 18:19:26 +0200 levill_r (oln/x/30_fiorio.cc 1.2 644)
@@ -16,69 +16,29 @@
void usage(char* argv[])
{
- std::cerr << "usage: " << argv[0] << " input.pgm "//"level-roots.pbm"
+ std::cerr << "usage: " << argv[0] << " input.pgm"
<< std::endl
<< "Max-tree computation with Fiorio's and Gustedt's algorithm."
<< std::endl;
- // FIXME: get precise description...
exit(1);
}
int main(int argc, char* argv[])
{
-// if (argc != 3)
-// usage(argv);
if (argc != 2)
usage(argv);
typedef oln::image2d<ntg::int_u8> image_type;
-
image_type input = oln::io::load(argv[1]);
typedef oln::lrde::ufmt::fiorio<image_type> algorithm_type;
-
algorithm_type run(input);
- std::cout << "npoint = " << run.ima().npoints()
+ std::cout << "npoint = " << run.ima().npoints()
<< std::endl;
run.go();
- std::cout << "n level roots (first version) = " << run.n_level_roots1()
+ std::cout << "n level roots (first method) = " << run.n_level_roots1()
<< std::endl
- << "n level roots (second version) = " << run.n_level_roots2()
+ << "n level roots (second method) = " << run.n_level_roots2()
<< std::endl;
-
-// // Save the image of level roots.
-// oln::save(run.level_roots(), argv[2]);
-
-#if 0
- // Create an image of components.
- image_type output (input.size());
- oln::level::fill (output, 0);
- unsigned color = 1;
- oln_iter_type_(image_type) p(algo.parent());
- for_all(p)
- {
- oln::point2d root = algo.parent()[p];
- // Assign a color to the root point of the component if not yet
- // done.
- if (output[root] == 0)
- output[root] = color;
- // If P is not a root, assign it the color of its root.
- if (p != root)
- output[p] = output[root];
-
- // Increment the color, handling overflows (sigh). This is
- // quick and dirty, but allows us to view the output image
- // easily.
- color =
- color >= 255 ?
- 1 :
- color + 1;
- }
-#endif
-
-#if 0
- algo.area_opening (5);
- oln::io::save (algo.ima(), argv[2]);
-#endif
}
--- 10.250/oln.prj
+++ 10.251/oln.prj
@@ -1,26 +1,21 @@
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Olena")
-(Project-Version oln 10 250)
-(Parent-Version oln 10 248)
+(Project-Version oln 10 251)
+(Parent-Version oln 10 250)
(Version-Log "2006-08-25 Roland Levillain <roland(a)lrde.epita.fr>
- Max-tree computation based on Fiorio's and Gustedt's labelling
- algorithm.
+ Clean up.
- * oln/lrde/ufmt/fiorio-1.hh, oln/lrde/ufmt/fiorio-2.hh: New.
- * oln/lrde/ufmt/bin/fiorio.cc: New.
- * oln/lrde/ufmt/README: Update.
-
- Make the the olena/oln/lrde/ufmt hierarchy a full-fledged part of
- the autoconfiscated package.
-
- * oln/lrde/Makefile.am, oln/lrde/ufmt/Makefile.am,
- * oln/lrde/ufmt/bin/Makefile.am: New.
- * TODO: New.
+ * oln/lrde/ufmt/bin/fiorio.cc: Remove dead code.
+ * oln/lrde/ufmt/fiorio-1.hh, oln/lrde/ufmt/fiorio-2.hh: Likewise.
+ Adjust header guards.
+ Don't use non-ASCII characters.
+ * oln/lrde/ufmt/README (find_root): Don't use non-ASCII
+ characters.
")
(New-Version-Log "")
-(Checkin-Time "Fri, 25 Aug 2006 17:56:35 +0200")
+(Checkin-Time "Fri, 25 Aug 2006 18:19:26 +0200")
(Checkin-Login levill_r)
;; diff-ignore tests/data/.*pbm$
;; diff-ignore .*\.pbm$
@@ -137,7 +132,7 @@
(doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600))
(integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.51 600))
(metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600))
- (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.13 600))
+ (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.14 600))
(tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600))
(tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.48 600))
@@ -1573,7 +1568,7 @@
- (olena/oln/lrde/ufmt/README (oln/x/22_README 1.3 644))
+ (olena/oln/lrde/ufmt/README (oln/x/22_README 1.4 644))
;; Files deleted by depopulate at Fri, 04 Aug 2006 18:41:16 +0200,
;; from version 10.245(w), by theo:
@@ -1603,19 +1598,10 @@
(olena/TODO (oln/x/24_TODO 1.1 644))
(olena/oln/lrde/Makefile.am (oln/x/25_Makefile.a 1.1 644))
(olena/oln/lrde/ufmt/Makefile.am (oln/x/26_Makefile.a 1.1 644))
- (olena/oln/lrde/ufmt/fiorio-1.hh (oln/x/27_fiorio-1.h 1.1 644))
- (olena/oln/lrde/ufmt/fiorio-2.hh (oln/x/28_fiorio-2.h 1.1 644))
+ (olena/oln/lrde/ufmt/fiorio-1.hh (oln/x/27_fiorio-1.h 1.2 644))
+ (olena/oln/lrde/ufmt/fiorio-2.hh (oln/x/28_fiorio-2.h 1.2 644))
(olena/oln/lrde/ufmt/bin/Makefile.am (oln/x/29_Makefile.a 1.1 644))
- (olena/oln/lrde/ufmt/bin/fiorio.cc (oln/x/30_fiorio.cc 1.1 644))
-)
-(Merge-Parents
- (10.249 complete
- (ChangeLog ChangeLog ChangeLog r) (olena/oln/lrde/ufmt/bin/basic_salembier.cc olena/oln/lrde/ufmt/bin/basic_salembier.cc olena/oln/lrde/ufmt/bin/basic_salembier.cc r)
- (olena/oln/lrde/ufmt/log.hh olena/oln/lrde/ufmt/log.hh olena/oln/lrde/ufmt/log.hh r) (olena/oln/lrde/ufmt/ad_maxtree.hh olena/oln/lrde/ufmt/ai_maxtree.hh olena/oln/lrde/ufmt/ad_maxtree.hh r)
- (olena/oln/lrde/ufmt/hdc_maxtree.hh olena/oln/lrde/ufmt/si_maxtree.hh olena/oln/lrde/ufmt/hdc_maxtree.hh r) (olena/oln/lrde/ufmt/rpc_maxtree.hh olena/oln/lrde/ufmt/rup_maxtree.hh olena/oln/lrde/ufmt/rpc_maxtree.hh r)
- (olena/oln/lrde/ufmt/hpc_maxtree.hh olena/oln/lrde/ufmt/sp_maxtree.hh olena/oln/lrde/ufmt/hpc_maxtree.hh r) (olena/oln/lrde/ufmt/ap_maxtree.hh olena/oln/lrde/ufmt/ap_maxtree.hh olena/oln/lrde/ufmt/ap_maxtree.hh r)
- (olena/oln/lrde/ufmt/r1ic_maxtree.hh olena/oln/lrde/ufmt/r1_maxtree.hh olena/oln/lrde/ufmt/r1ic_maxtree.hh r) (olena/oln/lrde/ufmt/bin/rpc_maxtree.cc olena/oln/lrde/ufmt/bin/rup_maxtree.cc olena/oln/lrde/ufmt/bin/rpc_maxtree.cc r)
- (olena/oln/lrde/ufmt/bin/hdc_maxtree.cc olena/oln/lrde/ufmt/bin/si_maxtree.cc olena/oln/lrde/ufmt/bin/hdc_maxtree.cc r) (olena/oln/lrde/ufmt/bin/hpc_maxtree.cc olena/oln/lrde/ufmt/bin/sp_maxtree.cc olena/oln/lrde/ufmt/bin/hpc_maxtree.cc r)
- (olena/oln/lrde/ufmt/bin/r1ic_maxtree.cc olena/oln/lrde/ufmt/bin/r1_maxtree.cc olena/oln/lrde/ufmt/bin/r1ic_maxtree.cc r) (olena/oln/lrde/ufmt/README olena/oln/lrde/ufmt/README olena/oln/lrde/ufmt/README m))
+ (olena/oln/lrde/ufmt/bin/fiorio.cc (oln/x/30_fiorio.cc 1.2 644))
)
+(Merge-Parents)
(New-Merge-Parents)
18 years, 4 months
- 1
- 0
oln-0.10 10.250: Max-tree computation based on Fiorio's and Gustedt's labelling algorithm.
by Roland Levillain
It's only a first version, far from being optimized. Besides, it doesn't
include (yet) the latest ideas/variations on the algorithm discussed this
week.
2006-08-25 Roland Levillain <roland(a)lrde.epita.fr>
Max-tree computation based on Fiorio's and Gustedt's labelling
algorithm.
* oln/lrde/ufmt/fiorio-1.hh, oln/lrde/ufmt/fiorio-2.hh: New.
* oln/lrde/ufmt/bin/fiorio.cc: New.
* oln/lrde/ufmt/README: Update.
Make the the olena/oln/lrde/ufmt hierarchy a full-fledged part of
the autoconfiscated package.
* oln/lrde/Makefile.am, oln/lrde/ufmt/Makefile.am,
* oln/lrde/ufmt/bin/Makefile.am: New.
* TODO: New.
--- 10.249/olena/oln/lrde/ufmt/README Mon, 21 Aug 2006 17:17:14 +0200 theo (oln/x/22_README 1.2 644)
+++ 10.250/olena/oln/lrde/ufmt/README Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/x/22_README 1.3 644)
@@ -121,3 +121,17 @@
flooding
p as point2d
father as map<pair,pair>
+
+
+
+* fiorio
+Max-tree computation based on Fiorio's and Gustedt's labelling
+algorithm.
+
+** fiorio-1.hh
+My (Roland) first implementation of the max-tree computation using
+Fiorio's and Gustedt's algorithm.
+
+** fiorio-2.hh
+My second implementation of the max-tree computation using Fiorio's and
+Gustedt's algorithm, using routines of Tho's (anc, insert, etc.)
--- 10.249/olena/TODO Fri, 25 Aug 2006 18:01:35 +0200 levill_r ()
+++ 10.250/olena/TODO Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/x/24_TODO 1.1 644)
@@ -0,0 +1,3 @@
+TODO -*- outline -*-
+
+* Clean up oln/lrde.
--- 10.249/olena/oln/lrde/Makefile.am Fri, 25 Aug 2006 18:01:35 +0200 levill_r ()
+++ 10.250/olena/oln/lrde/Makefile.am Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/x/25_Makefile.a 1.1 644)
@@ -0,0 +1,9 @@
+## Process this file with Automake to produce Makefile.in -*- Makefile -*-
+
+## -- FIXME: Improve integration. ----------------------------------------
+##
+## The contents of `olena/lrde' should be moved to subdirectory of
+## `olena/oln', and the contents of `olena/lrde/ufmt/bin to `olena/tests'
+## or to `tools'.
+SUBDIRS = ufmt
+## ---------------------------------------- FIXME: Improve integration. --
--- 10.249/olena/oln/lrde/ufmt/Makefile.am Fri, 25 Aug 2006 18:01:35 +0200 levill_r ()
+++ 10.250/olena/oln/lrde/ufmt/Makefile.am Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/x/26_Makefile.a 1.1 644)
@@ -0,0 +1,28 @@
+## Process this file with Automake to produce Makefile.in -*- Makefile -*-
+
+## -- FIXME: Improve integration. ----------------------------------------
+##
+## The contents of `olena/lrde' should be moved to subdirectory of
+## `olena/oln', and the contents of `olena/lrde/ufmt/bin to `olena/tests'
+## or to `tools'.
+
+SUBDIRS = bin
+
+noinst_HEADERS = \
+ ad_maxtree.hh \
+ ap_maxtree.hh \
+ basic_maxtree.hh \
+ basic_salembier.hh \
+ fiorio-1.hh \
+ fiorio-2.hh \
+ hdc_maxtree.hh \
+ hpc_maxtree.hh \
+ log.hh \
+ r1ic_maxtree.hh \
+ rpc_maxtree.hh \
+ utils.hh
+
+EXTRA_DIST = README \
+ img/lena64nb.pgm img/lena64.pbm img/lena64.pgm img/lena6.pgm
+
+## ---------------------------------------- FIXME: Improve integration. --
--- 10.249/olena/oln/lrde/ufmt/fiorio-1.hh Fri, 25 Aug 2006 18:01:35 +0200 levill_r ()
+++ 10.250/olena/oln/lrde/ufmt/fiorio-1.hh Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/x/27_fiorio-1.h 1.1 644)
@@ -0,0 +1,322 @@
+// Copyright (C) 2006 EPITA Research and Development Laboratory
+//
+// This file is part of the Olena Library. This library is free
+// software; you can redistribute it and/or modify it under the terms
+// of the GNU General Public License version 2 as published by the
+// Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this library; see the file COPYING. If not, write to
+// the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+// Boston, MA 02111-1307, USA.
+//
+// As a special exception, you may use this file as part of a free
+// software library without restriction. Specifically, if other files
+// instantiate templates or use macros or inline functions from this
+// file, or you compile this file and link it with other files to
+// produce an executable, this file does not by itself cause the
+// resulting executable to be covered by the GNU General Public
+// License. This exception does not however invalidate any other
+// reasons why the executable file might be covered by the GNU General
+// Public License.
+
+
+/** \brief An adadpatation of Fiorio's and Gustedt's algorithm
+ (fiorio.96.tcs).
+
+ Ref.: Christophe Fiorio and Jens Gustedt. Two linear time
+ Union-Find strategies for image processing. Theoretical Computer
+ Science, 1996.
+
+ \note This is the original version of my implementation, that
+ started to work on August 25th, 2006. */
+
+
+#ifndef OLENA_LRDE_UFMT_FIORIO_HH
+# define OLENA_LRDE_UFMT_FIORIO_HH
+
+# include <algorithm>
+
+# include <oln/core/image2d.hh>
+# include <oln/level/fill.hh>
+
+namespace oln
+{
+ namespace lrde
+ {
+ namespace ufmt
+ {
+
+ // FIXME: Not generic (works only on 2-D images).
+ template <typename I>
+ class fiorio
+ {
+ typedef oln_point_type(I) point;
+ typedef oln_value_type(I) value;
+ typedef oln_iter_type(I) piter;
+ // typedef oln_neighborhood_type(I) Nbh;
+ // typedef oln_iter_type(Nbh) niter;
+ typedef typename mute<I, point>::ret parent_type;
+
+ // FIXME: Should be elsewhere!
+ typedef oln::image2d<unsigned> area_type;
+
+ public:
+ fiorio(const abstract::image<I>& ima) :
+ ima_(ima.exact().clone()), parent_(ima.size())
+ , n_level_roots_cpt_(ima.npoints())
+// , area_(ima_.size())
+ {
+ // Init the image of parents.
+ piter p (parent_);
+ for_all (p)
+ parent_[p] = p;
+
+ // FIXME: Should be elsewhere!
+ // Init the image of data.
+// oln::level::fill (area_, 1);
+ }
+
+ /// Entry point of the algorithm.
+ void go()
+ {
+ scan_line();
+ }
+
+
+ /// Images accessors.
+ /// \{
+ public:
+ const I& ima() const
+ {
+ return ima_;
+ }
+
+ const parent_type& parent() const
+ {
+ return parent_;
+ }
+ /// \}
+
+
+ /// Level roots.
+ /// \{
+ /// Get the number of level roots (method 1, using a counter
+ /// updated by the algorithm).
+ unsigned n_level_roots1() const
+ {
+ return n_level_roots_cpt_;
+ }
+
+ /// Get the number of level roots (method 2, computing from the
+ /// PARENT image.
+ unsigned n_level_roots2() const
+ {
+ unsigned n_level_roots = 0;
+ oln_iter_type(parent_type) p(parent_);
+ for_all (p)
+ if (is_level_root(p))
+ ++n_level_roots;
+ return n_level_roots;
+ }
+
+ /// The type of an image of level roots
+ typedef typename mute<parent_type, bool>::ret level_roots_image_type;
+
+ /// \brief Compute the image of level roots.
+ ///
+ /// A value of \a true means that the point is a level root in ima.
+ level_roots_image_type level_roots() const
+ {
+ // Image of level roots.
+ level_roots_image_type level_roots (ima_.size());
+ oln_iter_type(parent_type) p(ima_);
+ for_all (p)
+ level_roots[p] = is_level_root(p);
+ return level_roots;
+ }
+ /// \}
+
+
+ protected:
+ // Improve to handle other neighborhoods than 4-c.
+ void scan_line()
+ {
+ // Special treatment of the first line (no merge).
+ build_tree_of_line(0);
+ for (coord i = 1; i < ima_.nrows(); ++i)
+ {
+ build_tree_of_line(i);
+ // Merge the tree of the current line with the rest of the image.
+ merge_line(i);
+ }
+ }
+
+ void build_tree_of_line(coord row)
+ {
+ // Start at the second pixel (the first pixel has no left
+ // neighbor.
+ for (coord j = 1; j < ima_.ncols(); ++j)
+ {
+ point left = find_level_root(point(row, j - 1));
+ point this_one = point(row, j);
+ merge(left, this_one);
+ }
+ }
+
+ void merge_line(coord row)
+ {
+ precondition(row > 0);
+
+ // Special treatment of the pixel on the first column.
+ {
+ point p (row, 0);
+ point upper (row - 1, 0);
+ // Merge with upper pixel.
+ merge(p, upper);
+ }
+ for (coord col = 1; col < ima_.ncols(); ++col)
+ {
+ point p (row, col );
+ point upper (row - 1, col );
+ point left (row, col - 1);
+ // FIXME: Disabled, since /a priori/ useless.
+ // (Remove it?)
+#if 0
+ // Merge with left pixel.
+ merge(p, left);
+#endif
+ // Merge with upper pixel.
+ merge(p, upper);
+ }
+ }
+
+ // FIXME: Turn this recursive method into a loop!
+ // FIXME: Get rid of the swap, using an introductory method.
+ /// \note Th�o calls this method ``update'.
+ void merge(const point& p, const point& q)
+ {
+ point r = find_level_root(p);
+ point s = find_level_root(q);
+
+ // Stop the recursion when R and S are equal.
+ if (r == s)
+ return;
+
+ // Update the number of level roots.
+ if (ima_[r] == ima_[s])
+ --n_level_roots_cpt_;
+
+ // The rest of the routine assumes that R has a value
+ // greater or equal to S; swap them if needed.
+ if (ima_[r] < ima_[s])
+ std::swap(r, s);
+
+ point t = parent_[r];
+
+ // Join R and S only if S is higher than the parent of R.
+ if (r == t or ima_[s] > ima_[t])
+ parent_[r] = s;
+ // FIXME: Study whether the order (S, T) is important. That
+ // might be the case when S and T have the same value.
+ merge(t, s);
+ }
+
+ /// \note Th�o calls this function ``is_root'.
+ bool is_top(const point& p) const
+ {
+ return parent_[p] == p;
+ }
+
+ bool is_level_root(const point& p) const
+ {
+ return
+ is_top(p) ||
+ (ima_[parent_[p]] != ima_[p]);
+ }
+
+ /// \brief Find the level root of the component that P belongs to.
+ ///
+ /// Based on find_compress.
+ /// \note (This is my version.)
+ point find_level_root(const point& p)
+ {
+ // Path compression.
+ if (not is_top(p))
+ parent_[p] = find_level_root(parent_[p]);
+ // Is P a level root at the end the routine?
+ if (is_level_root(p))
+ return p;
+ else
+ return parent_[p];
+ }
+
+ protected:
+ /// \note Th�o calls this image ``f''.
+ I ima_;
+ /// \note Th�o calls this image ``par''.
+ parent_type parent_;
+ // Counter of level roots (method 1).
+ unsigned n_level_roots_cpt_;
+
+
+
+// ----------------------------------------------------------------
+
+// FIXME: Should be elsewhere!
+
+// public:
+// void area_opening (unsigned size)
+// {
+// oln_iter_type_(area_type) p(area_);
+
+// // First pass: sum areas.
+// for_all(p)
+// {
+// point p_parent = parent_[p];
+// while (p != p_parent)
+// {
+// area_[p_parent] += 1;
+// }
+// }
+
+// // Second pass: cut branches in the max-tree.
+// for_all(p)
+// merge(p, size);
+// }
+
+// protected:
+// // Attach P to Q.
+// // FIXME: The criterion should be passed as a function object.
+// point merge (const point& p, unsigned size)
+// {
+// if (not is_top(p) && area_[p] < size)
+// {
+// // Find the component satisfying the criterion.
+// point new_level_root = merge(parent_[p], size);
+// // Attach P to its new component representant (level root).
+// parent_[p] = new_level_root;
+// // Take the color of the new component.
+// ima_[p] = ima_[new_level_root];
+// return new_level_root;
+// }
+// else
+// return p;
+// }
+
+// protected:
+// area_type area_;
+ };
+
+ } // end of namespace oln::lrde::ufmt
+
+ } // end of namespace oln::lrde
+
+} // end of namespace oln
+
+#endif // ! OLENA_LRDE_UFMT_FIORIO_HH
--- 10.249/olena/oln/lrde/ufmt/fiorio-2.hh Fri, 25 Aug 2006 18:01:35 +0200 levill_r ()
+++ 10.250/olena/oln/lrde/ufmt/fiorio-2.hh Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/x/28_fiorio-2.h 1.1 644)
@@ -0,0 +1,351 @@
+// Copyright (C) 2006 EPITA Research and Development Laboratory
+//
+// This file is part of the Olena Library. This library is free
+// software; you can redistribute it and/or modify it under the terms
+// of the GNU General Public License version 2 as published by the
+// Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this library; see the file COPYING. If not, write to
+// the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+// Boston, MA 02111-1307, USA.
+//
+// As a special exception, you may use this file as part of a free
+// software library without restriction. Specifically, if other files
+// instantiate templates or use macros or inline functions from this
+// file, or you compile this file and link it with other files to
+// produce an executable, this file does not by itself cause the
+// resulting executable to be covered by the GNU General Public
+// License. This exception does not however invalidate any other
+// reasons why the executable file might be covered by the GNU General
+// Public License.
+
+
+/** \brief An adadpatation of Fiorio's and Gustedt's algorithm
+ (fiorio.96.tcs).
+
+ Ref.: Christophe Fiorio and Jens Gustedt. Two linear time
+ Union-Find strategies for image processing. Theoretical Computer
+ Science, 1996.
+
+ \note This is the second version of my implementation, augmented
+ with Th�o's (better) routines and ideas. */
+
+
+#ifndef OLENA_LRDE_UFMT_FIORIO_HH
+# define OLENA_LRDE_UFMT_FIORIO_HH
+
+# include <algorithm>
+
+# include <oln/core/image2d.hh>
+# include <oln/level/fill.hh>
+
+namespace oln
+{
+ namespace lrde
+ {
+ namespace ufmt
+ {
+
+ // FIXME: Not generic (works only on 2-D images).
+ template <typename I>
+ class fiorio
+ {
+ typedef oln_point_type(I) point;
+ typedef oln_value_type(I) value;
+ typedef oln_iter_type(I) piter;
+ // typedef oln_neighborhood_type(I) Nbh;
+ // typedef oln_iter_type(Nbh) niter;
+ typedef typename mute<I, point>::ret parent_type;
+
+ // FIXME: Should be elsewhere!
+ typedef oln::image2d<unsigned> area_type;
+
+ public:
+ fiorio(const abstract::image<I>& ima) :
+ ima_(ima.exact().clone()), parent_(ima.size())
+ , n_level_roots_cpt_(ima.npoints())
+// , area_(ima_.size())
+ {
+ // Init the image of parents.
+ piter p (parent_);
+ for_all (p)
+ parent_[p] = p;
+
+ // FIXME: Should be elsewhere!
+ // Init the image of data.
+// oln::level::fill (area_, 1);
+ }
+
+ /// Entry point of the algorithm.
+ void go()
+ {
+ scan_line();
+ }
+
+
+ /// Images accessors.
+ /// \{
+ public:
+ const I& ima() const
+ {
+ return ima_;
+ }
+
+ const parent_type& parent() const
+ {
+ return parent_;
+ }
+ /// \}
+
+
+ /// Level roots.
+ /// \{
+ /// Get the number of level roots (method 1, using a counter
+ /// updated by the algorithm).
+ unsigned n_level_roots1() const
+ {
+ return n_level_roots_cpt_;
+ }
+
+ /// Get the number of level roots (method 2, computing from the
+ /// PARENT image.
+ unsigned n_level_roots2() const
+ {
+ unsigned n_level_roots = 0;
+ oln_iter_type(parent_type) p(parent_);
+ for_all (p)
+ if (is_level_root(p))
+ ++n_level_roots;
+ return n_level_roots;
+ }
+
+ /// The type of an image of level roots
+ typedef typename mute<parent_type, bool>::ret level_roots_image_type;
+
+ /// \brief Compute the image of level roots.
+ ///
+ /// A value of \a true means that the point is a level root in ima.
+ level_roots_image_type level_roots() const
+ {
+ // Image of level roots.
+ level_roots_image_type level_roots (ima_.size());
+ oln_iter_type(parent_type) p(ima_);
+ for_all (p)
+ level_roots[p] = is_level_root(p);
+ return level_roots;
+ }
+ /// \}
+
+
+ protected:
+ // Improve to handle other neighborhoods than 4-c.
+ void scan_line()
+ {
+ // Special treatment of the first line (no merge).
+ build_tree_of_line(0);
+ for (coord i = 1; i < ima_.nrows(); ++i)
+ {
+ build_tree_of_line(i);
+ // Merge the tree of the current line with the rest of the image.
+ merge_line(i);
+ }
+ }
+
+ void build_tree_of_line(coord row)
+ {
+ // Start at the second pixel (the first pixel has no left
+ // neighbor.
+ for (coord j = 1; j < ima_.ncols(); ++j)
+ {
+ point left = find_level_root(point(row, j - 1));
+ point this_one = point(row, j);
+ insert(this_one, left);
+ }
+ }
+
+ void merge_line(coord row)
+ {
+ precondition(row > 0);
+
+ for (coord col = 0; col < ima_.ncols(); ++col)
+ {
+ point p (row, col );
+ point upper (row - 1, col );
+
+ // Note: merging with the left pixel is useless.
+
+ // Merge with upper pixel.
+ merge(p, upper);
+ }
+ }
+
+ /// Insert \a p in a tree of which \a n is a neighbor of \a p.
+ void insert(const point& p, const point& n)
+ {
+ point r = find_ancestor(n, ima_[p]);
+ if (ima_[r] <= ima_[p])
+ {
+ parent_[p] = r;
+ if (ima_[r] == ima_[p])
+ // Update the number of level roots.
+ --n_level_roots_cpt_;
+ }
+ else
+ {
+ if (not is_top(r))
+ parent_[p] = parent_[r];
+ parent_[r] = p;
+ }
+ }
+
+ /// Front-end to \a merge_.
+ void merge(const point& p, const point& q)
+ {
+ // The \a merge_ routine assumes that P has a value greater
+ // or equal to Q; swap them if needed.
+ if (ima_[p] >= ima_[q])
+ merge_(p, q);
+ else
+ merge_(q, p);
+ }
+
+ // FIXME: Turn this recursive method into a loop!
+ // FIXME: Get rid of the swap, using an introductory method.
+ /// \note Th�o calls this method ``update'.
+ void merge_(const point& p, const point& q)
+ {
+ precondition (p != q);
+ precondition (ima_[p] >= ima_[q]);
+
+ point r = find_ancestor(p, ima_[q]);
+ point s = find_level_root(q);
+
+ // Stop the recursion when R and S are equal (i.e., they are
+ // already merged).
+ if (r == s)
+ return;
+
+ // FIXME: Have a look at Th�o's ``update'' routine to see
+ // if we can improve this method.
+ // \{
+ point t = parent_[s];
+
+ if (ima_[s] == ima_[r])
+ {
+ parent_[s] = r;
+ // Update the number of level roots.
+ --n_level_roots_cpt_;
+ }
+ else
+ {
+ if (not is_top(r))
+ parent_[s] = parent_[r];
+ parent_[r] = s;
+ }
+ merge_(r, t);
+ }
+
+ /// \note Th�o calls this function ``is_root'.
+ bool is_top(const point& p) const
+ {
+ return parent_[p] == p;
+ }
+
+ bool is_level_root(const point& p) const
+ {
+ return
+ is_top(p) ||
+ (ima_[parent_[p]] != ima_[p]);
+ }
+
+ /// \brief Find the level root of the component that P belongs to.
+ /// \note From Th�o.
+ point find_level_root(const point& p)
+ {
+ // Is P a level root at the end the routine?
+ if (is_level_root(p))
+ return p;
+ else
+ // Path compression.
+ return parent_[p] = find_level_root(parent_[p]);
+ }
+
+ /// \note From Th�o.
+ /// \note Th�o calls this method ``anc''.
+ point find_ancestor(point p, const value& level)
+ {
+ while (not is_top(p) and ima_[parent_[p]] >= level)
+ p = find_level_root(parent_[p]);
+ return p;
+ }
+
+ protected:
+ /// \note Th�o calls this image ``f''.
+ I ima_;
+ /// \note Th�o calls this image ``par''.
+ parent_type parent_;
+ // Counter of level roots (method 1).
+ unsigned n_level_roots_cpt_;
+
+
+
+// ----------------------------------------------------------------
+
+// FIXME: Should be elsewhere!
+
+// public:
+// void area_opening (unsigned size)
+// {
+// oln_iter_type_(area_type) p(area_);
+
+// // First pass: sum areas.
+// for_all(p)
+// {
+// point p_parent = parent_[p];
+// while (p != p_parent)
+// {
+// area_[p_parent] += 1;
+// }
+// }
+
+// // Second pass: cut branches in the max-tree.
+// for_all(p)
+// merge(p, size);
+// }
+
+// protected:
+// // Attach P to Q.
+// // FIXME: The criterion should be passed as a function object.
+// point merge (const point& p, unsigned size)
+// {
+// if (not is_top(p) && area_[p] < size)
+// {
+// // Find the component satisfying the criterion.
+// point new_level_root = merge(parent_[p], size);
+// // Attach P to its new component representant (level root).
+// parent_[p] = new_level_root;
+// // Take the color of the new component.
+// ima_[p] = ima_[new_level_root];
+// return new_level_root;
+// }
+// else
+// return p;
+// }
+
+// protected:
+// area_type area_;
+ };
+
+ } // end of namespace oln::lrde::ufmt
+
+ } // end of namespace oln::lrde
+
+} // end of namespace oln
+
+#endif // ! OLENA_LRDE_UFMT_FIORIO_HH
--- 10.249/olena/oln/lrde/ufmt/bin/Makefile.am Fri, 25 Aug 2006 18:01:35 +0200 levill_r ()
+++ 10.250/olena/oln/lrde/ufmt/bin/Makefile.am Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/x/29_Makefile.a 1.1 644)
@@ -0,0 +1,18 @@
+AM_CXXFLAGS = -O3 -ggdb -Wall -Werror -ansi -pedantic
+AM_LDFLAGS = $(ZLIB_LDFLAGS)
+
+check_PROGRAMS = basic_maxtree basic_salembier fiorio-1 fiorio-2 \
+ hdc_maxtree hpc_maxtree r1ic_maxtree rpc_maxtree
+
+basic_maxtree_SOURCES = basic_maxtree.cc
+basic_salembier_SOURCES = basic_salembier.cc
+hdc_maxtree_SOURCES = hdc_maxtree.cc
+hpc_maxtree_SOURCES = hpc_maxtree.cc
+r1ic_maxtree_SOURCES = r1ic_maxtree.cc
+rpc_maxtree_SOURCES = rpc_maxtree.cc
+
+fiorio_1_SOURCES = fiorio.cc
+fiorio_2_SOURCES = fiorio.cc
+fiorio_2_CPPFLAGS = -DFIORIO_VERSION=2
+
+# FIXME: Write (runtime) tests!
--- 10.249/olena/oln/lrde/ufmt/bin/fiorio.cc Fri, 25 Aug 2006 18:01:35 +0200 levill_r ()
+++ 10.250/olena/oln/lrde/ufmt/bin/fiorio.cc Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/x/30_fiorio.cc 1.1 644)
@@ -0,0 +1,84 @@
+#include <cstdlib>
+
+#include <ntg/int.hh>
+#include <ntg/color/rgb.hh>
+
+#include <oln/basics2d.hh>
+#include <oln/level/fill.hh>
+
+// Max-tree computation base on Fiorio's and Gustedt's algorithm.
+#if defined(FIORIO_VERSION) && FIORIO_VERSION == 2
+# include <oln/lrde/ufmt/fiorio-2.hh>
+#else
+# include <oln/lrde/ufmt/fiorio-1.hh>
+#endif
+
+
+void usage(char* argv[])
+{
+ std::cerr << "usage: " << argv[0] << " input.pgm "//"level-roots.pbm"
+ << std::endl
+ << "Max-tree computation with Fiorio's and Gustedt's algorithm."
+ << std::endl;
+ // FIXME: get precise description...
+ exit(1);
+}
+
+
+int main(int argc, char* argv[])
+{
+// if (argc != 3)
+// usage(argv);
+ if (argc != 2)
+ usage(argv);
+
+ typedef oln::image2d<ntg::int_u8> image_type;
+
+ image_type input = oln::io::load(argv[1]);
+
+ typedef oln::lrde::ufmt::fiorio<image_type> algorithm_type;
+
+ algorithm_type run(input);
+ std::cout << "npoint = " << run.ima().npoints()
+ << std::endl;
+ run.go();
+ std::cout << "n level roots (first version) = " << run.n_level_roots1()
+ << std::endl
+ << "n level roots (second version) = " << run.n_level_roots2()
+ << std::endl;
+
+// // Save the image of level roots.
+// oln::save(run.level_roots(), argv[2]);
+
+#if 0
+ // Create an image of components.
+ image_type output (input.size());
+ oln::level::fill (output, 0);
+ unsigned color = 1;
+ oln_iter_type_(image_type) p(algo.parent());
+ for_all(p)
+ {
+ oln::point2d root = algo.parent()[p];
+ // Assign a color to the root point of the component if not yet
+ // done.
+ if (output[root] == 0)
+ output[root] = color;
+ // If P is not a root, assign it the color of its root.
+ if (p != root)
+ output[p] = output[root];
+
+ // Increment the color, handling overflows (sigh). This is
+ // quick and dirty, but allows us to view the output image
+ // easily.
+ color =
+ color >= 255 ?
+ 1 :
+ color + 1;
+ }
+#endif
+
+#if 0
+ algo.area_opening (5);
+ oln::io::save (algo.ima(), argv[2]);
+#endif
+}
--- 10.249/configure.ac Tue, 11 Jul 2006 15:25:21 +0200 levill_r (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.9 600)
+++ 10.250/configure.ac Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.10 600)
@@ -5,7 +5,7 @@
AC_INIT([Olena], OLN_VERSION, OLN_CONTACT, [olena])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_SRCDIR([config/oln.m4])
-AM_INIT_AUTOMAKE([1.7 no-define foreign dist-bzip2])
+AM_INIT_AUTOMAKE([1.9.5 no-define foreign dist-bzip2])
AC_CONFIG_HEADERS([config.h:config.hin])
# FIXME: maybe not the best way to do this
@@ -463,6 +463,16 @@
AC_SUBST([DOC_CPPFLAGS])
AC_SUBST([TOOLS_LDFLAGS])
+## -- FIXME: Improve integration. ----------------------------------------
+##
+## The contents of `olena/lrde' should be moved to subdirectory of
+## `olena/oln', and the contents of `olena/lrde/ufmt/bin to `olena/tests'
+## or to `tools'.
+AC_CONFIG_FILES([olena/oln/lrde/Makefile
+ olena/oln/lrde/ufmt/Makefile
+ olena/oln/lrde/ufmt/bin/Makefile])
+## ---------------------------------------- FIXME: Improve integration. --
+
AC_OUTPUT
if test "x$oln_cxxflags_clean" = xno; then
--- 10.249/olena/oln/Makefile.am Tue, 13 Apr 2004 13:53:26 +0200 palma_g (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7.1.1 600)
+++ 10.250/olena/oln/Makefile.am Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7.1.2 600)
@@ -10,3 +10,11 @@
olndir = $(includedir)/oln
nobase_oln_HEADERS = $(OLN_DEP)
+
+## -- FIXME: Improve integration. ----------------------------------------
+##
+## The contents of `olena/lrde' should be moved to subdirectory of
+## `olena/oln', and the contents of `olena/lrde/ufmt/bin to `olena/tests'
+## or to `tools'.
+SUBDIRS = . lrde/ufmt
+## ---------------------------------------- FIXME: Improve integration. --
--- 10.249/TODO Fri, 25 Aug 2006 18:01:35 +0200 levill_r ()
+++ 10.250/TODO Fri, 25 Aug 2006 17:56:35 +0200 levill_r (oln/x/23_TODO 1.1 644)
@@ -0,0 +1,3 @@
+TODO -*- outline -*-
+
+* Update the address of the FSF in Copyright notices (write a script)
--- 10.249/oln.prj
+++ 10.250/oln.prj
@@ -1,39 +1,27 @@
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Olena")
-(Project-Version oln 10 249)
-(Parent-Version oln 10 246)
-(Version-Log "2006-08-21 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
-
- Rename to conform to conventions given in the README file.
-
- * olena/oln/lrde/ufmt/README: Update.
- * olena/oln/lrde/ufmt/sp_maxtree.hh: Rename as...
- * olena/oln/lrde/ufmt/hpc_maxtree.hh: ...this.
- * olena/oln/lrde/ufmt/ai_maxtree.hh: Rename as...
- * olena/oln/lrde/ufmt/ad_maxtree.hh: ...this.
- * olena/oln/lrde/ufmt/si_maxtree.hh: Rename as...
- * olena/oln/lrde/ufmt/hdc_maxtree.hh: ...this.
- * olena/oln/lrde/ufmt/rup_maxtree.hh: Rename as...
- * olena/oln/lrde/ufmt/rpc_maxtree.hh: ...this.
- * olena/oln/lrde/ufmt/r1_maxtree.hh: Rename as...
- * olena/oln/lrde/ufmt/r1ic_maxtree.hh: ...this.
- * olena/oln/lrde/ufmt/bin/: Update.
-
- New versions with full compressed aux data.
-
- * olena/oln/lrde/ufmt/hdx_maxtree.hh: New.
- * olena/oln/lrde/ufmt/hpx_maxtree.hh: New.
- * olena/oln/lrde/ufmt/bin/hdx_maxtree.cc: New.
- * olena/oln/lrde/ufmt/bin/hpx_maxtree.cc: New.
-
- Bonus.
-
- * olena/oln/lrde/ufmt/bin/basic_salembier.cc: Add c2 case.
- ")
+(Project-Version oln 10 250)
+(Parent-Version oln 10 248)
+(Version-Log "2006-08-25 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Max-tree computation based on Fiorio's and Gustedt's labelling
+ algorithm.
+
+ * oln/lrde/ufmt/fiorio-1.hh, oln/lrde/ufmt/fiorio-2.hh: New.
+ * oln/lrde/ufmt/bin/fiorio.cc: New.
+ * oln/lrde/ufmt/README: Update.
+
+ Make the the olena/oln/lrde/ufmt hierarchy a full-fledged part of
+ the autoconfiscated package.
+
+ * oln/lrde/Makefile.am, oln/lrde/ufmt/Makefile.am,
+ * oln/lrde/ufmt/bin/Makefile.am: New.
+ * TODO: New.
+")
(New-Version-Log "")
-(Checkin-Time "Mon, 21 Aug 2006 17:17:14 +0200")
-(Checkin-Login theo)
+(Checkin-Time "Fri, 25 Aug 2006 17:56:35 +0200")
+(Checkin-Login levill_r)
;; diff-ignore tests/data/.*pbm$
;; diff-ignore .*\.pbm$
;; diff-ignore .*\.pgm$
@@ -62,6 +50,7 @@
"stamp-h\\([0-9]\\)\\?$"
"CVS/"
".cvsignore$"
+ "^_build"
"obsolete/"
"/obsolete/"
"autom4te.cache"
@@ -93,11 +82,15 @@
"^\\(.*/\\)\\?aclocal.m4$"
"/configure$"
"^configure$"
+ "^config\\.site$"
"utilities/morpho/morpho-rules.make$"
"doc/ref/filelists.make$"
"config.h\\(in\\)\\?$"
"doc/ref/ref-level.tex"
"doc/ref/ref-morpho.tex"
+ "^doc/ref/exdoc\\.mk$"
+ "^doc/ref/doxygen\\.config$"
+ "^doc/ref/out/exdoc\\.config$"
"utilities/.*\\.1$"
"^attic/"
"oln-"
@@ -119,6 +112,7 @@
"olena/img/lena16b.ppgm"
"olena/img/lena16b.pgm"
"^tools/swilena/src/.*\\.i"
+ "^tools/swilena/doc/swilena\\.info$"
"olena/img/lena1d.ppbm"
"olena/img/lena1d128.pgm"
"olena/img/lena1d.pppm"
@@ -132,21 +126,18 @@
"olena/img/lena1d16b.ppbm"
"\\.xvpics/"
"old/"
- "^config/config\\.sub$"
- "^doc/ref/exdoc\\.mk$"
- "^doc/ref/out/exdoc\\.config$"
- "^config/config\\.guess$"
- "^doc/ref/doxygen\\.config$"
+ "^libtool$"
"^config/ltmain\\.sh$"
- "^libtool$"))
+ "^config/config\\.guess$"
+ "^config/config\\.sub$"))
(Project-Keywords)
(Files
- (ChangeLog (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.28 600))
+ (ChangeLog (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.29 600))
(doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600))
(integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.51 600))
(metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600))
- (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.12 600))
+ (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.13 600))
(tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600))
(tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.48 600))
@@ -158,7 +149,7 @@
(cleanup.sh (oln/o/29_cleanup.sh 1.6 700))
- (configure.ac (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.9 600))
+ (configure.ac (oln/3_configure. 1.47.1.1.1.1.1.4.1.15.1.16.1.10 600))
(doc/demo/image.cc (oln/d/46_image.cc 1.8 600))
(doc/demo/Makefile.am (oln/d/44_Makefile.a 1.16.1.2 600))
@@ -823,7 +814,7 @@
(integre/tests/check/defs.in (oln/q/42_defs.in 1.1 600))
(metalic/mlc/array/objs.hh (oln/q/45_objs.hh 1.3 600))
(metalic/mlc/config/system.hh (oln/q/46_system.hh 1.2 600))
- (olena/oln/Makefile.am (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7.1.1 600))
+ (olena/oln/Makefile.am (oln/q/47_Makefile.a 1.3.1.1.1.6.1.7.1.7.1.2 600))
(integre/ntg/config/system.hh (oln/q/48_system.hh 1.2 600))
(metalic/tests/main/tests/is_a1 (oln/r/17_is_a1 1.4 600))
(metalic/tests/main/tests/ensure3 (oln/r/18_ensure3 1.4 600))
@@ -1582,7 +1573,7 @@
- (olena/oln/lrde/ufmt/README (oln/x/22_README 1.2 644))
+ (olena/oln/lrde/ufmt/README (oln/x/22_README 1.3 644))
;; Files deleted by depopulate at Fri, 04 Aug 2006 18:41:16 +0200,
;; from version 10.245(w), by theo:
@@ -1593,18 +1584,38 @@
; (olena/oln/lrde/ufmt/bin/exe/rup_maxtree () :no-keywords)
; (olena/oln/lrde/ufmt/bin/exe/basic_salembier () :no-keywords)
; (olena/oln/lrde/ufmt/bin/exe/basic_maxtree () :no-keywords)
+
+;; Files deleted by depopulate at Thu, 17 Aug 2006 10:46:05 +0200,
+;; from version 10.246(w), by levill_r:
+
+ ; (libtool ())
+ ; (config/ltmain.sh ())
+ ; (config/config.sub ())
+ ; (config/config.guess ())
+ ; (doc/ref/exdoc.mk ())
+ ; (doc/ref/doxygen.config ())
+ ; (doc/ref/out/exdoc.config ())
+
+;; Files added by populate at Fri, 25 Aug 2006 17:30:22 +0200,
+;; to version 10.248(w), by levill_r:
+
+ (TODO (oln/x/23_TODO 1.1 644))
+ (olena/TODO (oln/x/24_TODO 1.1 644))
+ (olena/oln/lrde/Makefile.am (oln/x/25_Makefile.a 1.1 644))
+ (olena/oln/lrde/ufmt/Makefile.am (oln/x/26_Makefile.a 1.1 644))
+ (olena/oln/lrde/ufmt/fiorio-1.hh (oln/x/27_fiorio-1.h 1.1 644))
+ (olena/oln/lrde/ufmt/fiorio-2.hh (oln/x/28_fiorio-2.h 1.1 644))
+ (olena/oln/lrde/ufmt/bin/Makefile.am (oln/x/29_Makefile.a 1.1 644))
+ (olena/oln/lrde/ufmt/bin/fiorio.cc (oln/x/30_fiorio.cc 1.1 644))
)
(Merge-Parents
- (10.248 incomplete)
- (10.248 incomplete)
- (10.248 complete
- (ChangeLog ChangeLog ChangeLog r) (doc/ChangeLog doc/ChangeLog doc/ChangeLog r)
- (integre/ChangeLog integre/ChangeLog integre/ChangeLog r) (metalic/ChangeLog metalic/ChangeLog metalic/ChangeLog r)
- (olena/ChangeLog olena/ChangeLog olena/ChangeLog r) (tools/swilena/ChangeLog tools/swilena/ChangeLog tools/swilena/ChangeLog r)
- (libtool libtool () d) (config/ltmain.sh config/ltmain.sh () d)
- (config/config.sub config/config.sub () d) (config/config.guess config/config.guess () d)
- (doc/ref/exdoc.mk doc/ref/exdoc.mk () d) (doc/ref/doxygen.config doc/ref/doxygen.config () d)
- (doc/ref/out/exdoc.config doc/ref/out/exdoc.config () d)
- )
+ (10.249 complete
+ (ChangeLog ChangeLog ChangeLog r) (olena/oln/lrde/ufmt/bin/basic_salembier.cc olena/oln/lrde/ufmt/bin/basic_salembier.cc olena/oln/lrde/ufmt/bin/basic_salembier.cc r)
+ (olena/oln/lrde/ufmt/log.hh olena/oln/lrde/ufmt/log.hh olena/oln/lrde/ufmt/log.hh r) (olena/oln/lrde/ufmt/ad_maxtree.hh olena/oln/lrde/ufmt/ai_maxtree.hh olena/oln/lrde/ufmt/ad_maxtree.hh r)
+ (olena/oln/lrde/ufmt/hdc_maxtree.hh olena/oln/lrde/ufmt/si_maxtree.hh olena/oln/lrde/ufmt/hdc_maxtree.hh r) (olena/oln/lrde/ufmt/rpc_maxtree.hh olena/oln/lrde/ufmt/rup_maxtree.hh olena/oln/lrde/ufmt/rpc_maxtree.hh r)
+ (olena/oln/lrde/ufmt/hpc_maxtree.hh olena/oln/lrde/ufmt/sp_maxtree.hh olena/oln/lrde/ufmt/hpc_maxtree.hh r) (olena/oln/lrde/ufmt/ap_maxtree.hh olena/oln/lrde/ufmt/ap_maxtree.hh olena/oln/lrde/ufmt/ap_maxtree.hh r)
+ (olena/oln/lrde/ufmt/r1ic_maxtree.hh olena/oln/lrde/ufmt/r1_maxtree.hh olena/oln/lrde/ufmt/r1ic_maxtree.hh r) (olena/oln/lrde/ufmt/bin/rpc_maxtree.cc olena/oln/lrde/ufmt/bin/rup_maxtree.cc olena/oln/lrde/ufmt/bin/rpc_maxtree.cc r)
+ (olena/oln/lrde/ufmt/bin/hdc_maxtree.cc olena/oln/lrde/ufmt/bin/si_maxtree.cc olena/oln/lrde/ufmt/bin/hdc_maxtree.cc r) (olena/oln/lrde/ufmt/bin/hpc_maxtree.cc olena/oln/lrde/ufmt/bin/sp_maxtree.cc olena/oln/lrde/ufmt/bin/hpc_maxtree.cc r)
+ (olena/oln/lrde/ufmt/bin/r1ic_maxtree.cc olena/oln/lrde/ufmt/bin/r1_maxtree.cc olena/oln/lrde/ufmt/bin/r1ic_maxtree.cc r) (olena/oln/lrde/ufmt/README olena/oln/lrde/ufmt/README olena/oln/lrde/ufmt/README m))
)
(New-Merge-Parents)
18 years, 4 months
- 1
- 0
oln-0.10 10.249: Renaming in olena/oln/lrde/ufmt/.
by Thierry GERAUD
hop
Index: 10.246/oln.prj
--- 10.246/oln.prj
+++ 10.246(w)/oln.prj
@@ -76,7 +76,7 @@
"diffs.patch$"
"/Makefile.in$"
"^Makefile.in$"
- "/makefile.swig"
+ "/makefile.swig"
"/\\(py-compile\\|missing\\|install-sh\\|mkinstalldirs\\|depcomp\\|mdate-sh\\)$"
"\\(texinfo\\.tex\\)$"
"^\\(.*/\\)\\?aclocal.m4$"
@@ -120,17 +120,24 @@
"olena/img/lena1d.pbm"
"olena/img/lena1d16b.ppbm"
"\\.xvpics/"
- "old/"))
+ "old/"
+ "^config/config\\.sub$"
+ "^doc/ref/exdoc\\.mk$"
+ "^doc/ref/out/exdoc\\.config$"
+ "^config/config\\.guess$"
+ "^doc/ref/doxygen\\.config$"
+ "^config/ltmain\\.sh$"
+ "^libtool$"))
(Project-Keywords)
(Files
- (ChangeLog (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.26 600))
- (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.16 600))
- (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.50 600))
- (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.43 600))
- (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.11 600))
+ (ChangeLog (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.27 600))
+ (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600))
+ (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.51 600))
+ (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600))
+ (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.12 600))
(tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600))
- (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.47 600))
+ (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.48 600))
(olena/ChangeLog.0 (oln/6_ChangeLog 1.50.1.98.1.5 600))
(doc/ChangeLog.0 (oln/e/1_ChangeLog 1.31 600))
@@ -1526,10 +1533,10 @@
;; Files added by populate at Thu, 03 Aug 2006 15:59:48 +0200,
;; to version 10.244(w), by theo:
- (libtool (oln/w/47_libtool 1.1 755))
- (config/ltmain.sh (oln/w/48_ltmain.sh 1.1 644))
- (config/config.sub (oln/w/49_config.sub 1.1 755))
- (config/config.guess (oln/w/50_config.gue 1.1 755))
+
+
+
+
(olena/oln/lrde/ufmt/basic_salembier.hh (oln/w/51_basic_sale 1.1 644))
(olena/oln/lrde/ufmt/bin/basic_maxtree.cc (oln/x/0_basic_maxt 1.2 644))
(olena/oln/lrde/ufmt/bin/basic_salembier.cc (oln/x/1_basic_sale 1.1 644))
@@ -1541,23 +1548,23 @@
(olena/oln/lrde/ufmt/img/lena64.pgm (oln/x/6_lena64.pgm 1.1 644))
(olena/oln/lrde/ufmt/img/lena6.pgm (oln/x/7_lena6.pgm 1.1 644))
(olena/oln/lrde/ufmt/utils.hh (oln/x/8_utils.hh 1.2 644))
- (doc/ref/exdoc.mk (oln/x/9_exdoc.mk 1.1 644))
- (doc/ref/doxygen.config (oln/x/10_doxygen.co 1.1 644))
- (doc/ref/out/exdoc.config (oln/x/11_exdoc.conf 1.1 644))
+
+
+
;; Files added by populate at Fri, 04 Aug 2006 18:38:31 +0200,
;; to version 10.245(w), by theo:
- (olena/oln/lrde/ufmt/ai_maxtree.hh (oln/x/12_ai_maxtree 1.1 644))
- (olena/oln/lrde/ufmt/si_maxtree.hh (oln/x/13_si_maxtree 1.1 644))
- (olena/oln/lrde/ufmt/rup_maxtree.hh (oln/x/14_rup_maxtre 1.1 644))
- (olena/oln/lrde/ufmt/sp_maxtree.hh (oln/x/15_sp_maxtree 1.1 644))
+ (olena/oln/lrde/ufmt/ad_maxtree.hh (oln/x/12_ai_maxtree 1.1 644))
+ (olena/oln/lrde/ufmt/hdc_maxtree.hh (oln/x/13_si_maxtree 1.1 644))
+ (olena/oln/lrde/ufmt/rpc_maxtree.hh (oln/x/14_rup_maxtre 1.1 644))
+ (olena/oln/lrde/ufmt/hpc_maxtree.hh (oln/x/15_sp_maxtree 1.1 644))
(olena/oln/lrde/ufmt/ap_maxtree.hh (oln/x/16_ap_maxtree 1.1 644))
- (olena/oln/lrde/ufmt/r1_maxtree.hh (oln/x/17_r1_maxtree 1.1 644))
- (olena/oln/lrde/ufmt/bin/rup_maxtree.cc (oln/x/18_rup_maxtre 1.1 644))
- (olena/oln/lrde/ufmt/bin/si_maxtree.cc (oln/x/19_si_maxtree 1.1 644))
- (olena/oln/lrde/ufmt/bin/sp_maxtree.cc (oln/x/20_sp_maxtree 1.1 644))
- (olena/oln/lrde/ufmt/bin/r1_maxtree.cc (oln/x/21_r1_maxtree 1.1 644))
+ (olena/oln/lrde/ufmt/r1ic_maxtree.hh (oln/x/17_r1_maxtree 1.1 644))
+ (olena/oln/lrde/ufmt/bin/rpc_maxtree.cc (oln/x/18_rup_maxtre 1.1 644))
+ (olena/oln/lrde/ufmt/bin/hdc_maxtree.cc (oln/x/19_si_maxtree 1.1 644))
+ (olena/oln/lrde/ufmt/bin/hpc_maxtree.cc (oln/x/20_sp_maxtree 1.1 644))
+ (olena/oln/lrde/ufmt/bin/r1ic_maxtree.cc (oln/x/21_r1_maxtree 1.1 644))
@@ -1579,4 +1586,16 @@
(Merge-Parents
(10.245 complete)
)
-(New-Merge-Parents)
+(New-Merge-Parents
+ (10.248 incomplete)
+ (10.248 incomplete)
+ (10.248 complete
+ (ChangeLog ChangeLog ChangeLog r) (doc/ChangeLog doc/ChangeLog doc/ChangeLog r)
+ (integre/ChangeLog integre/ChangeLog integre/ChangeLog r) (metalic/ChangeLog metalic/ChangeLog metalic/ChangeLog r)
+ (olena/ChangeLog olena/ChangeLog olena/ChangeLog r) (tools/swilena/ChangeLog tools/swilena/ChangeLog tools/swilena/ChangeLog r)
+ (libtool libtool () d) (config/ltmain.sh config/ltmain.sh () d)
+ (config/config.sub config/config.sub () d) (config/config.guess config/config.guess () d)
+ (doc/ref/exdoc.mk doc/ref/exdoc.mk () d) (doc/ref/doxygen.config doc/ref/doxygen.config () d)
+ (doc/ref/out/exdoc.config doc/ref/out/exdoc.config () d)
+ )
+)
Index: 10.246/ChangeLog
--- 10.246/ChangeLog Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.26 600)
+++ 10.246(w)/ChangeLog Mon, 21 Aug 2006 17:06:44 +0200 theo (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.27 600)
@@ -1,41 +1,3 @@
-2006-08-04 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
-
- Factor some code in oln/lrde/ufmt/; add video raster scan
- algorithms and some versions with points as indices.
-
- * olena/oln/lrde/ufmt/README: New.
- * olena/oln/lrde/ufmt/basic_maxtree.hh: Move some parts into...
- * olena/oln/lrde/ufmt/ap_maxtree.hh: ...this new file.
- * olena/oln/lrde/ufmt/sp_maxtree.hh: New.
- * olena/oln/lrde/ufmt/ai_maxtree.hh: New.
- * olena/oln/lrde/ufmt/si_maxtree.hh: New.
- * olena/oln/lrde/ufmt/rup_maxtree.hh: New.
- * olena/oln/lrde/ufmt/bin/sp_maxtree.cc: New.
- * olena/oln/lrde/ufmt/bin/si_maxtree.cc: New.
- * olena/oln/lrde/ufmt/bin/rup_maxtree.cc: New.
- * olena/oln/lrde/ufmt/bin/r1_maxtree.cc: New.
-
-2006-08-03 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
-
- Add some first code corresponding to an LRDE publication about
- union-find and max-tree.
-
- * olena/oln/lrde: New directory for code related to LRDE
- publications.
- * olena/oln/lrde/ufmt: New directory specific to union-find and
- max-tree.
- * olena/oln/lrde/ufmt/log.hh: New.
- * olena/oln/lrde/ufmt/utils.hh: New.
- * olena/oln/lrde/ufmt/basic_maxtree.hh: New.
- * olena/oln/lrde/ufmt/basic_salembier.hh: New.
- * olena/oln/lrde/ufmt/bin: New directory for corresponding
- bin source.
- * olena/oln/lrde/ufmt/bin/basic_maxtree.cc: New.
- * olena/oln/lrde/ufmt/bin/basic_salembier.cc: New.
- * olena/oln/lrde/ufmt/img: New directory for tiny test images.
- * olena/oln/lrde/ufmt/img/lena6.pgm: New image file.
- * olena/oln/lrde/ufmt/img/lena64.pgm: Likewise.
-
2006-07-11 Roland Levillain <roland(a)lrde.epita.fr>
Use Libtool.
Index: 10.246/doc/ChangeLog
--- 10.246/doc/ChangeLog Fri, 09 Jul 2004 15:37:35 +0200 palma_g (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.16 600)
+++ 10.246(w)/doc/ChangeLog Mon, 21 Aug 2006 17:06:48 +0200 theo (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600)
@@ -65,8 +65,8 @@
2004-04-09 Damien Thivolle <damien(a)lrde.epita.fr>
- * doc/ref/Makefile.am: Use `clean-local' and `distclean-local' to delete
- files.
+ * doc/ref/Makefile.am: Use `clean-local' and `distclean-local' to
+ delete files.
* doc/ref/out/exdoc.config.in: Add `DOC_CPPFLAGS' to the compilation
flags.
@@ -151,7 +151,7 @@
2003-08-26 Geoffroy Fouquier <Geoffroy.Fouquier(a)lrde.epita.fr>
- * dev/oln-dev.texi: fix.
+ * dev/oln-dev.texi: fix.
2003-08-25 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
@@ -499,7 +499,8 @@
* configure.ac: Adjust Olena source path. Use AC_CXX_FLAGS instead
of AC_WITH_CXX_WARNINGS. Use AC_CONFIG_FILES again.
- * Makefile.am: Comment. Correct @OLN_DOC_SUBDIRS@ to $(OLN_DOC_SUBDIRS).
+ * Makefile.am: Comment. Correct @OLN_DOC_SUBDIRS@ to
+ $(OLN_DOC_SUBDIRS).
2003-01-15 Akim Demaille <akim(a)epita.fr>
@@ -525,7 +526,8 @@
2002-12-12 Raphaël Poss <raph(a)lrde.epita.fr>
- * demo/Makefile.am (check_PROGRAMS): Now use OLN_CPPFLAGS and OLN_CXXFLAGS.
+ * demo/Makefile.am (check_PROGRAMS): Now use OLN_CPPFLAGS and
+ OLN_CXXFLAGS.
* doc/Makefile.am (COMMONGETDEFSFLAGS): Likewise. Use OLN_IMG_DIR
and DEFS, too.
Index: 10.246/integre/ChangeLog
--- 10.246/integre/ChangeLog Wed, 05 Jul 2006 18:07:27 +0200 levill_r (oln/q/35_ChangeLog 1.12.1.2.1.50 600)
+++ 10.246(w)/integre/ChangeLog Mon, 21 Aug 2006 17:06:51 +0200 theo (oln/q/35_ChangeLog 1.12.1.2.1.51 600)
@@ -11,7 +11,7 @@
* tests/types/tests/float_r2, tests/types/tests/range2,
* tests/types/tests/range2b: Fix tests.
-
+
2005-09-15 Roland Levillain <roland(a)lrde.epita.fr>
Adjust for G++ 4.0.
@@ -38,11 +38,11 @@
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
- * integre/tests/sanity/Makefile.am: Replace maintainer-check by check.
+ * tests/sanity/Makefile.am: Replace maintainer-check by check.
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
- * integre/ntg/core/internal/traits.hh: Include headers so as to pass
+ * ntg/core/internal/traits.hh: Include headers so as to pass
sanity check.
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
@@ -64,13 +64,15 @@
* ntg/makefile.src: Add file.
2004-03-30 Niels Van Vliet <niels(a)lrde.epita.fr>
- * integre/ntg/core/pred_succ.hh: Add default_less.
- * integre/ntg/color/color.hh: Add default_less specialization.
+
+ * ntg/core/pred_succ.hh: Add default_less.
+ * ntg/color/color.hh: Add default_less specialization.
2004-03-26 Niels Van Vliet <niels(a)lrde.epita.fr>
- * integre/ntg/core/macros.hh: Add macros ntg_if_vectorial_nb_comp and
+
+ * ntg/core/macros.hh: Add macros ntg_if_vectorial_nb_comp and
ntg_compare_nb_comp.
- * integre/tests/types/tests/ntg_compare_nb_comp: Add file.
+ * tests/types/tests/ntg_compare_nb_comp: Add file.
2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -82,13 +84,13 @@
2004-03-19 Niels Van Vliet <niels(a)lrde.epita.fr>
- * integre/ntg/core/pred_succ.hh: Add file.
- * integre/ntg/Makefile.am: Add file references.
+ * ntg/core/pred_succ.hh: Add file.
+ * ntg/Makefile.am: Add file references.
2004-03-18 Niels Van Vliet <niels(a)lrde.epita.fr>
- * integre/ntg/real/behavior.hh: Change the unsafe::get<T>::check().
- * integre/ntg/utils/cast.hh: Change cast::force().
+ * ntg/real/behavior.hh: Change the unsafe::get<T>::check().
+ * ntg/utils/cast.hh: Change cast::force().
2004-02-09 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -237,18 +239,18 @@
2003-07-30 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
- * ntg/utils/cast.hh: Fix compilation with g++ 3.4.
- * ntg/utils/debug.hh: Likewise.
- * ntg/core/internal/global_ops_defs.hh: Likewise.
- * ntg/core/internal/global_ops.hh: Likewise.
- * ntg/color/nrgb.hh: Likewise.
- * ntg/real/optraits_builtin_int.hh: Likewise.
- * ntg/real/optraits_scalar.hh: Likewise.
- * ntg/real/typetraits_builtin_int.hh: Likewise.
- * tests/utils/tests/debug1: Likewise.
- * ntg/core/contract.hh: Likewise.
- * ntg/vect/vec.hh: Likewise.
- * ntg/vect/cplx.hh: Likewise.
+ * ntg/utils/cast.hh: Fix compilation with g++ 3.4.
+ * ntg/utils/debug.hh: Likewise.
+ * ntg/core/internal/global_ops_defs.hh: Likewise.
+ * ntg/core/internal/global_ops.hh: Likewise.
+ * ntg/color/nrgb.hh: Likewise.
+ * ntg/real/optraits_builtin_int.hh: Likewise.
+ * ntg/real/optraits_scalar.hh: Likewise.
+ * ntg/real/typetraits_builtin_int.hh: Likewise.
+ * tests/utils/tests/debug1: Likewise.
+ * ntg/core/contract.hh: Likewise.
+ * ntg/vect/vec.hh: Likewise.
+ * ntg/vect/cplx.hh: Likewise.
2003-07-28 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
@@ -733,18 +735,17 @@
2003-03-03 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
- * integre/ntg/behaviour.hh, integre/ntg/global_ops_traits.hh,
+ * ntg/behaviour.hh, integre/ntg/global_ops_traits.hh,
integre/ntg/optraits_cplx.hh, integre/ntg/optraits_int_s.hh,
integre/ntg/optraits_vec.hh: Update includes.
- * integre/ntg/cycle.hh, integre/ntg/global_ops.hh,
+ * ntg/cycle.hh, integre/ntg/global_ops.hh,
integre/ntg/optraits_cplx.hh, integre/ntg/optraits_cycle.hh,
integre/ntg/optraits_int_s.hh, integre/ntg/range.hh,
integre/ntg/behaviour.hh, integre/ntg/cplx.hh,
integre/ntg/optraits_scalar.hh, integre/ntg/optraits_vec.hh:
Likewise.
-
2003-03-02 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
* tests/Makefile.am: Add check/defs.in into EXTRA_DIST.
Index: 10.246/metalic/ChangeLog
--- 10.246/metalic/ChangeLog Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/q/30_ChangeLog 1.3.1.43 600)
+++ 10.246(w)/metalic/ChangeLog Mon, 21 Aug 2006 17:06:56 +0200 theo (oln/q/30_ChangeLog 1.3.1.44 600)
@@ -4,7 +4,7 @@
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
- * metalic/tests/sanity/Makefile.am: Replace maintainer-check by check.
+ * tests/sanity/Makefile.am: Replace maintainer-check by check.
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
@@ -50,25 +50,25 @@
2003-08-07 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
- * mlc/contract.hh: Fix coding style.
- * mlc/objs.hh: Likewise.
- * mlc/typeadj.hh: Likewise.
- * mlc/type.hh: Likewise.
- * mlc/array/1d.hh: Likewise.
- * mlc/array/1d.hxx: Likewise.
- * mlc/array/2d.hh: Likewise.
- * mlc/array/2d.hxx: Likewise.
- * mlc/array/3d.hh: Likewise.
- * mlc/array/3d.hxx: Likewise.
- * mlc/array/nd.hh: Likewise.
- * mlc/bool.hh: Likewise.
- * mlc/cmp.hh: Likewise.
- * mlc/optional.hh: Likewise.
- * mlc/is_a.hh: Likewise.
- * mlc/math.hh: Likewise.
- * mlc/array/objs.hh: Likewise.
- * tests/main/tests/ensure3: Likewise.
- * tests/main/tests/ensure2: Likewise.
+ * mlc/contract.hh: Fix coding style.
+ * mlc/objs.hh: Likewise.
+ * mlc/typeadj.hh: Likewise.
+ * mlc/type.hh: Likewise.
+ * mlc/array/1d.hh: Likewise.
+ * mlc/array/1d.hxx: Likewise.
+ * mlc/array/2d.hh: Likewise.
+ * mlc/array/2d.hxx: Likewise.
+ * mlc/array/3d.hh: Likewise.
+ * mlc/array/3d.hxx: Likewise.
+ * mlc/array/nd.hh: Likewise.
+ * mlc/bool.hh: Likewise.
+ * mlc/cmp.hh: Likewise.
+ * mlc/optional.hh: Likewise.
+ * mlc/is_a.hh: Likewise.
+ * mlc/math.hh: Likewise.
+ * mlc/array/objs.hh: Likewise.
+ * tests/main/tests/ensure3: Likewise.
+ * tests/main/tests/ensure2: Likewise.
2003-08-06 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
@@ -267,7 +267,7 @@
2003-03-03 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
* mlc/array1d.hh, mlc/array2d.hh, mlc/array3d.hh: Update
- includes.
+ includes.
* mlc/is_a.hh: Likewise.
Index: 10.246/olena/ChangeLog
--- 10.246/olena/ChangeLog Wed, 05 Jul 2006 18:22:20 +0200 levill_r (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.11 600)
+++ 10.246(w)/olena/ChangeLog Mon, 21 Aug 2006 17:06:56 +0200 theo (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.12 600)
@@ -1,3 +1,41 @@
+2006-08-04 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
+
+ Factor some code in oln/lrde/ufmt/; add video raster scan
+ algorithms and some versions with points as indices.
+
+ * oln/lrde/ufmt/README: New.
+ * oln/lrde/ufmt/basic_maxtree.hh: Move some parts into...
+ * oln/lrde/ufmt/ap_maxtree.hh: ...this new file.
+ * oln/lrde/ufmt/sp_maxtree.hh: New.
+ * oln/lrde/ufmt/ai_maxtree.hh: New.
+ * oln/lrde/ufmt/si_maxtree.hh: New.
+ * oln/lrde/ufmt/rup_maxtree.hh: New.
+ * oln/lrde/ufmt/bin/sp_maxtree.cc: New.
+ * oln/lrde/ufmt/bin/si_maxtree.cc: New.
+ * oln/lrde/ufmt/bin/rup_maxtree.cc: New.
+ * oln/lrde/ufmt/bin/r1_maxtree.cc: New.
+
+2006-08-03 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
+
+ Add some first code corresponding to an LRDE publication about
+ union-find and max-tree.
+
+ * oln/lrde: New directory for code related to LRDE
+ publications.
+ * oln/lrde/ufmt: New directory specific to union-find and
+ max-tree.
+ * oln/lrde/ufmt/log.hh: New.
+ * oln/lrde/ufmt/utils.hh: New.
+ * oln/lrde/ufmt/basic_maxtree.hh: New.
+ * oln/lrde/ufmt/basic_salembier.hh: New.
+ * oln/lrde/ufmt/bin: New directory for corresponding
+ bin source.
+ * oln/lrde/ufmt/bin/basic_maxtree.cc: New.
+ * oln/lrde/ufmt/bin/basic_salembier.cc: New.
+ * oln/lrde/ufmt/img: New directory for tiny test images.
+ * oln/lrde/ufmt/img/lena6.pgm: New image file.
+ * oln/lrde/ufmt/img/lena64.pgm: Likewise.
+
2006-07-05 Roland Levillain <roland(a)lrde.epita.fr>
Fix sanity tests.
@@ -156,10 +194,14 @@
2004-07-09 Giovanni Palma <giovanni(a)lrde.epita.fr>
* oln/utils/qsort.hh: Correct comparison operators.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3: Correct test.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2: Remove file.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3: Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3:
+ Correct test.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2:
+ Remove file.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3:
+ Likewise.
* oln/morpho/attributes.hh: Make code use ntg macros.
* oln/morpho/attribute_union_find.hh: Add a static if for sort choice.
* oln/morpho/attribute_closing_opening.hh: Add prototypes.
@@ -215,8 +257,10 @@
* oln/basics.hh: Add behavior.hh.
* oln/core/behavior.hh: Add an empty constructor for any_with_diamond.
* oln/makefile.src: Add border morpher file.
- * oln/convol/fast_convolution.hh: Use border morpher, fix the size problem.
- * tests/convol/tests/fast_convol: Improve test comparing with slow version.
+ * oln/convol/fast_convolution.hh: Use border morpher, fix the size
+ problem.
+ * tests/convol/tests/fast_convol: Improve test comparing with slow
+ version.
* oln/morpher/border_morpher.hh: Border morpher.
* tests/morpher/tests/border: Test border morpher.
@@ -240,7 +284,8 @@
* oln/convol/fast_convolution.hh: Clean code.
* oln/convol/slow_gaussian.hxx: Fix too generic parameter.
* oln/convol/slow_gaussian.hh: Fix delta computation.
- * oln/convol/fast_gaussian.hxx: Use cast::bound instead of cast::force.
+ * oln/convol/fast_gaussian.hxx: Use cast::bound instead of
+ cast::force.
* oln/convol/slow_convolution.hh: Clean code.
2004-06-14 Simon Odou <simon(a)lrde.epita.fr>
@@ -261,17 +306,19 @@
* tests/convol/tests/fast_convol: New.
2004-06-13 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/tests/convol/tests/slow_gaussian: New file.
+
+ * tests/convol/tests/slow_gaussian: New file.
2004-06-09 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/core/abstract/behavior.hh (adapt_border): Change
+
+ * oln/core/abstract/behavior.hh (adapt_border): Change
constness of the image modified to const.
- * olena/oln/core/behavior.hh: Likewise.
- * olena/oln/convol/slow_gaussian.hh: Add behavior. Remove parameter
+ * oln/core/behavior.hh: Likewise.
+ * oln/convol/slow_gaussian.hh: Add behavior. Remove parameter
mu. Add doc and example. Add radius_factor.
- * olena/oln/convol/slow_gaussian.hxx: Clean code. Remove parameter
+ * oln/convol/slow_gaussian.hxx: Clean code. Remove parameter
mu. Add radius_factor.
- * olena/oln/morpho/gradient.inc: Fix doc.
+ * oln/morpho/gradient.inc: Fix doc.
2004-06-07 Damien Thivolle <damien(a)lrde.epita.fr>
@@ -298,30 +345,30 @@
2004-05-15 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/morpho/attributes.hh (integral): Change the function.
+ * oln/morpho/attributes.hh (integral): Change the function.
2004-05-14 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/morpho/attributes.hh (integral): Fix a bug in the
+ * oln/morpho/attributes.hh (integral): Fix a bug in the
constructor.
2004-05-12 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/core/neighborhood3d.hh: Add some common neighborhoods.
- * olena/oln/convol/slow_gaussian.hh: Add file.
- * olena/oln/convol/slow_gaussian.hxx: Add file.
+ * oln/core/neighborhood3d.hh: Add some common neighborhoods.
+ * oln/convol/slow_gaussian.hh: Add file.
+ * oln/convol/slow_gaussian.hxx: Add file.
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/tests/sanity/Makefile.am: Replace maintainer-check by check.
+ * tests/sanity/Makefile.am: Replace maintainer-check by check.
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/convert/rgbhsl.hh: Include headers so as to pass
+ * oln/convert/rgbhsl.hh: Include headers so as to pass
sanity check.
- * olena/oln/snakes/energies.hh: Likewise.
- * olena/oln/utils/buffer.hh: Likewise.
- * olena/oln/topo/tarjan/tarjan.hh: Likewise.
+ * oln/snakes/energies.hh: Likewise.
+ * oln/utils/buffer.hh: Likewise.
+ * oln/topo/tarjan/tarjan.hh: Likewise.
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
@@ -348,18 +395,18 @@
2004-04-14 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/tests/morpho/tests/md5_morpho_reconstruction_hh5: Fix to make
+ * tests/morpho/tests/md5_morpho_reconstruction_hh5: Fix to make
compile with ICC. More details are available here:
http://www.lrde.epita.fr/cgi-bin/twiki/view/Projects/OlenaConstImages
- * olena/tests/morpho/tests/md5_morpho_reconstruction_hh4: Likewise.
- * olena/tests/morpho/tests/md5_morpho_reconstruction_hh3: Likewise.
- * olena/tests/morpho/tests/md5_morpho_reconstruction_hh2: Likewise.
- * olena/tests/morpho/tests/md5_morpho_reconstruction_hh1: Likewise.
- * olena/tests/morpho/tests/md5_morpho_reconstruction_hh0: Likewise.
- * olena/tests/morpho/tests/md5_morpho_geodesic_erosion_hh1: Likewise.
- * olena/tests/morpho/tests/md5_morpho_geodesic_erosion_hh0: Likewise.
- * olena/tests/morpho/tests/md5_morpho_geodesic_dilation_hh1: Likewise.
- * olena/tests/morpho/tests/md5_morpho_geodesic_dilation_hh0: Likewise.
+ * tests/morpho/tests/md5_morpho_reconstruction_hh4: Likewise.
+ * tests/morpho/tests/md5_morpho_reconstruction_hh3: Likewise.
+ * tests/morpho/tests/md5_morpho_reconstruction_hh2: Likewise.
+ * tests/morpho/tests/md5_morpho_reconstruction_hh1: Likewise.
+ * tests/morpho/tests/md5_morpho_reconstruction_hh0: Likewise.
+ * tests/morpho/tests/md5_morpho_geodesic_erosion_hh1: Likewise.
+ * tests/morpho/tests/md5_morpho_geodesic_erosion_hh0: Likewise.
+ * tests/morpho/tests/md5_morpho_geodesic_dilation_hh1: Likewise.
+ * tests/morpho/tests/md5_morpho_geodesic_dilation_hh0: Likewise.
2004-04-14 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -368,21 +415,22 @@
2004-04-13 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/tests/convol/tests/md5_convol_fast_gaussian_hh4: Make this test xfail.
- * olena/tests/convol/tests/md5_convol_fast_gaussian_hh1: Likewise.
+ * tests/convol/tests/md5_convol_fast_gaussian_hh4: Make this test
+ xfail.
+ * tests/convol/tests/md5_convol_fast_gaussian_hh1: Likewise.
2004-04-13 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/morpho/geodesic_dilation.hh: Fix to make compile with ICC.
- * olena/oln/morpho/geodesic_erosion.hh: Likewise.
- * olena/oln/morpho/reconstruction.hh: Likewise.
- * olena/oln/topo/tarjan/flat-zone.hh: Likewise.
+ * oln/morpho/geodesic_dilation.hh: Fix to make compile with ICC.
+ * oln/morpho/geodesic_erosion.hh: Likewise.
+ * oln/morpho/reconstruction.hh: Likewise.
+ * oln/topo/tarjan/flat-zone.hh: Likewise.
2004-04-13 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/utils/md5.hxx: Changed abstract::image to
+ * oln/utils/md5.hxx: Changed abstract::image to
oln::abstract::image (ICC error).
- * olena/oln/utils/md5.hh: Likewise.
+ * oln/utils/md5.hh: Likewise.
2004-04-13 Niels Van Vliet <niels(a)lrde.epita.fr>
@@ -414,31 +462,32 @@
2004-04-12 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/core/abstract/image.hh: Fix macro oln_concrete_type.
- * olena/tests/morpho/tests/gradient: New.
+ * oln/core/abstract/image.hh: Fix macro oln_concrete_type.
+ * tests/morpho/tests/gradient: New.
2004-04-12 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/morpho/laplacian.inc: Add a FIXME.
- * olena/oln/morpho/watershed.hh: Add a FIXME.
+ * oln/morpho/laplacian.inc: Add a FIXME.
+ * oln/morpho/watershed.hh: Add a FIXME.
2004-04-11 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/core/point2d.hh: Add header include.
- * olena/oln/core/point2d.hxx: Likewise.
- * olena/oln/core/point3d.hh: Likewise.
- * olena/oln/core/point3d.hxx: Likewise.
+ * oln/core/point2d.hh: Add header include.
+ * oln/core/point2d.hxx: Likewise.
+ * oln/core/point3d.hh: Likewise.
+ * oln/core/point3d.hxx: Likewise.
2004-04-07 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/Makefile.am: Add forgotten files to the distribution.
+ * oln/Makefile.am: Add forgotten files to the distribution.
2004-04-04 Simon Odou <simon(a)lrde.epita.fr>
* oln/core/image1d.hh: Add informations to image_id.
* oln/core/image2d.hh: Likewise
- * oln/core/image3d.hh: Likewise
- * oln/core/impl/image_array1d.hh: Add empty constructor for any_with_diamond.
+ * oln/core/image3d.hh: Likewise
+ * oln/core/impl/image_array1d.hh: Add empty constructor for
+ any_with_diamond.
* oln/core/impl/image_array.hh: Likewise.
* oln/core/impl/image_array2d.hh: Likewise.
* oln/core/impl/image_array3d.hh: Likewise.
@@ -451,7 +500,8 @@
* tests/morpher/tests/iter: New.
* tests/morpher/tests/slicing: New.
* oln/core/abstract/image.hh: Size() returns const inside of const &.
- * oln/morpher/piece_morpher.hh: Adapt to new version of generic morpher.
+ * oln/morpher/piece_morpher.hh: Adapt to new version of generic
+ morpher.
Respect 80 columns.
* oln/morpher/slicing_morpher.hh: Likewise.
* oln/morpher/iter_morpher.hh: Likewise.
@@ -461,17 +511,17 @@
2004-04-03 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/Makefile.am: Add files.
- * olena/oln/morpher/generic_morpher.hh: Repair unmorph().
- * olena/oln/morpher/color_morpher.hh: Correct comments.
- * olena/tests/morpher/tests/color_morph: Readd a test.
+ * oln/Makefile.am: Add files.
+ * oln/morpher/generic_morpher.hh: Repair unmorph().
+ * oln/morpher/color_morpher.hh: Correct comments.
+ * tests/morpher/tests/color_morph: Readd a test.
2004-04-03 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/morpher/generic_morpher.hh: Inherit directly from oln::image.
- * olena/oln/morpher/subq_morpher.hh: Change inheritance system.
- * olena/oln/morpher/color_morpher.hh: Likewise.
- * olena/tests/morpher/tests/color_morph: Remove a test.
+ * oln/morpher/generic_morpher.hh: Inherit directly from oln::image.
+ * oln/morpher/subq_morpher.hh: Change inheritance system.
+ * oln/morpher/color_morpher.hh: Likewise.
+ * tests/morpher/tests/color_morph: Remove a test.
2004-04-02 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -480,17 +530,19 @@
* oln/topo/tarjan/tarjan_with_attr.hh: Correct code.
2004-04-02 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/io/gz_stream.hh: Fix doc.
- * olena/oln/morpho/extrema.hxx: Likewise.
- * olena/oln/convol/nagao.hh: Likewise.
- * olena/oln/transforms/dwt.hh: Likewise.
+
+ * oln/io/gz_stream.hh: Fix doc.
+ * oln/morpho/extrema.hxx: Likewise.
+ * oln/convol/nagao.hh: Likewise.
+ * oln/transforms/dwt.hh: Likewise.
2004-04-02 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/morpho/laplacian.inc (laplacian): Remove slarger_t.
+
+ * oln/morpho/laplacian.inc (laplacian): Remove slarger_t.
Add the parameter DestValue. Fix doc.
- * olena/tests/morpho/tests/md5_morpho_laplacian_inc1: Change the
+ * tests/morpho/tests/md5_morpho_laplacian_inc1: Change the
test.
- * olena/oln/morpho/watershed.hh: Change the two examples.
+ * oln/morpho/watershed.hh: Change the two examples.
2004-04-02 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -502,14 +554,15 @@
* tests/topo/tests/cmap: Make the test use the good flat_zone.
2004-04-02 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/core/image1d.hh: Return exact_type in clone_.
- * olena/oln/core/image2d.hh: Likewise.
- * olena/oln/core/image3d.hh: Likewise.
- * olena/oln/core/neighborhood2d.hh: Remove a FIXME. Remove operator=.
- * olena/oln/core/window2d.hh: Likewise.
- * olena/oln/core/w_window2d.hh: Add comments.
- * olena/oln/level/cc.hh: Remove headers.
- * olena/oln/morpho/top_hat.inc: Remove a FIXME.
+
+ * oln/core/image1d.hh: Return exact_type in clone_.
+ * oln/core/image2d.hh: Likewise.
+ * oln/core/image3d.hh: Likewise.
+ * oln/core/neighborhood2d.hh: Remove a FIXME. Remove operator=.
+ * oln/core/window2d.hh: Likewise.
+ * oln/core/w_window2d.hh: Add comments.
+ * oln/level/cc.hh: Remove headers.
+ * oln/morpho/top_hat.inc: Remove a FIXME.
2004-03-31 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -522,28 +575,28 @@
2004-03-30 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/Makefile.am: Add files from oln/morpher/
- * olena/oln/morpher/generic_morpher.hh: Correct comments and code.
- * olena/oln/morpher/subq_morpher.hh: Likewise.
- * olena/oln/morpher/color_morpher.hh: Likewise.
- * olena/tests/morpher/tests/compose_morph: New file, contains
+ * oln/Makefile.am: Add files from oln/morpher/
+ * oln/morpher/generic_morpher.hh: Correct comments and code.
+ * oln/morpher/subq_morpher.hh: Likewise.
+ * oln/morpher/color_morpher.hh: Likewise.
+ * tests/morpher/tests/compose_morph: New file, contains
morpher composition tests.
- * olena/tests/morpher/tests/sq_morph: New file, contains sub
+ * tests/morpher/tests/sq_morph: New file, contains sub
quantifying morpher tests.
- * olena/tests/morpher/tests/color_morph: New file, contains color
+ * tests/morpher/tests/color_morph: New file, contains color
morpher tests.
- * olena/tests/morpher/tests/sq_morph_8: Remove file.
- * olena/tests/morpher/tests/sq_morph_7: Likewise.
- * olena/tests/morpher/tests/sq_morph_6: Likewise.
- * olena/tests/morpher/tests/sq_morph_5: Likewise.
- * olena/tests/morpher/tests/sq_morph_4: Likewise.
- * olena/tests/morpher/tests/sq_morph_3: Likewise.
- * olena/tests/morpher/tests/sq_morph_2: Likewise.
- * olena/tests/morpher/tests/sq_morph_1: Likewise.
- * olena/tests/morpher/tests/rmorph: Likewise.
- * olena/tests/morpher/tests/gmorph: Likewise.
- * olena/tests/morpher/tests/color_sq_morph: Likewise.
- * olena/tests/morpher/tests/bmorph: Likewise.
+ * tests/morpher/tests/sq_morph_8: Remove file.
+ * tests/morpher/tests/sq_morph_7: Likewise.
+ * tests/morpher/tests/sq_morph_6: Likewise.
+ * tests/morpher/tests/sq_morph_5: Likewise.
+ * tests/morpher/tests/sq_morph_4: Likewise.
+ * tests/morpher/tests/sq_morph_3: Likewise.
+ * tests/morpher/tests/sq_morph_2: Likewise.
+ * tests/morpher/tests/sq_morph_1: Likewise.
+ * tests/morpher/tests/rmorph: Likewise.
+ * tests/morpher/tests/gmorph: Likewise.
+ * tests/morpher/tests/color_sq_morph: Likewise.
+ * tests/morpher/tests/bmorph: Likewise.
@@ -568,38 +621,40 @@
* oln/morpher/slicing_morpher.hh: Minor fix.
- * olena/oln/core/bkd_iter1d.hh: Fix comments.
- * olena/oln/core/bkd_iter2d.hh: Likewise.
- * olena/oln/core/bkd_iter3d.hh: Likewise.
- * olena/oln/core/fwd_iter1d.hh: Likewise.
- * olena/oln/core/fwd_iter2d.hh: Likewise.
- * olena/oln/core/fwd_iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter1d.hh: Likewise.
- * olena/oln/core/abstract/iter2d.hh: Likewise.
- * olena/oln/core/abstract/iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter.hh: Likewise.
- * olena/oln/core/neighborhood1d.hh: Likewise.
- * olena/oln/core/neighborhood2d.hh: Likewise.
- * olena/oln/core/neighborhood3d.hh: Likewise.
- * olena/oln/core/abstract/neighborhood.hh: Likewise.
- * olena/oln/core/window1d.hh: Likewise.
- * olena/oln/core/window2d.hh: Likewise.
- * olena/oln/core/window3d.hh: Likewise.
- * olena/oln/core/abstract/window.hh: Likewise.
- * olena/oln/core/w_window1d.hh: Likewise.
- * olena/oln/core/w_window2d.hh: Likewise.
- * olena/oln/core/w_window3d.hh: Likewise.
- * olena/oln/core/abstract/w_window.hh: Likewise.
- * olena/oln/core/abstract/window_base.hh: Likewise.
- * olena/oln/core/abstract/windownd.hh: Likewise.
- * olena/oln/core/abstract/w_windownd.hh: Likewise.
- * olena/oln/core/abstract/neighborhoodnd.hh: Likewise.
+ * oln/core/bkd_iter1d.hh: Fix comments.
+ * oln/core/bkd_iter2d.hh: Likewise.
+ * oln/core/bkd_iter3d.hh: Likewise.
+ * oln/core/fwd_iter1d.hh: Likewise.
+ * oln/core/fwd_iter2d.hh: Likewise.
+ * oln/core/fwd_iter3d.hh: Likewise.
+ * oln/core/abstract/iter1d.hh: Likewise.
+ * oln/core/abstract/iter2d.hh: Likewise.
+ * oln/core/abstract/iter3d.hh: Likewise.
+ * oln/core/abstract/iter.hh: Likewise.
+ * oln/core/neighborhood1d.hh: Likewise.
+ * oln/core/neighborhood2d.hh: Likewise.
+ * oln/core/neighborhood3d.hh: Likewise.
+ * oln/core/abstract/neighborhood.hh: Likewise.
+ * oln/core/window1d.hh: Likewise.
+ * oln/core/window2d.hh: Likewise.
+ * oln/core/window3d.hh: Likewise.
+ * oln/core/abstract/window.hh: Likewise.
+ * oln/core/w_window1d.hh: Likewise.
+ * oln/core/w_window2d.hh: Likewise.
+ * oln/core/w_window3d.hh: Likewise.
+ * oln/core/abstract/w_window.hh: Likewise.
+ * oln/core/abstract/window_base.hh: Likewise.
+ * oln/core/abstract/windownd.hh: Likewise.
+ * oln/core/abstract/w_windownd.hh: Likewise.
+ * oln/core/abstract/neighborhoodnd.hh: Likewise.
* oln/morpher/slicing_morpher.hh: To have a slice of an image.
* oln/morpher/iter_morpher.hh: To have a specific default iterator.
- * oln/morpher/piece_morpher.hh: To use a piece of image like a real one.
+ * oln/morpher/piece_morpher.hh: To use a piece of image like a
+ real one.
+
* oln/core/abstract/image_with_impl.hh:
* oln/core/point2d.hh: Able to construct a point2d from a point1d.
* oln/core/point2d.hxx: Likewise.
@@ -609,63 +664,66 @@
* oln/core/abstract/image_with_impl.hh: Fix (same).
2004-03-29 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/topo/inter-pixel/inter-pixel.hh: Change the return type
+
+ * oln/topo/inter-pixel/inter-pixel.hh: Change the return type
of operator[] from const & to const.
2004-03-29 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/morpher/generic_morpher.hh: Correct code and comments.
- * olena/oln/morpher/subq_morpher.hh: Add file. Sub quantify morpher
+ * oln/morpher/generic_morpher.hh: Correct code and comments.
+ * oln/morpher/subq_morpher.hh: Add file. Sub quantify morpher
implementation.
- * olena/oln/morpher/color_morpher.hh: Add file. Color morpher
+ * oln/morpher/color_morpher.hh: Add file. Color morpher
implementation.
- * olena/tests/morpher/Makefile.am: Add file. Morphers test suite.
- * olena/tests/morpher/tests/sq_morph_8: Add file.
- * olena/tests/morpher/tests/sq_morph_7: Likewise.
- * olena/tests/morpher/tests/sq_morph_6: Likewise.
- * olena/tests/morpher/tests/sq_morph_5: Likewise.
- * olena/tests/morpher/tests/sq_morph_4: Likewise.
- * olena/tests/morpher/tests/sq_morph_3: Likewise.
- * olena/tests/morpher/tests/sq_morph_2: Likewise.
- * olena/tests/morpher/tests/sq_morph_1: Likewise.
- * olena/tests/morpher/tests/rmorph: Likewise.
- * olena/tests/morpher/tests/gmorph: Likewise.
- * olena/tests/morpher/tests/color_sq_morph: Likewise.
- * olena/tests/morpher/tests/bmorph: Likewise.
+ * tests/morpher/Makefile.am: Add file. Morphers test suite.
+ * tests/morpher/tests/sq_morph_8: Add file.
+ * tests/morpher/tests/sq_morph_7: Likewise.
+ * tests/morpher/tests/sq_morph_6: Likewise.
+ * tests/morpher/tests/sq_morph_5: Likewise.
+ * tests/morpher/tests/sq_morph_4: Likewise.
+ * tests/morpher/tests/sq_morph_3: Likewise.
+ * tests/morpher/tests/sq_morph_2: Likewise.
+ * tests/morpher/tests/sq_morph_1: Likewise.
+ * tests/morpher/tests/rmorph: Likewise.
+ * tests/morpher/tests/gmorph: Likewise.
+ * tests/morpher/tests/color_sq_morph: Likewise.
+ * tests/morpher/tests/bmorph: Likewise.
2004-03-27 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/utils/histogram.hh: Change the return type
+
+ * oln/utils/histogram.hh: Change the return type
of `at' method to const value_type.
- * olena/oln/morpho/attributes.hh: Uncomment some lines.
+ * oln/morpho/attributes.hh: Uncomment some lines.
- * olena/oln/convol/nagao.hh: Correct comments.
- * olena/oln/convol/nagao.hxx: Likewise.
- * olena/oln/utils/se_stat.hh: Likewise.
- * olena/oln/utils/se_stat.hxx: Likewise.
+ * oln/convol/nagao.hh: Correct comments.
+ * oln/convol/nagao.hxx: Likewise.
+ * oln/utils/se_stat.hh: Likewise.
+ * oln/utils/se_stat.hxx: Likewise.
2004-03-26 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/math/macros.hh: Add dot_product.
- * olena/oln/utils/se_stat.hh: Add file. Mean and variance using a
+
+ * oln/math/macros.hh: Add dot_product.
+ * oln/utils/se_stat.hh: Add file. Mean and variance using a
structuring element.
- * olena/oln/utils/se_stat.hxx: Add file.
- * olena/oln/convol/nagao.hh: Add file. Nagao filter.
- * olena/oln/convol/nagao.hxx: Add file.
- * olena/tests/convol/tests/nagao : Add file.
+ * oln/utils/se_stat.hxx: Add file.
+ * oln/convol/nagao.hh: Add file. Nagao filter.
+ * oln/convol/nagao.hxx: Add file.
+ * tests/convol/tests/nagao : Add file.
2004-03-25 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/core/abstract/image.hh: Correct macros.
- * olena/oln/core/abstract/image_with_impl.hh: Change the return type
+ * oln/core/abstract/image.hh: Correct macros.
+ * oln/core/abstract/image_with_impl.hh: Change the return type
of `at' method to const value_type.
- * olena/oln/morpher/generic_morpher.hh: Correct comments.
+ * oln/morpher/generic_morpher.hh: Correct comments.
Change parameter names. Fix coding style.
2004-03-25 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/core/abstract/image.hh: Change the return type of
+ * oln/core/abstract/image.hh: Change the return type of
`operator[]' method to const value_type.
Add macros for retrieving types associated to an image.
- * olena/oln/morpher/generic_morpher.hh: generic_morpher implementation.
+ * oln/morpher/generic_morpher.hh: generic_morpher implementation.
2004-03-25 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -678,12 +736,12 @@
2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr>
- * olena/tests/level/tests/md5_level_hh0: Add file.
+ * tests/level/tests/md5_level_hh0: Add file.
2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr>
- * olena/tests/level/tests/md5_level_set_level_hh0: Add file.
- * olena/tests/level/tests/md5_level_threshold_hh0: Likewise.
+ * tests/level/tests/md5_level_set_level_hh0: Add file.
+ * tests/level/tests/md5_level_threshold_hh0: Likewise.
2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -692,38 +750,70 @@
2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr>
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2: Add file.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh4: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh5: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh6: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh7: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh8: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh9: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh0: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh1: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh2: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh3: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh4: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh5: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh0: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh1: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh10: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh11: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh12: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh13: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh14: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh15: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh16: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh17: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh4: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh5: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh6: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh7: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh8: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh9: Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2: Add
+ file.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh4:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh5:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh6:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh7:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh8:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh9:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh0:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh1:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh2:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh3:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh4:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh5:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh0:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh1:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh10:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh11:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh12:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh13:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh14:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh15:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh16:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh17:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh4:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh5:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh6:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh7:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh8:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh9:
+ Likewise.
* tests/morpho/tests/md5_morpho_closing_inc0: Likewise.
* tests/morpho/tests/md5_morpho_dilation_hh0: Likewise.
* tests/morpho/tests/md5_morpho_dilation_hh1: Likewise.
@@ -779,12 +869,18 @@
* tests/convol/tests/md5_convol_fast_gaussian_hh4: Add file.
* tests/convol/tests/md5_convol_fast_gaussian_hh5: Add file.
- * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh0: Remove file.
- * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh1: Remove file.
- * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh2: Remove file.
- * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh3: Remove file.
- * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh4: Remove file.
- * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh5: Remove file.
+ * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh0:
+ Remove file.
+ * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh1:
+ Remove file.
+ * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh2:
+ Remove file.
+ * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh3:
+ Remove file.
+ * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh4:
+ Remove file.
+ * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh5:
+ Remove file.
2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -800,45 +896,46 @@
* tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh5: Add file.
2004-03-23 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/level/cc.hh (frontp_connected_component): Change image to
+
+ * oln/level/cc.hh (frontp_connected_component): Change image to
binary_image.
- * olena/oln/level/connected.hh (connected_component): Change image to
+ * oln/level/connected.hh (connected_component): Change image to
binary_image_with_dim.
- * olena/oln/morpho/extrema_killer.hh (internal_kill_cc_area): Change
+ * oln/morpho/extrema_killer.hh (internal_kill_cc_area): Change
non_vectorial_image to binary_image_with_dim
- * olena/oln/morpho/attribute_closing_opening_map.hh (f_tarjan_map):
+ * oln/morpho/attribute_closing_opening_map.hh (f_tarjan_map):
Change image to non_vectorial_image.
2004-03-19 Simon Odou <simon(a)lrde.epita.fr>
- * olena/oln/core/bkd_iter1d.hh: Correct comments.
- * olena/oln/core/bkd_iter2d.hh: Likewise.
- * olena/oln/core/bkd_iter3d.hh: Likewise.
- * olena/oln/core/fwd_iter1d.hh: Likewise.
- * olena/oln/core/fwd_iter2d.hh: Likewise.
- * olena/oln/core/fwd_iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter1d.hh: Likewise.
- * olena/oln/core/abstract/iter2d.hh: Likewise.
- * olena/oln/core/abstract/iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter.hh: Likewise.
- * olena/oln/core/neighborhood1d.hh: Likewise.
- * olena/oln/core/neighborhood2d.hh: Likewise.
- * olena/oln/core/neighborhood3d.hh: Likewise.
- * olena/oln/core/abstract/neighborhood.hh: Likewise.
- * olena/oln/core/abstract/struct_elt.hh: Likewise.
- * olena/oln/core/window1d.hh: Likewise.
- * olena/oln/core/window2d.hh: Likewise.
- * olena/oln/core/window3d.hh: Likewise.
- * olena/oln/core/abstract/window.hh: Likewise.
- * olena/oln/core/w_window1d.hh: Likewise.
- * olena/oln/core/w_window2d.hh: Likewise.
- * olena/oln/core/w_window3d.hh: Likewise.
- * olena/oln/core/abstract/w_window.hh: Likewise.
- * olena/oln/io/base.hh: Likewise.
- * olena/oln/core/abstract/window_base.hh: Likewise.
- * olena/oln/core/abstract/windownd.hh: Likewise.
- * olena/oln/core/abstract/w_windownd.hh: Likewise.
- * olena/oln/core/abstract/neighborhoodnd.hh: Likewise.
+ * oln/core/bkd_iter1d.hh: Correct comments.
+ * oln/core/bkd_iter2d.hh: Likewise.
+ * oln/core/bkd_iter3d.hh: Likewise.
+ * oln/core/fwd_iter1d.hh: Likewise.
+ * oln/core/fwd_iter2d.hh: Likewise.
+ * oln/core/fwd_iter3d.hh: Likewise.
+ * oln/core/abstract/iter1d.hh: Likewise.
+ * oln/core/abstract/iter2d.hh: Likewise.
+ * oln/core/abstract/iter3d.hh: Likewise.
+ * oln/core/abstract/iter.hh: Likewise.
+ * oln/core/neighborhood1d.hh: Likewise.
+ * oln/core/neighborhood2d.hh: Likewise.
+ * oln/core/neighborhood3d.hh: Likewise.
+ * oln/core/abstract/neighborhood.hh: Likewise.
+ * oln/core/abstract/struct_elt.hh: Likewise.
+ * oln/core/window1d.hh: Likewise.
+ * oln/core/window2d.hh: Likewise.
+ * oln/core/window3d.hh: Likewise.
+ * oln/core/abstract/window.hh: Likewise.
+ * oln/core/w_window1d.hh: Likewise.
+ * oln/core/w_window2d.hh: Likewise.
+ * oln/core/w_window3d.hh: Likewise.
+ * oln/core/abstract/w_window.hh: Likewise.
+ * oln/io/base.hh: Likewise.
+ * oln/core/abstract/window_base.hh: Likewise.
+ * oln/core/abstract/windownd.hh: Likewise.
+ * oln/core/abstract/w_windownd.hh: Likewise.
+ * oln/core/abstract/neighborhoodnd.hh: Likewise.
2004-03-19 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -871,26 +968,28 @@
* oln/transforms/fft.hh: Likewise.
2004-03-19 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/utils/histogram.hh: Fix doc.
- * olena/oln/convert/value_to_point.hh: Likewise.
+
+ * oln/utils/histogram.hh: Fix doc.
+ * oln/convert/value_to_point.hh: Likewise.
2004-03-18 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/convert/value_to_point.hh: Fix value_to_point<bin>.
- * olena/oln/utils/histogram.hh: Fix hisogram<bin>.
- * olena/oln/morpho/fast_morpho.hxx: Histogram to abstract histogram.
-
- * olena/oln/morpho/hit_or_miss.inc: Enable code in the doc.
- * olena/oln/morpho/top_hat.inc: Likewise.
- * olena/oln/morpho/opening.inc: Likewise.
- * olena/oln/morpho/dilation.hh: Likewise.
- * olena/oln/morpho/erosion.hh: Likewise.
- * olena/oln/morpho/dilation.hh: Likewise.
-
- * olena/tests/morpho/tests/edoc: Add tests.
-
- * olena/oln/morpho/attribute_closing_opening_map.hh: Rename images.
- * olena/oln/morpho/extrema.hxx: Add doc.
- * olena/oln/morpho/closing.inc: Remove fixme.
+
+ * oln/convert/value_to_point.hh: Fix value_to_point<bin>.
+ * oln/utils/histogram.hh: Fix hisogram<bin>.
+ * oln/morpho/fast_morpho.hxx: Histogram to abstract histogram.
+
+ * oln/morpho/hit_or_miss.inc: Enable code in the doc.
+ * oln/morpho/top_hat.inc: Likewise.
+ * oln/morpho/opening.inc: Likewise.
+ * oln/morpho/dilation.hh: Likewise.
+ * oln/morpho/erosion.hh: Likewise.
+ * oln/morpho/dilation.hh: Likewise.
+
+ * tests/morpho/tests/edoc: Add tests.
+
+ * oln/morpho/attribute_closing_opening_map.hh: Rename images.
+ * oln/morpho/extrema.hxx: Add doc.
+ * oln/morpho/closing.inc: Remove fixme.
2004-03-16 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -899,85 +998,86 @@
* oln/transforms/wavelet_coeffs.hh: Likewise.
2004-03-15 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/core/apply.hh: Correct comments.
- * olena/oln/core/compose.hh: Correct comments.
- * olena/oln/io/file.hh: Add comments.
- * olena/oln/io/gz.hh: Likewise.
- * olena/oln/io/gz_stream.hh: Likewise.
- * olena/oln/io/pnm_read_3d.hh: Likewise.
- * olena/oln/io/pnm_read.hh: Likewise.
- * olena/oln/io/pnm_write_3d.hh: Likewise.
- * olena/oln/io/pnm_write.hh: Likewise.
- * olena/oln/io/pnm_common.hh: Likewise.
- * olena/oln/io/stream_wrapper.hh: Likewise.
- * olena/oln/io/pnm_read_data.hh: Likewise.
- * olena/oln/io/pnm_write_data.hh: Likewise.
- * olena/oln/io/pnm_read_2d.hh: Likewise.
- * olena/oln/io/pnm_write_2d.hh: Likewise.
+ * oln/core/apply.hh: Correct comments.
+ * oln/core/compose.hh: Correct comments.
+ * oln/io/file.hh: Add comments.
+ * oln/io/gz.hh: Likewise.
+ * oln/io/gz_stream.hh: Likewise.
+ * oln/io/pnm_read_3d.hh: Likewise.
+ * oln/io/pnm_read.hh: Likewise.
+ * oln/io/pnm_write_3d.hh: Likewise.
+ * oln/io/pnm_write.hh: Likewise.
+ * oln/io/pnm_common.hh: Likewise.
+ * oln/io/stream_wrapper.hh: Likewise.
+ * oln/io/pnm_read_data.hh: Likewise.
+ * oln/io/pnm_write_data.hh: Likewise.
+ * oln/io/pnm_read_2d.hh: Likewise.
+ * oln/io/pnm_write_2d.hh: Likewise.
2004-03-15 Simon Odou <simon(a)lrde.epita.fr>
- * olena/oln/io/base.hh: Add comments.
- * olena/oln/io/readable.hh: Likewise.
- * olena/oln/io/se_neighborhood.hh: Likewise.
- * olena/oln/io/se_window.hh: Likewise.
- * olena/oln/io/image_base.hh: Likewise.
- * olena/oln/io/image_write.hh: Likewise.
- * olena/oln/io/stream_wrapper.hh: Likewise.
- * olena/oln/io/utils.hh: Likewise.
- * olena/oln/io/image_read.hh: Likewise.
- * olena/oln/core/abstract/image.hh: Likewise.
- * olena/oln/core/bkd_iter1d.hh: Correct comments.
- * olena/oln/core/bkd_iter2d.hh: Likewise.
- * olena/oln/core/bkd_iter3d.hh: Likewise.
- * olena/oln/core/fwd_iter1d.hh: Likewise.
- * olena/oln/core/fwd_iter2d.hh: Likewise.
- * olena/oln/core/fwd_iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter1d.hh: Likewise.
- * olena/oln/core/abstract/iter2d.hh: Likewise.
- * olena/oln/core/abstract/iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter.hh: Likewise.
- * olena/oln/core/neighborhood1d.hh: Likewise.
- * olena/oln/core/neighborhood2d.hh: Likewise.
- * olena/oln/core/neighborhood3d.hh: Likewise.
- * olena/oln/core/abstract/neighborhood.hh: Likewise.
- * olena/oln/core/abstract/struct_elt.hh: Likewise.
- * olena/oln/core/window1d.hh: Likewise.
- * olena/oln/core/window2d.hh: Likewise.
- * olena/oln/core/window3d.hh: Likewise.
- * olena/oln/core/abstract/window.hh: Likewise.
- * olena/oln/core/w_window1d.hh: Likewise.
- * olena/oln/core/w_window2d.hh: Likewise.
- * olena/oln/core/w_window3d.hh: Likewise.
- * olena/oln/core/abstract/w_window.hh: Likewise.
- * olena/oln/core/abstract/window_base.hh: Likewise.
- * olena/oln/core/abstract/windownd.hh: Likewise.
- * olena/oln/core/abstract/w_windownd.hh: Likewise.
- * olena/oln/core/abstract/neighborhoodnd.hh: Likewise.
+ * oln/io/base.hh: Add comments.
+ * oln/io/readable.hh: Likewise.
+ * oln/io/se_neighborhood.hh: Likewise.
+ * oln/io/se_window.hh: Likewise.
+ * oln/io/image_base.hh: Likewise.
+ * oln/io/image_write.hh: Likewise.
+ * oln/io/stream_wrapper.hh: Likewise.
+ * oln/io/utils.hh: Likewise.
+ * oln/io/image_read.hh: Likewise.
+ * oln/core/abstract/image.hh: Likewise.
+ * oln/core/bkd_iter1d.hh: Correct comments.
+ * oln/core/bkd_iter2d.hh: Likewise.
+ * oln/core/bkd_iter3d.hh: Likewise.
+ * oln/core/fwd_iter1d.hh: Likewise.
+ * oln/core/fwd_iter2d.hh: Likewise.
+ * oln/core/fwd_iter3d.hh: Likewise.
+ * oln/core/abstract/iter1d.hh: Likewise.
+ * oln/core/abstract/iter2d.hh: Likewise.
+ * oln/core/abstract/iter3d.hh: Likewise.
+ * oln/core/abstract/iter.hh: Likewise.
+ * oln/core/neighborhood1d.hh: Likewise.
+ * oln/core/neighborhood2d.hh: Likewise.
+ * oln/core/neighborhood3d.hh: Likewise.
+ * oln/core/abstract/neighborhood.hh: Likewise.
+ * oln/core/abstract/struct_elt.hh: Likewise.
+ * oln/core/window1d.hh: Likewise.
+ * oln/core/window2d.hh: Likewise.
+ * oln/core/window3d.hh: Likewise.
+ * oln/core/abstract/window.hh: Likewise.
+ * oln/core/w_window1d.hh: Likewise.
+ * oln/core/w_window2d.hh: Likewise.
+ * oln/core/w_window3d.hh: Likewise.
+ * oln/core/abstract/w_window.hh: Likewise.
+ * oln/core/abstract/window_base.hh: Likewise.
+ * oln/core/abstract/windownd.hh: Likewise.
+ * oln/core/abstract/w_windownd.hh: Likewise.
+ * oln/core/abstract/neighborhoodnd.hh: Likewise.
2004-03-15 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/arith/internal/opdecls.hh: Clean doc.
- * olena/oln/arith/ops.hh: Likewise.
- * olena/oln/convert/conversion.hh: Likewise.
- * olena/oln/convol/convolution.hh: Likewise.
- * olena/oln/convol/fast_gaussian.hh: Likewise.
- * olena/oln/convol/fast_gaussian.hxx: Likewise.
- * olena/oln/core/abstract/dpoint.hh: Likewise.
- * olena/oln/core/abstract/iter.hh: Likewise.
- * olena/oln/level/cc.hh: Likewise.
- * olena/oln/math/macros.hh: Likewise.
- * olena/oln/morpho/extrema.hh: Likewise.
- * olena/oln/morpho/extrema.hxx: Likewise.
- * olena/oln/morpho/fast_morpho.hxx: Likewise.
- * olena/oln/topo/dmap.hh: Likewise.
- * olena/oln/utils/histogram.hh: Likewise.
- * olena/oln/topo/tarjan/union.hh: Likewise.
- * olena/oln/topo/inter-pixel/internal/dir.hh: Likewise.
- * olena/oln/core/abstract/image.hh: Likewise.
- * olena/oln/core/impl/image_array.hh: Likewise.
- * olena/oln/convert/abstract/conversion.hh: Likewise.
- * olena/oln/snakes/snakes_base.hh: Likewise.
- * olena/oln/morpho/attributes.hh: Likewise.
- * olena/oln/morpho/attribute_closing_opening_map.hh: Likewise.
+
+ * oln/arith/internal/opdecls.hh: Clean doc.
+ * oln/arith/ops.hh: Likewise.
+ * oln/convert/conversion.hh: Likewise.
+ * oln/convol/convolution.hh: Likewise.
+ * oln/convol/fast_gaussian.hh: Likewise.
+ * oln/convol/fast_gaussian.hxx: Likewise.
+ * oln/core/abstract/dpoint.hh: Likewise.
+ * oln/core/abstract/iter.hh: Likewise.
+ * oln/level/cc.hh: Likewise.
+ * oln/math/macros.hh: Likewise.
+ * oln/morpho/extrema.hh: Likewise.
+ * oln/morpho/extrema.hxx: Likewise.
+ * oln/morpho/fast_morpho.hxx: Likewise.
+ * oln/topo/dmap.hh: Likewise.
+ * oln/utils/histogram.hh: Likewise.
+ * oln/topo/tarjan/union.hh: Likewise.
+ * oln/topo/inter-pixel/internal/dir.hh: Likewise.
+ * oln/core/abstract/image.hh: Likewise.
+ * oln/core/impl/image_array.hh: Likewise.
+ * oln/convert/abstract/conversion.hh: Likewise.
+ * oln/snakes/snakes_base.hh: Likewise.
+ * oln/morpho/attributes.hh: Likewise.
+ * oln/morpho/attribute_closing_opening_map.hh: Likewise.
2004-03-15 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -985,58 +1085,61 @@
* tests/morpho/tests/area: Likewise.
2004-03-14 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/arith/internal/opdecls.hh: Changed doxygen commands
+
+ * oln/arith/internal/opdecls.hh: Changed doxygen commands
"\{''|attention|warning|bug|note} FIXME" to "\todo FIXME", "\ref" to
"REF: ", "\file *.hh" to "\file oln/full/path/*.hh".
- * olena/oln/convert/bound.hh: Likewise.
- * olena/oln/convert/nrgbxyz.hh: Likewise.
- * olena/oln/convert/rgbnrgb.hh: Likewise.
- * olena/oln/convert/rgbxyz.hh: Likewise.
- * olena/oln/convol/fast_gaussian.hxx: Likewise.
- * olena/oln/level/cc.hh: Likewise.
- * olena/oln/level/connected.hh: Likewise.
- * olena/oln/level/invert.hh: Likewise.
- * olena/oln/math/macros.hh: Likewise.
- * olena/oln/morpho/extrema.hxx: Likewise.
- * olena/oln/topo/dmap.hh: Likewise.
- * olena/oln/topo/dmap.hh: Likewise.
- * olena/oln/utils/copy.hh: Likewise.
- * olena/oln/utils/histogram.hh: Likewise.
- * olena/oln/morpho/attribute_union_find.hh: Likewise.
- * olena/oln/topo/tarjan/union.hh: Likewise.
- * olena/oln/topo/inter-pixel/inter-pixel.hh: Likewise.
- * olena/oln/topo/tarjan/flat-zone.hh: Likewise.
- * olena/oln/topo/combinatorial-map/cmap.hh: Likewise.
- * olena/oln/topo/inter-pixel/fwd-dir-iter.hh: Likewise.
- * olena/oln/topo/inter-pixel/bkd-dir-iter.hh: Likewise.
- * olena/oln/topo/inter-pixel/internal/dir.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/anyfunc.hh: Likewise.
- * olena/oln/convert/rgbhsv.hh: Likewise.
- * olena/oln/convert/rgbhsl.hh: Likewise.
- * olena/oln/convert/rgbhsi.hh: Likewise.
- * olena/oln/convert/rgbyuv.hh: Likewise.
- * olena/oln/convert/rgbyiq.hh: Likewise.
- * olena/oln/snakes/snakes_base.hh: Likewise.
- * olena/oln/snakes/node.hh: Likewise.
- * olena/oln/snakes/segment.hh: Likewise.
+ * oln/convert/bound.hh: Likewise.
+ * oln/convert/nrgbxyz.hh: Likewise.
+ * oln/convert/rgbnrgb.hh: Likewise.
+ * oln/convert/rgbxyz.hh: Likewise.
+ * oln/convol/fast_gaussian.hxx: Likewise.
+ * oln/level/cc.hh: Likewise.
+ * oln/level/connected.hh: Likewise.
+ * oln/level/invert.hh: Likewise.
+ * oln/math/macros.hh: Likewise.
+ * oln/morpho/extrema.hxx: Likewise.
+ * oln/topo/dmap.hh: Likewise.
+ * oln/topo/dmap.hh: Likewise.
+ * oln/utils/copy.hh: Likewise.
+ * oln/utils/histogram.hh: Likewise.
+ * oln/morpho/attribute_union_find.hh: Likewise.
+ * oln/topo/tarjan/union.hh: Likewise.
+ * oln/topo/inter-pixel/inter-pixel.hh: Likewise.
+ * oln/topo/tarjan/flat-zone.hh: Likewise.
+ * oln/topo/combinatorial-map/cmap.hh: Likewise.
+ * oln/topo/inter-pixel/fwd-dir-iter.hh: Likewise.
+ * oln/topo/inter-pixel/bkd-dir-iter.hh: Likewise.
+ * oln/topo/inter-pixel/internal/dir.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/anyfunc.hh: Likewise.
+ * oln/convert/rgbhsv.hh: Likewise.
+ * oln/convert/rgbhsl.hh: Likewise.
+ * oln/convert/rgbhsi.hh: Likewise.
+ * oln/convert/rgbyuv.hh: Likewise.
+ * oln/convert/rgbyiq.hh: Likewise.
+ * oln/snakes/snakes_base.hh: Likewise.
+ * oln/snakes/node.hh: Likewise.
+ * oln/snakes/segment.hh: Likewise.
2004-03-14 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/topo/dmap.hh: Correct comments.
- * olena/oln/topo/tarjan/flat-zone.hh: Likewise.
+
+ * oln/topo/dmap.hh: Correct comments.
+ * oln/topo/tarjan/flat-zone.hh: Likewise.
2004-03-14 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/convert/nrgbxyz.hh: Correct comments.
- * olena/oln/convert/stretch.hh: Likewise.
- * olena/oln/level/cc.hh: Likewise.
- * olena/oln/morpho/gradient.inc: Likewise.
- * olena/oln/morpho/attribute_closing_opening.hh: Likewise.
- * olena/oln/morpho/attribute_union_find.hh: Likewise.
- * olena/oln/topo/inter-pixel/inter-pixel.hh: Likewise.
- * olena/oln/topo/inter-pixel/node.hh: Likewise.
- * olena/oln/core/abstract/image_with_dim.hh: Likewise.
- * olena/oln/core/impl/image_impl.hh: Likewise.
- * olena/oln/morpho/attributes.hh: Likewise.
- * olena/oln/utils/special_points.hh: Likewise.
+
+ * oln/convert/nrgbxyz.hh: Correct comments.
+ * oln/convert/stretch.hh: Likewise.
+ * oln/level/cc.hh: Likewise.
+ * oln/morpho/gradient.inc: Likewise.
+ * oln/morpho/attribute_closing_opening.hh: Likewise.
+ * oln/morpho/attribute_union_find.hh: Likewise.
+ * oln/topo/inter-pixel/inter-pixel.hh: Likewise.
+ * oln/topo/inter-pixel/node.hh: Likewise.
+ * oln/core/abstract/image_with_dim.hh: Likewise.
+ * oln/core/impl/image_impl.hh: Likewise.
+ * oln/morpho/attributes.hh: Likewise.
+ * oln/utils/special_points.hh: Likewise.
2004-03-14 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -1071,124 +1174,129 @@
* oln/core/abstract/iter.hh: Likewise.
2004-03-14 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/core/abstract/iter1d.hh: Fix a bug.
- * olena/oln/core/abstract/iter2d.hh: Fix a bug.
- * olena/oln/core/abstract/iter3d.hh: Fix a bug.
- * olena/oln/morpho/attribute_union_find.hh: Add a FIXME.
- * olena/oln/topo/dmap.hh: Add comments.
- * olena/oln/topo/tarjan/union.hh: Likewise.
- * olena/oln/topo/inter-pixel/inter-pixel.hh: Likewise.
- * olena/oln/topo/tarjan/flat-zone.hh: Likewise.
- * olena/oln/topo/combinatorial-map/cmap.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/zeta.hh: Likewise.
- * olena/oln/topo/inter-pixel/fwd-dir-iter.hh: Likewise.
- * olena/oln/topo/inter-pixel/bkd-dir-iter.hh: Likewise.
- * olena/oln/topo/inter-pixel/node.hh: Likewise.
- * olena/oln/topo/inter-pixel/internal/dir-iter.hh: Likewise.
- * olena/oln/topo/inter-pixel/internal/dir.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/alpha.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/anyfunc.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/beta.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/lambda.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/level.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/sigma.hh : Likewise.
+
+ * oln/core/abstract/iter1d.hh: Fix a bug.
+ * oln/core/abstract/iter2d.hh: Fix a bug.
+ * oln/core/abstract/iter3d.hh: Fix a bug.
+ * oln/morpho/attribute_union_find.hh: Add a FIXME.
+ * oln/topo/dmap.hh: Add comments.
+ * oln/topo/tarjan/union.hh: Likewise.
+ * oln/topo/inter-pixel/inter-pixel.hh: Likewise.
+ * oln/topo/tarjan/flat-zone.hh: Likewise.
+ * oln/topo/combinatorial-map/cmap.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/zeta.hh: Likewise.
+ * oln/topo/inter-pixel/fwd-dir-iter.hh: Likewise.
+ * oln/topo/inter-pixel/bkd-dir-iter.hh: Likewise.
+ * oln/topo/inter-pixel/node.hh: Likewise.
+ * oln/topo/inter-pixel/internal/dir-iter.hh: Likewise.
+ * oln/topo/inter-pixel/internal/dir.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/alpha.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/anyfunc.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/beta.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/lambda.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/level.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/sigma.hh : Likewise.
2004-03-13 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/utils/copy.hh: Add comments.
- * olena/oln/utils/histogram.hh: Likewise.
- * olena/oln/utils/stat.hh: Likewise.
- * olena/oln/utils/timer.hh: Likewise.
- * olena/oln/utils/special_points.hh: Likewise.
+
+ * oln/utils/copy.hh: Add comments.
+ * oln/utils/histogram.hh: Likewise.
+ * oln/utils/stat.hh: Likewise.
+ * oln/utils/timer.hh: Likewise.
+ * oln/utils/special_points.hh: Likewise.
2004-03-13 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/arith/internal/opdecls.hh: Add comments.
- * olena/oln/arith/logic.hh: Likewise.
- * olena/oln/arith/ops.hh: Likewise.
- * olena/oln/math/macros.hh: Likewise.
- * olena/oln/config/pconf-hh.in: Likewise.
+
+ * oln/arith/internal/opdecls.hh: Add comments.
+ * oln/arith/logic.hh: Likewise.
+ * oln/arith/ops.hh: Likewise.
+ * oln/math/macros.hh: Likewise.
+ * oln/config/pconf-hh.in: Likewise.
2004-03-13 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/convert/basics.hh: Add comments.
- * olena/oln/convert/bound.hh: Likewise.
- * olena/oln/convert/abstract/colorconv.hh: Likewise.
- * olena/oln/convert/conversion.hh: Likewise.
- * olena/oln/convert/conversion_ng_se.hh: Likewise.
- * olena/oln/convert/force.hh: Likewise.
- * olena/oln/convert/nrgbxyz.hh: Likewise.
- * olena/oln/convert/rgbnrgb.hh: Likewise.
- * olena/oln/convert/rgbxyz.hh: Likewise.
- * olena/oln/convert/abstract/conversion.hh: Likewise.
- * olena/oln/convert/cast.hh: Likewise.
- * olena/oln/convert/rgbhsv.hh: Likewise.
- * olena/oln/convert/rgbhsl.hh: Likewise.
- * olena/oln/convert/rgbhsi.hh: Likewise.
- * olena/oln/convert/rgbyuv.hh: Likewise.
- * olena/oln/convert/rgbyiq.hh: Likewise.
- * olena/oln/convert/value_to_point.hh: Likewise.
- * olena/oln/convert/stretch.hh: Fix bug.
+
+ * oln/convert/basics.hh: Add comments.
+ * oln/convert/bound.hh: Likewise.
+ * oln/convert/abstract/colorconv.hh: Likewise.
+ * oln/convert/conversion.hh: Likewise.
+ * oln/convert/conversion_ng_se.hh: Likewise.
+ * oln/convert/force.hh: Likewise.
+ * oln/convert/nrgbxyz.hh: Likewise.
+ * oln/convert/rgbnrgb.hh: Likewise.
+ * oln/convert/rgbxyz.hh: Likewise.
+ * oln/convert/abstract/conversion.hh: Likewise.
+ * oln/convert/cast.hh: Likewise.
+ * oln/convert/rgbhsv.hh: Likewise.
+ * oln/convert/rgbhsl.hh: Likewise.
+ * oln/convert/rgbhsi.hh: Likewise.
+ * oln/convert/rgbyuv.hh: Likewise.
+ * oln/convert/rgbyiq.hh: Likewise.
+ * oln/convert/value_to_point.hh: Likewise.
+ * oln/convert/stretch.hh: Fix bug.
2004-03-13 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/convert/stretch.hh: Add stretch_balance. Add comments.
+
+ * oln/convert/stretch.hh: Add stretch_balance. Add comments.
2004-03-12 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/core/accum.hh: Add comments.
- * olena/oln/core/apply.hh: Likewise.
- * olena/oln/core/compose.hh: Likewise.
- * olena/oln/core/coord.hh: Likewise.
- * olena/oln/core/dpoint1d.hh: Likewise.
- * olena/oln/core/dpoint2d.hh: Likewise.
- * olena/oln/core/dpoint3d.hh: Likewise.
- * olena/oln/core/fold.hh: Likewise.
- * olena/oln/core/image1d.hh: Likewise.
- * olena/oln/core/image1d_size.hh: Likewise.
- * olena/oln/core/image2d.hh: Likewise.
- * olena/oln/core/image2d_size.hh: Likewise.
- * olena/oln/core/image3d.hh: Likewise.
- * olena/oln/core/image3d_size.hh: Likewise.
- * olena/oln/core/image.hh: Likewise.
- * olena/oln/core/point1d.hh: Likewise.
- * olena/oln/core/point2d.hh: Likewise.
- * olena/oln/core/point3d.hh: Likewise.
- * olena/oln/core/traverse.hh: Likewise.
- * olena/oln/core/abstract/image.hh: Correct comments.
- * olena/oln/core/impl/image_impl.hh: Add comments.
- * olena/oln/core/impl/image_array.hh: Likewise.
- * olena/oln/core/impl/image_array3d.hh: Likewise.
- * olena/oln/core/impl/image_array2d.hh: Likewise.
- * olena/oln/core/impl/image_array1d.hh: Likewise.
- * olena/oln/core/behavior.hh: Likewise.
+ * oln/core/accum.hh: Add comments.
+ * oln/core/apply.hh: Likewise.
+ * oln/core/compose.hh: Likewise.
+ * oln/core/coord.hh: Likewise.
+ * oln/core/dpoint1d.hh: Likewise.
+ * oln/core/dpoint2d.hh: Likewise.
+ * oln/core/dpoint3d.hh: Likewise.
+ * oln/core/fold.hh: Likewise.
+ * oln/core/image1d.hh: Likewise.
+ * oln/core/image1d_size.hh: Likewise.
+ * oln/core/image2d.hh: Likewise.
+ * oln/core/image2d_size.hh: Likewise.
+ * oln/core/image3d.hh: Likewise.
+ * oln/core/image3d_size.hh: Likewise.
+ * oln/core/image.hh: Likewise.
+ * oln/core/point1d.hh: Likewise.
+ * oln/core/point2d.hh: Likewise.
+ * oln/core/point3d.hh: Likewise.
+ * oln/core/traverse.hh: Likewise.
+ * oln/core/abstract/image.hh: Correct comments.
+ * oln/core/impl/image_impl.hh: Add comments.
+ * oln/core/impl/image_array.hh: Likewise.
+ * oln/core/impl/image_array3d.hh: Likewise.
+ * oln/core/impl/image_array2d.hh: Likewise.
+ * oln/core/impl/image_array1d.hh: Likewise.
+ * oln/core/behavior.hh: Likewise.
2004-03-12 Simon Odou <simon(a)lrde.epita.fr>
- * olena/oln/core/bkd_iter1d.hh: Correct comments.
- * olena/oln/core/bkd_iter2d.hh: Likewise.
- * olena/oln/core/bkd_iter3d.hh: Likewise.
- * olena/oln/core/fwd_iter1d.hh: Likewise.
- * olena/oln/core/fwd_iter2d.hh: Likewise.
- * olena/oln/core/fwd_iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter1d.hh: Likewise.
- * olena/oln/core/abstract/iter2d.hh: Likewise.
- * olena/oln/core/abstract/iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter.hh: Likewise.
- * olena/oln/core/neighborhood1d.hh: Likewise.
- * olena/oln/core/neighborhood2d.hh: Likewise.
- * olena/oln/core/neighborhood3d.hh: Likewise.
- * olena/oln/core/abstract/neighborhood.hh: Likewise.
- * olena/oln/core/abstract/struct_elt.hh: Likewise.
- * olena/oln/core/window1d.hh: Likewise.
- * olena/oln/core/window2d.hh: Likewise.
- * olena/oln/core/window3d.hh: Likewise.
- * olena/oln/core/abstract/window.hh: Likewise.
- * olena/oln/core/w_window1d.hh: Likewise.
- * olena/oln/core/w_window2d.hh: Likewise.
- * olena/oln/core/w_window3d.hh: Likewise.
- * olena/oln/core/abstract/w_window.hh: Likewise.
- * olena/oln/core/abstract/image.hh: Likewise.
- * olena/oln/core/abstract/window_base.hh: Likewise.
- * olena/oln/core/abstract/windownd.hh: Likewise.
- * olena/oln/core/abstract/w_windownd.hh: Likewise.
- * olena/oln/core/abstract/neighborhoodnd.hh: Likewise.
+ * oln/core/bkd_iter1d.hh: Correct comments.
+ * oln/core/bkd_iter2d.hh: Likewise.
+ * oln/core/bkd_iter3d.hh: Likewise.
+ * oln/core/fwd_iter1d.hh: Likewise.
+ * oln/core/fwd_iter2d.hh: Likewise.
+ * oln/core/fwd_iter3d.hh: Likewise.
+ * oln/core/abstract/iter1d.hh: Likewise.
+ * oln/core/abstract/iter2d.hh: Likewise.
+ * oln/core/abstract/iter3d.hh: Likewise.
+ * oln/core/abstract/iter.hh: Likewise.
+ * oln/core/neighborhood1d.hh: Likewise.
+ * oln/core/neighborhood2d.hh: Likewise.
+ * oln/core/neighborhood3d.hh: Likewise.
+ * oln/core/abstract/neighborhood.hh: Likewise.
+ * oln/core/abstract/struct_elt.hh: Likewise.
+ * oln/core/window1d.hh: Likewise.
+ * oln/core/window2d.hh: Likewise.
+ * oln/core/window3d.hh: Likewise.
+ * oln/core/abstract/window.hh: Likewise.
+ * oln/core/w_window1d.hh: Likewise.
+ * oln/core/w_window2d.hh: Likewise.
+ * oln/core/w_window3d.hh: Likewise.
+ * oln/core/abstract/w_window.hh: Likewise.
+ * oln/core/abstract/image.hh: Likewise.
+ * oln/core/abstract/window_base.hh: Likewise.
+ * oln/core/abstract/windownd.hh: Likewise.
+ * oln/core/abstract/w_windownd.hh: Likewise.
+ * oln/core/abstract/neighborhoodnd.hh: Likewise.
2004-03-12 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -1222,44 +1330,45 @@
* oln/morpho/watershed.hxx: Likewise.
2004-03-11 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/core/abstract/image.hh: Add comments.
- * olena/oln/core/abstract/image_with_dim.hh: Correct comments.
+ * oln/core/abstract/image.hh: Add comments.
+ * oln/core/abstract/image_with_dim.hh: Correct comments.
2004-03-11 Simon Odou <simon(a)lrde.epita.fr>
- * olena/oln/core/abstract/image.hh: Add same macros without the
+ * oln/core/abstract/image.hh: Add same macros without the
'template' keyword.
2004-03-11 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/core/abstract/dpoint.hh: Add comments.
- * olena/oln/core/abstract/image_size.hh: Add comments.
- * olena/oln/core/abstract/point.hh: Add comments.
- * olena/oln/core/abstract/image.hh: Add comments.
- * olena/oln/core/abstract/image_with_dim.hh: Add comments.
- * olena/oln/core/abstract/image_with_impl.hh: Add comments.
- * olena/oln/core/abstract/image_with_type.hh: Add comments.
- * olena/oln/core/abstract/image_with_type_with_dim.hh: Add comments.
- * olena/oln/core/abstract/behavior.hh: Add comments.
+ * oln/core/abstract/dpoint.hh: Add comments.
+ * oln/core/abstract/image_size.hh: Add comments.
+ * oln/core/abstract/point.hh: Add comments.
+ * oln/core/abstract/image.hh: Add comments.
+ * oln/core/abstract/image_with_dim.hh: Add comments.
+ * oln/core/abstract/image_with_impl.hh: Add comments.
+ * oln/core/abstract/image_with_type.hh: Add comments.
+ * oln/core/abstract/image_with_type_with_dim.hh: Add comments.
+ * oln/core/abstract/behavior.hh: Add comments.
2004-03-10 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/level/compare.hh: Add comments.
- * olena/oln/level/connected.hh: Add comments.
- * olena/oln/level/fill.hh: Add comments.
- * olena/oln/level/invert.hh: Add comments.
- * olena/oln/level/lut.hh: Add comments.
- * olena/oln/level/set_level.hh: Add comments.
- * olena/oln/level/threshold.hh: Add comments.
+
+ * oln/level/compare.hh: Add comments.
+ * oln/level/connected.hh: Add comments.
+ * oln/level/fill.hh: Add comments.
+ * oln/level/invert.hh: Add comments.
+ * oln/level/lut.hh: Add comments.
+ * oln/level/set_level.hh: Add comments.
+ * oln/level/threshold.hh: Add comments.
2004-03-10 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/snakes/snakes_base.hh: Add comments.
- * olena/oln/snakes/energies.hh: Add comments.
- * olena/oln/snakes/greedy.hh: Add comments.
- * olena/oln/snakes/node.hh: Add comments.
- * olena/oln/snakes/segment.hh: Add comments.
- * olena/oln/snakes/snakes_base.hh: Add comments.
- * olena/oln/morpho/attribute_closing_opening.hh: Fix bug in doc.
- * olena/oln/morpho/attribute_closing_opening_map.hh: Fix bug in doc.
+ * oln/snakes/snakes_base.hh: Add comments.
+ * oln/snakes/energies.hh: Add comments.
+ * oln/snakes/greedy.hh: Add comments.
+ * oln/snakes/node.hh: Add comments.
+ * oln/snakes/segment.hh: Add comments.
+ * oln/snakes/snakes_base.hh: Add comments.
+ * oln/morpho/attribute_closing_opening.hh: Fix bug in doc.
+ * oln/morpho/attribute_closing_opening_map.hh: Fix bug in doc.
2004-03-10 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -1279,7 +1388,8 @@
* tests/morpho/tests/attr_op_cl: Change tests to make them taking
care of new attribute names.
- * oln/morpho/attribute_closing_opening_map.hh: Change some function names.
+ * oln/morpho/attribute_closing_opening_map.hh: Change some
+ function names.
* oln/morpho/attributes.hh: Rename some attributes. Add new ones.
* oln/Makefile.am: Add file references.
* oln/morpho/attribute_union_find.hh: Remove old attribute class.
@@ -1837,7 +1947,7 @@
* oln/core/abstract/image_with_impl.hh: ...here.
- * olena/oln/core/image.hh: Fix constructors.
+ * oln/core/image.hh: Fix constructors.
* tests/core/tests/image2: Adapt and fix.
@@ -1950,26 +2060,26 @@
* oln/utils/histogram.hh: Check if the given data type is valid.
* oln/morpho/closing.inc: Take non_vectorial_image instead of image.
- * oln/morpho/dilation.hh: Likewise.
- * oln/morpho/erosion.hh: Likewise.
- * oln/morpho/extrema.hxx: Likewise.
- * oln/morpho/extrema_killer.hh: Likewise.
- * oln/morpho/fast_morpho.hh: Likewise.
- * oln/morpho/fast_morpho.hxx: Likewise.
- * oln/morpho/geodesic_dilation.hh: Likewise.
- * oln/morpho/geodesic_erosion.hh: Likewise.
- * oln/morpho/gradient.inc: Likewise.
- * oln/morpho/hit_or_miss.inc: Likewise.
- * oln/morpho/laplacian.inc: Likewise.
- * oln/morpho/opening.inc: Likewise.
- * oln/morpho/reconstruction.hh: Likewise.
- * oln/morpho/stat.hh: Likewise.
- * oln/morpho/thickening.inc: Likewise.
- * oln/morpho/thinning.inc: Likewise.
- * oln/morpho/top_hat.inc: Likewise.
- * oln/morpho/watershed.hh: Likewise.
- * oln/morpho/watershed.hxx: Likewise.
- * oln/morpho/attribute_closing_opening.hh: Likewise.
+ * oln/morpho/dilation.hh: Likewise.
+ * oln/morpho/erosion.hh: Likewise.
+ * oln/morpho/extrema.hxx: Likewise.
+ * oln/morpho/extrema_killer.hh: Likewise.
+ * oln/morpho/fast_morpho.hh: Likewise.
+ * oln/morpho/fast_morpho.hxx: Likewise.
+ * oln/morpho/geodesic_dilation.hh: Likewise.
+ * oln/morpho/geodesic_erosion.hh: Likewise.
+ * oln/morpho/gradient.inc: Likewise.
+ * oln/morpho/hit_or_miss.inc: Likewise.
+ * oln/morpho/laplacian.inc: Likewise.
+ * oln/morpho/opening.inc: Likewise.
+ * oln/morpho/reconstruction.hh: Likewise.
+ * oln/morpho/stat.hh: Likewise.
+ * oln/morpho/thickening.inc: Likewise.
+ * oln/morpho/thinning.inc: Likewise.
+ * oln/morpho/top_hat.inc: Likewise.
+ * oln/morpho/watershed.hh: Likewise.
+ * oln/morpho/watershed.hxx: Likewise.
+ * oln/morpho/attribute_closing_opening.hh: Likewise.
2003-08-03 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
@@ -2342,43 +2452,43 @@
2003-07-30 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
- * oln/arith/ops.hh: Fix compilation with g++ 3.4.
- * oln/core/abstract/dpoint.hh: Likewise.
- * oln/core/image1d.hh: Likewise.
- * oln/core/image2d.hh: Likewise.
- * oln/core/image3d.hh: Likewise.
- * oln/core/abstract/iter1d.hh: Likewise.
- * oln/core/abstract/iter2d.hh: Likewise.
- * oln/core/abstract/iter3d.hh: Likewise.
- * oln/core/abstract/iter.hh: Likewise.
- * oln/core/neighborhood1d.hh: Likewise.
- * oln/core/neighborhood2d.hh: Likewise.
- * oln/core/neighborhood3d.hh: Likewise.
- * oln/core/abstract/neighborhood.hh: Likewise.
- * oln/core/abstract/point.hh: Likewise.
- * oln/core/abstract/struct_elt.hh: Likewise.
- * oln/core/window1d.hh: Likewise.
- * oln/core/window2d.hh: Likewise.
- * oln/core/window3d.hh: Likewise.
- * oln/core/abstract/window.hh: Likewise.
- * oln/core/w_window1d.hh: Likewise.
- * oln/core/w_window2d.hh: Likewise.
- * oln/core/w_window3d.hh: Likewise.
- * oln/core/abstract/w_window.hh: Likewise.
- * oln/level/invert.hh: Likewise.
- * oln/morpho/erosion.hh: Likewise.
- * tests/morpho/extrkiller.cc: Likewise.
- * oln/topo/inter-pixel/internal/dir-iter.hh: Likewise.
- * oln/core/abstract/image.hh: Likewise.
- * oln/core/abstract/image_with_dim.hh: Likewise.
- * oln/core/abstract/image_with_impl.hh: Likewise.
- * oln/core/abstract/image_with_type.hh: Likewise.
- * oln/core/impl/image_impl.hh: Likewise.
- * oln/core/impl/image_array.hh: Likewise.
- * oln/core/abstract/window_base.hh: Likewise.
- * oln/core/abstract/windownd.hh: Likewise.
- * oln/core/abstract/w_windownd.hh: Likewise.
- * oln/core/abstract/neighborhoodnd.hh: Likewise.
+ * oln/arith/ops.hh: Fix compilation with g++ 3.4.
+ * oln/core/abstract/dpoint.hh: Likewise.
+ * oln/core/image1d.hh: Likewise.
+ * oln/core/image2d.hh: Likewise.
+ * oln/core/image3d.hh: Likewise.
+ * oln/core/abstract/iter1d.hh: Likewise.
+ * oln/core/abstract/iter2d.hh: Likewise.
+ * oln/core/abstract/iter3d.hh: Likewise.
+ * oln/core/abstract/iter.hh: Likewise.
+ * oln/core/neighborhood1d.hh: Likewise.
+ * oln/core/neighborhood2d.hh: Likewise.
+ * oln/core/neighborhood3d.hh: Likewise.
+ * oln/core/abstract/neighborhood.hh: Likewise.
+ * oln/core/abstract/point.hh: Likewise.
+ * oln/core/abstract/struct_elt.hh: Likewise.
+ * oln/core/window1d.hh: Likewise.
+ * oln/core/window2d.hh: Likewise.
+ * oln/core/window3d.hh: Likewise.
+ * oln/core/abstract/window.hh: Likewise.
+ * oln/core/w_window1d.hh: Likewise.
+ * oln/core/w_window2d.hh: Likewise.
+ * oln/core/w_window3d.hh: Likewise.
+ * oln/core/abstract/w_window.hh: Likewise.
+ * oln/level/invert.hh: Likewise.
+ * oln/morpho/erosion.hh: Likewise.
+ * tests/morpho/extrkiller.cc: Likewise.
+ * oln/topo/inter-pixel/internal/dir-iter.hh: Likewise.
+ * oln/core/abstract/image.hh: Likewise.
+ * oln/core/abstract/image_with_dim.hh: Likewise.
+ * oln/core/abstract/image_with_impl.hh: Likewise.
+ * oln/core/abstract/image_with_type.hh: Likewise.
+ * oln/core/impl/image_impl.hh: Likewise.
+ * oln/core/impl/image_array.hh: Likewise.
+ * oln/core/abstract/window_base.hh: Likewise.
+ * oln/core/abstract/windownd.hh: Likewise.
+ * oln/core/abstract/w_windownd.hh: Likewise.
+ * oln/core/abstract/neighborhoodnd.hh: Likewise.
2003-07-30 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
@@ -3481,7 +3591,7 @@
2003-03-12 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
* tests/check/Makefile.flags, tests/sanity/Makefile.am: Remove
- useless flags.
+ useless flags.
* Makefile.am: Adjust consequently.
@@ -3569,7 +3679,7 @@
* oln/Makefile.am (nobase_oln_HEADERS): Adjust.
* oln/morpho/attribute_union_find.hh: Fix includes and
- namespaces.
+ namespaces.
2003-03-07 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
@@ -4183,7 +4293,8 @@
* configure.ac: Merge tests/configure.ac. Use AC_CONFIG_FILES
instead of AC_CONFIG_HEADERS for pconf.inc.
- * tests/defs.in (CXXFLAGS): Remove warning options (added by "configure")
+ * tests/defs.in (CXXFLAGS): Remove warning options (added by
+ "configure")
* tests/Makefile.am (SUBDIRS): Correct @OLN_TESTS_SUBDIRS@ to
$(OLN_TESTS_SUBDIRS). Add comments.
@@ -4268,7 +4379,7 @@
* oln/core/point3d.hh: Add dpoint3d typedef.
* oln/core/point.hh: Minor change.
* oln/meta/basics.hh: Add an 'undefined' class for static
- error reporting.
+ error reporting.
* oln/core/box.hh:
- Parameter is changed to 'PointType'.
- (overlay): New.
@@ -4447,29 +4558,29 @@
2002-12-26 Reda Dehak <reda(a)nemours.epita.fr>
- * oln/convol/convolution.hh: Fix include files.
- * tests/convol/slow_sum_2d_1.cc: Change accordingly.
- * tests/convol/slow_sum_2d_2.cc: Change accordingly.
- * tests/convol/sobel_gradient.cc: Change accordingly.
+ * oln/convol/convolution.hh: Fix include files.
+ * tests/convol/slow_sum_2d_1.cc: Change accordingly.
+ * tests/convol/slow_sum_2d_2.cc: Change accordingly.
+ * tests/convol/sobel_gradient.cc: Change accordingly.
2002-12-11 Quoc Peyrot <chojin(a)lrde.epita.fr>
- * oln/Makefile.am (nobase_oln_HEADERS): Add morpho/extrema.hxx.
- move level/extrema_killer.hh to morpho/extrema_killer.hh.
+ * oln/Makefile.am (nobase_oln_HEADERS): Add morpho/extrema.hxx.
+ move level/extrema_killer.hh to morpho/extrema_killer.hh.
- * oln/morpho/extrema_killer.hh: Change namespace.
- * demo/test-reconstruction.cc: Change accordingly.
+ * oln/morpho/extrema_killer.hh: Change namespace.
+ * demo/test-reconstruction.cc: Change accordingly.
2002-12-11 Reda Dehak <reda(a)lrde.epita.fr>
- * oln/convol/convolution.hh: Fix convolve function.
- * test/convol/slow_sum_2d_1.hh: Modify accordingly.
- * test/convol/slow_sum_2d_2.hh: Modify accordingly.
- * test/convol/sobel_gradient.hh: Modify accordingly.
+ * oln/convol/convolution.hh: Fix convolve function.
+ * test/convol/slow_sum_2d_1.hh: Modify accordingly.
+ * test/convol/slow_sum_2d_2.hh: Modify accordingly.
+ * test/convol/sobel_gradient.hh: Modify accordingly.
2002-12-11 Quoc Peyrot <chojin(a)lrde.epita.fr>
- * Branch for olena 0.6 stable
+ * Branch for olena 0.6 stable
(End of changes from 0.6)
Index: 10.246/tools/swilena/ChangeLog
--- 10.246/tools/swilena/ChangeLog Thu, 13 Jul 2006 16:20:10 +0200 levill_r (oln/n/37_ChangeLog 1.7.1.47 600)
+++ 10.246(w)/tools/swilena/ChangeLog Mon, 21 Aug 2006 17:06:57 +0200 theo (oln/n/37_ChangeLog 1.7.1.48 600)
@@ -15,11 +15,11 @@
Complete Rblena test suite.
* ruby/tests/arith.rb, ruby/tests/conversions.rb,
- * ruby/tests/morpho.rb: New tests
+ * ruby/tests/morpho.rb: New tests
* ruby/tests/Makefile.am (dist_noinst_DATA): Add arith.rb,
conversions.rb and morpho.rb.
- * python/tests/conversions.py, python/tests/morpho.py:
+ * python/tests/conversions.py, python/tests/morpho.py:
* python/tests/simple1.py: Reduce the number of imported modules.
* python/tests/Makefile.am, python/tests/arith.py,
* python/tests/sanity.py, ruby/tests/conversions.rb,
Index: 10.246/olena/oln/lrde/ufmt/bin/basic_salembier.cc
--- 10.246/olena/oln/lrde/ufmt/bin/basic_salembier.cc Thu, 03 Aug 2006 16:06:43 +0200 theo (oln/x/1_basic_sale 1.1 644)
+++ 10.246(w)/olena/oln/lrde/ufmt/bin/basic_salembier.cc Mon, 21 Aug 2006 16:54:16 +0200 theo (oln/x/1_basic_sale 1.1 644)
@@ -27,13 +27,18 @@
image_t input = load(argv[1]);
int c = atoi(argv[2]);
- if (not (c == 4 or c == 8))
+ if (not (c == 2 or c == 4 or c == 8))
usage(argv);
typedef lrde::ufmt::basic_salembier<image_t> algorithm_t;
- algorithm_t run(input,
- c == 4 ? neighb_c4() : neighb_c8());
+ neighborhood2d nbh;
+ if (c == 2)
+ nbh.add(dpoint2d(0, 1));
+ else
+ nbh = c == 4 ? neighb_c4() : neighb_c8();
+
+ algorithm_t run(input, nbh);
run.go();
std::cout << "n level roots = " << run.n_level_roots() << std::endl;
}
Index: 10.246/olena/oln/lrde/ufmt/log.hh
--- 10.246/olena/oln/lrde/ufmt/log.hh Thu, 03 Aug 2006 16:06:43 +0200 theo (oln/x/5_log.hh 1.1 644)
+++ 10.246(w)/olena/oln/lrde/ufmt/log.hh Fri, 18 Aug 2006 18:30:43 +0200 theo (oln/x/5_log.hh 1.1 644)
@@ -28,6 +28,8 @@
#ifndef OLENA_LRDE_UFMT_LOG_HH
# define OLENA_LRDE_UFMT_LOG_HH
+# include <map>
+# include <oln/level/fill.hh>
namespace oln
@@ -39,6 +41,7 @@
namespace ufmt
{
+ // couting
template <class Algo>
unsigned n_level_roots(const Algo& algo)
@@ -52,6 +55,212 @@
return count;
}
+ template <class Algo>
+ unsigned n_roots(const Algo& algo)
+ {
+ typedef typename Algo::image I;
+ unsigned count = 0;
+ oln_iter_type(I) p(algo.f_());
+ for_all(p)
+ if (algo.is_root_(p))
+ ++count;
+ return count;
+ }
+
+
+
+ // building images
+
+ template <class Algo>
+ typename Algo::bin_image_t // e.g., image2d<bool>
+ level_root_image(const Algo& algo)
+ {
+ typedef typename Algo::bin_image_t B;
+ B lroot(algo.f_().size());
+ level::fill(lroot, false);
+ oln_iter_type(B) p(algo.f_());
+ for_all(p)
+ if (algo.is_level_root_(p))
+ lroot[p] = true;
+ return lroot;
+ }
+
+
+ template <class Algo>
+ typename Algo::int_u8_image_t
+ tree_image(const Algo& algo, bool print_counts = false)
+ {
+ typedef typename Algo::point point;
+ enum {
+ unknown = 0, // temporary label
+
+ // tree root (black)
+ root = 1,
+
+ // the following labels are for "not tree root" points
+
+ // level roots are:
+ // - intermediate (red) or
+ intermediate_level_root = 2,
+ // - leaf (green)
+ leaf_level_root = 3, // not root
+
+ // some points belong to a path between a couple of level roots
+ // (white)
+ in_between_level_point = 6,
+
+ // otherwise points are:
+ // - leaf (blue)
+ leaf_point = 4,
+ // - intermediate (yellow)
+ intermediate_point = 5
+ };
+
+ typedef typename Algo::int_u8_image_t T;
+ T tree(algo.f_().size());
+ level::fill(tree, unknown);
+
+ oln_iter_type(T) p(algo.f_());
+
+ for_all(p)
+ if (algo.is_root_(p))
+ tree[p] = root;
+ else if (algo.is_level_root_(p))
+ tree[p] = leaf_level_root; // but we do not know about 'leaf'
+
+ for_all(p)
+ if (algo.is_level_root_(p))
+ {
+ point q = p; // from p level root
+ do
+ {
+ q = algo.parent_(q);
+ if (not algo.is_level_root_(q))
+ // we reach a non level root point
+ tree[q] = in_between_level_point;
+ }
+ while (not algo.is_level_root_(q));
+ // level root p --> level root q
+ if (q != p and not algo.is_root_(q))
+ tree[q] = intermediate_level_root; // not leaf level root
+ }
+
+ for_all(p)
+ {
+ point par_p = algo.parent_(p);
+ if (tree[par_p] == unknown)
+ tree[par_p] = intermediate_point;
+ }
+ for_all(p)
+ if (tree[p] == unknown)
+ tree[p] = leaf_point;
+
+ // printing
+ if (print_counts)
+ {
+ unsigned
+ n_roots = 0,
+ n_intermediate_level_roots = 0,
+ n_leaf_level_roots = 0,
+ n_in_between_level_points = 0,
+ n_leaf_points = 0,
+ n_intermediate_points = 0;
+
+ for_all(p)
+ switch (tree[p]) {
+ case root:
+ ++n_roots;
+ break;
+ case intermediate_level_root:
+ ++n_intermediate_level_roots;
+ break;
+ case leaf_level_root:
+ ++n_leaf_level_roots;
+ break;
+ case in_between_level_point:
+ ++n_in_between_level_points;
+ break;
+ case leaf_point:
+ ++n_leaf_points;
+ break;
+ case intermediate_point:
+ ++n_intermediate_points;
+ break;
+ }
+
+ std::cout << "n roots = " << n_roots << std::endl
+ << "n intermediate lroots = " << n_intermediate_level_roots << std::endl
+ << "n leaf lroots = " << n_leaf_level_roots << std::endl
+ << "n in-between lpoint = " << n_in_between_level_points << std::endl
+ << "n leaf points = " << n_leaf_points << std::endl
+ << "n intermediate points = " << n_intermediate_points << std::endl;
+
+ }
+
+ return tree;
+ }
+
+
+
+ // comparing images
+
+ template <class I1, class I2>
+ bool
+ check_equiv_label_images(const abstract::image<I1>& label1,
+ const abstract::image<I2>& label2)
+ {
+ assert(label1.size() == label2.size());
+ std::map<unsigned, unsigned> m;
+ oln_iter_type(I1) p(label1);
+ for_all(p)
+ {
+ if (m.find(label1[p]) == m.end())
+ m[label1[p]] = label2[p];
+ else
+ if (label2[p] != m[label1[p]])
+ return false;
+ }
+ return true;
+ }
+
+
+
+ // invariant checking
+
+ template <class Algo>
+ bool check_f_par_p_leq_f_p(const Algo& algo)
+ // f(par(p)) <= f(p)
+ {
+ typedef typename Algo::image I;
+ oln_iter_type(I) p(algo.f_());
+ for_all(p)
+ if (not (algo.f_(algo.parent_(p)) <= algo.f_(p)))
+ {
+ std::cerr << "invariant FAILED: f(par(p)) <= f(p)"
+ << std::endl;
+ return false;
+ }
+ return true;
+ }
+
+
+
+ // some tests
+
+ template <class Algo>
+ bool is_level_compression_completed(const Algo& algo)
+ {
+ typedef typename Algo::image I;
+ oln_iter_type(I) p(algo.f_());
+ for_all(p)
+ if (not is_level_root(algo.parent_(p)))
+ {
+ std::cerr << "test FAILED: level compression is NOT completed"
+ << std::endl;
+ return false;
+ }
+ return true;
+ }
} // end of namespace oln::lrde::ufmt
Index: 10.246/olena/oln/lrde/ufmt/ad_maxtree.hh
--- 10.246/olena/oln/lrde/ufmt/ai_maxtree.hh Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/12_ai_maxtree 1.1 644)
+++ 10.246(w)/olena/oln/lrde/ufmt/ad_maxtree.hh Mon, 21 Aug 2006 16:02:45 +0200 theo (oln/x/12_ai_maxtree 1.1 644)
@@ -25,16 +25,18 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-#ifndef OLENA_LRDE_UFMT_AI_MAXTREE_HH
-# define OLENA_LRDE_UFMT_AI_MAXTREE_HH
+#ifndef OLENA_LRDE_UFMT_AD_MAXTREE_HH
+# define OLENA_LRDE_UFMT_AD_MAXTREE_HH
# include <oln/lrde/ufmt/utils.hh>
-# define oln_lrde_ufmt_import_ai_maxtree_typedefs \
+# define oln_lrde_ufmt_import_ad_maxtree_typedefs \
typedef typename super::image image; \
typedef typename super::point point; \
typedef typename super::dpoint dpoint; \
+ typedef typename super::dparent_t dparent_t; \
+ typedef typename super::dpar_t dpar_t; \
typedef typename super::value value
@@ -61,7 +63,7 @@
// FIXME: doc.
template <class I>
- struct ai_maxtree
+ struct ad_maxtree
{
typedef I image;
typedef int point;
@@ -140,16 +142,17 @@
// aux data
typedef typename mute<I, int>::ret dparent_t;
- dparent_t dpar_; // proxied
+ typedef indexed_image<dparent_t> dpar_t;
- indexed_image<dparent_t> dpar; // proxy
+ dparent_t dpar_; // proxied
+ dpar_t dpar; // proxy
// input
indexed_image<I> f;
// ctor
- ai_maxtree(const abstract::image<I>& f_)
+ ad_maxtree(const abstract::image<I>& f_)
:
dpar_(f_.size())
{
@@ -227,7 +230,7 @@
- }; // end of class ai_maxtree
+ }; // end of class ad_maxtree
@@ -238,4 +241,4 @@
} // end of namespace oln
-#endif // ! OLENA_LRDE_UFMT_AI_MAXTREE_HH
+#endif // ! OLENA_LRDE_UFMT_AD_MAXTREE_HH
Index: 10.246/olena/oln/lrde/ufmt/hdc_maxtree.hh
--- 10.246/olena/oln/lrde/ufmt/si_maxtree.hh Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/13_si_maxtree 1.1 644)
+++ 10.246(w)/olena/oln/lrde/ufmt/hdc_maxtree.hh Mon, 21 Aug 2006 16:14:42 +0200 theo (oln/x/13_si_maxtree 1.1 644)
@@ -25,12 +25,13 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-#ifndef OLENA_LRDE_UFMT_SI_MAXTREE_HH
-# define OLENA_LRDE_UFMT_SI_MAXTREE_HH
+#ifndef OLENA_LRDE_UFMT_HDC_MAXTREE_HH
+# define OLENA_LRDE_UFMT_HDC_MAXTREE_HH
# include <oln/level/fill.hh>
# include <oln/lrde/ufmt/utils.hh>
-# include <oln/lrde/ufmt/ai_maxtree.hh>
+# include <oln/lrde/ufmt/ad_maxtree.hh>
+# include <oln/lrde/ufmt/attributes.hh>
@@ -62,12 +63,12 @@
// FIXME: doc.
template <class I>
- struct si_maxtree : public ai_maxtree<I>
+ struct hdc_maxtree : public ad_maxtree<I>
{
- typedef ai_maxtree<I> super;
+ typedef ad_maxtree<I> super;
using super::f;
using super::dpar;
- oln_lrde_ufmt_import_ai_maxtree_typedefs;
+ oln_lrde_ufmt_import_ad_maxtree_typedefs;
const oln_neighborhood_type(I)& nbh;
@@ -82,7 +83,7 @@
// ctor
- si_maxtree(const abstract::image<I>& f,
+ hdc_maxtree(const abstract::image<I>& f,
const oln_neighborhood_type(I)& nbh)
:
super(f),
@@ -90,11 +91,12 @@
{
}
+ template <class A> // void if no attributes
void go()
{
init();
compute_parent(); // 1st pass
- extract_maxtree(); // 2nd pass
+ extract_maxtree<A>(); // 2nd pass
}
void init()
@@ -150,11 +152,57 @@
} // end of "for all h"
}
- void extract_maxtree()
+
+ template <class A> // A for attributes
+ std::vector< node_<A> >
+ extract_maxtree()
+ {
+ std::vector< node_<A> > node(nnodes);
+ dpar_t& label = dpar;
+
+ // bkd
+ unsigned cur_l = nnodes - 1;
+ for (int i = S.size() - 1; i != 0; --i)
+ {
+ point p = S[i];
+ assert(is_level_root(p + dpar[p])); // level compression is total
+ if (is_level_root(p))
+ {
+ // node initialization
+ point par_p = p + dpar[p]; // this value is saved
+ label[p] = cur_l; // because dpar[p] is modified here
+ node[cur_l].par = label[par_p]; // so this line is ok
+ if (is_root(p))
+ assert(node[cur_l].par == cur_l);
+ --cur_l;
+ }
+ else
+ // label propagation
+ label[p] = label[p + dpar[p]];
+ }
+ return node;
+ }
+
+
+ template <class A> // A for attributes
+ void compute_attributes(std::vector< node_<A> >& node)
+ // point-wise version
{
- // FIXME: TODO
+ dpar_t& label = dpar;
+ for (int i = S.size() - 1; i != 0; --i)
+ {
+ point p = S[i];
+ if (is_level_root(p))
+ node[label[p]].init(f, p);
+ else
+ node[label[p]].insert(f, p);
+ }
+ for (int l = 0; l < nnodes; ++l)
+ if (node[l].par != l) // not root node
+ node[node[l].par].embrace(node[l]);
}
+
point find_root(point x, value h)
{
while (not is_root(x))
@@ -173,7 +221,7 @@
}
- }; // end of class si_maxtree
+ }; // end of class hdc_maxtree
@@ -184,4 +232,4 @@
} // end of namespace oln
-#endif // ! OLENA_LRDE_UFMT_SI_MAXTREE_HH
+#endif // ! OLENA_LRDE_UFMT_HDC_MAXTREE_HH
Index: 10.246/olena/oln/lrde/ufmt/rpc_maxtree.hh
--- 10.246/olena/oln/lrde/ufmt/rup_maxtree.hh Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/14_rup_maxtre 1.1 644)
+++ 10.246(w)/olena/oln/lrde/ufmt/rpc_maxtree.hh Mon, 21 Aug 2006 15:58:38 +0200 theo (oln/x/14_rup_maxtre 1.1 644)
@@ -25,8 +25,8 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-#ifndef OLENA_LRDE_UFMT_RUP_MAXTREE_HH
-# define OLENA_LRDE_UFMT_RUP_MAXTREE_HH
+#ifndef OLENA_LRDE_UFMT_RPC_MAXTREE_HH
+# define OLENA_LRDE_UFMT_RPC_MAXTREE_HH
# include <oln/lrde/ufmt/utils.hh>
# include <oln/lrde/ufmt/ap_maxtree.hh>
@@ -46,7 +46,7 @@
// FIXME: doc.
template <class I>
- struct rup_maxtree : public ap_maxtree<I>
+ struct rpc_maxtree : public ap_maxtree<I>
{
typedef ap_maxtree<I> super;
using super::f;
@@ -61,7 +61,7 @@
// ctor
- rup_maxtree(const abstract::image<I>& f,
+ rpc_maxtree(const abstract::image<I>& f,
const oln_neighborhood_type(I)& nbh)
:
super(f, nbh)
@@ -206,7 +206,7 @@
}
- }; // end of class rup_maxtree
+ }; // end of class rpc_maxtree
@@ -217,4 +217,4 @@
} // end of namespace oln
-#endif // ! OLENA_LRDE_UFMT_RUP_MAXTREE_HH
+#endif // ! OLENA_LRDE_UFMT_RPC_MAXTREE_HH
Index: 10.246/olena/oln/lrde/ufmt/hpc_maxtree.hh
--- 10.246/olena/oln/lrde/ufmt/sp_maxtree.hh Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/15_sp_maxtree 1.1 644)
+++ 10.246(w)/olena/oln/lrde/ufmt/hpc_maxtree.hh Mon, 21 Aug 2006 15:36:45 +0200 theo (oln/x/15_sp_maxtree 1.1 644)
@@ -25,12 +25,13 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-#ifndef OLENA_LRDE_UFMT_SP_MAXTREE_HH
-# define OLENA_LRDE_UFMT_SP_MAXTREE_HH
+#ifndef OLENA_LRDE_UFMT_HPC_MAXTREE_HH
+# define OLENA_LRDE_UFMT_HPC_MAXTREE_HH
# include <oln/level/fill.hh>
# include <oln/lrde/ufmt/utils.hh>
# include <oln/lrde/ufmt/ap_maxtree.hh>
+# include <oln/lrde/ufmt/attributes.hh>
@@ -43,11 +44,10 @@
namespace ufmt
{
-
// FIXME: doc.
template <class I>
- struct sp_maxtree : public ap_maxtree<I>
+ struct hpc_maxtree : public ap_maxtree<I>
{
typedef ap_maxtree<I> super;
using super::f;
@@ -61,22 +61,25 @@
std::vector<dpoint> dp_pre, dp_post;
unsigned nb;
unsigned nnodes;
+ typename mute<I, unsigned>::ret label;
// ctor
- sp_maxtree(const abstract::image<I>& f,
+ hpc_maxtree(const abstract::image<I>& f,
const oln_neighborhood_type(I)& nbh)
:
- super(f, nbh)
+ super(f, nbh),
+ label(f.size())
{
}
+ template <class A> // void if no attributes
void go()
{
init();
compute_parent(); // 1st pass
- extract_maxtree(); // 2nd pass
+ extract_maxtree<A>(); // 2nd pass
}
void init()
@@ -88,39 +91,42 @@
void compute_parent()
{
- int ip = 0;
+ int i = 0;
for (int h = uint_nvalues(f) - 1; h >= 0; --h)
{
- int ip_first = ip;
- int ip_last = ip + H[h];
+ int i_first = i;
+ int i_last = i_first + H[h];
// union-find
- for (ip = ip_first; ip < ip_last; ++ip)
+ for (i = i_first; i < i_last; ++i)
{
- point p = S[ip];
+ point p = S[i];
make_set(p);
// pre
- for (unsigned i = 0; i < nb; ++i)
+ for (unsigned j = 0; j < nb; ++j)
{
- point n = p + dp_pre[i];
+ point n = p + dp_pre[j];
if (f.hold(n) and f[n] >= h)
do_union(n, p, h);
}
// post
- for (unsigned i = 0; i < nb; ++i)
+ for (unsigned j = 0; j < nb; ++j)
{
- point n = p + dp_post[i];
+ point n = p + dp_post[j];
if (f.hold(n) and f[n] > h)
do_union(n, p, h);
}
}
- // finalizing level compression
-
- for (int i = ip_last - 1; i >= ip_first; --i)
+ // enhancing level compression:
+ // we compress within 'level h' but we can end up with:
+ // p' @ h+ --> p @ h --> lr @ h
+ // so we have p -> lr for all p at level h
+ // but p' --> p cannot be compressed by the code below
+ for (int k = i_last - 1; k >= i_first; --k)
{
- point p = S[i];
+ point p = S[k];
if (is_root(p))
++nnodes;
else
@@ -130,9 +136,94 @@
} // end of "for all h"
}
- void extract_maxtree()
+
+ template <class A> // A for attributes
+ std::vector< node_<A> >
+ extract_maxtree()
+ {
+ std::vector< node_<A> > node(nnodes);
+
+ // bkd
+ unsigned cur_l = nnodes - 1;
+ for (int i = S.size() - 1; i != 0; --i)
+ {
+ point p = S[i];
+
+ // nota: level compression is not completed here;
+ // however, though it is useless to finalize it, the
+ // code to perform completion is given but commented
+ if (is_level_root(p))
+ {
+ /*
+ // completing level compression:
+
+ if (not is_level_root(par[p]))
+ {
+ // Cf. above comments; here we have
+ // p @ h+ --> par[p] @ h --> lr @ h
+ if (not is_root(p))
+ {
+ assert(f[p] > f[par[p]]);
+ assert(f[par[p]] == f[par[par[p]]]);
+ assert(is_level_root(par[par[p]]));
+ }
+ par[p] = par[par[p]];
+ }
+ // now the level compression is completed!
+ assert(is_level_root(par[p]));
+ */
+
+ // node initialization
+ label[p] = cur_l;
+ node[cur_l].par = label[par[p]];
+ --cur_l;
+ }
+ else
+ // label propagation
+ label[p] = label[par[p]];
+ }
+ return node;
+ }
+
+
+ template <class A> // A for attributes
+ void compute_attributes(std::vector< node_<A> >& node)
+ // point-wise version
+ {
+ for (int i = S.size() - 1; i != 0; --i)
+ {
+ point p = S[i];
+ if (is_level_root(p))
+ node[label[p]].init(f, p);
+ else
+ node[label[p]].insert(f, p);
+ }
+ for (int l = 0; l < nnodes; ++l)
+ if (node[l].par != l) // not root node
+ node[node[l].par].embrace(node[l]);
+ }
+
+ void make_set(const point& x)
+ {
+ par[x] = x;
+ }
+
+ bool is_root(const point& x) const
+ {
+ return par[x] == x;
+ }
+
+ bool is_level_root(const point& x) const
+ {
+ return is_root(x) or f[par[x]] < f[x];
+ }
+
+ point find_level_root(const point& x)
{
- // FIXME: TODO
+ if (is_level_root(x))
+ return x;
+ else
+ return par[x] = find_level_root(par[x]);
}
point find_root(point x, value h)
@@ -153,7 +244,7 @@
}
- }; // end of class sp_maxtree
+ }; // end of class hpc_maxtree
@@ -164,4 +255,4 @@
} // end of namespace oln
-#endif // ! OLENA_LRDE_UFMT_SP_MAXTREE_HH
+#endif // ! OLENA_LRDE_UFMT_HPC_MAXTREE_HH
Index: 10.246/olena/oln/lrde/ufmt/ap_maxtree.hh
--- 10.246/olena/oln/lrde/ufmt/ap_maxtree.hh Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/16_ap_maxtree 1.1 644)
+++ 10.246(w)/olena/oln/lrde/ufmt/ap_maxtree.hh Mon, 07 Aug 2006 11:26:16 +0200 theo (oln/x/16_ap_maxtree 1.1 644)
@@ -62,6 +62,10 @@
typedef oln_neighborhood_type(I) Nbh;
typedef oln_iter_type(Nbh) niter;
+ // aux typedefs
+ typedef typename mute<I, ntg::bin>::ret bin_image_t;
+ typedef typename mute<I, ntg::int_u8>::ret int_u8_image_t;
+
// input
const I& f;
const Nbh& nbh;
@@ -121,7 +125,7 @@
// uniformized interface
- const point& parent_(const point& p) const {
+ point parent_(const point& p) const {
return par[p];
}
const value& f_(const point& p) const {
Index: 10.246/olena/oln/lrde/ufmt/r1ic_maxtree.hh
--- 10.246/olena/oln/lrde/ufmt/r1_maxtree.hh Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/17_r1_maxtree 1.1 644)
+++ 10.246(w)/olena/oln/lrde/ufmt/r1ic_maxtree.hh Mon, 21 Aug 2006 16:44:34 +0200 theo (oln/x/17_r1_maxtree 1.1 644)
@@ -25,8 +25,8 @@
// reasons why the executable file might be covered by the GNU General
// Public License.
-#ifndef OLENA_LRDE_UFMT_R1_MAXTREE_HH
-# define OLENA_LRDE_UFMT_R1_MAXTREE_HH
+#ifndef OLENA_LRDE_UFMT_R1IC_MAXTREE_HH
+# define OLENA_LRDE_UFMT_R1IC_MAXTREE_HH
# include <oln/lrde/ufmt/utils.hh>
@@ -45,10 +45,10 @@
// FIXME: doc.
template <class I>
- struct r1_maxtree
+ struct r1ic_maxtree
{
typedef I image;
- typedef unsigned point;
+ typedef point1d point;
typedef oln_value_type(I) value;
// input
@@ -60,7 +60,7 @@
// ctor
- r1_maxtree(const abstract::image<I>& f)
+ r1ic_maxtree(const abstract::image<I>& f)
:
f(f.exact()),
// FIXME: par should NOT be initialized here! (but in "init()")
@@ -81,12 +81,13 @@
void compute_parent()
{
- unsigned p = 0;
+ oln_iter_type(I) p(f);
+ p = mlc::begin;
make_set(p);
- for (p = 1; p < f.npoints(); ++p)
+ for_all_remaining(p)
{
make_set(p);
- insert(p - 1, p);
+ insert(p.col() - 1, p);
}
}
@@ -163,7 +164,7 @@
- }; // end of class r1_maxtree
+ }; // end of class r1ic_maxtree
@@ -174,4 +175,4 @@
} // end of namespace oln
-#endif // ! OLENA_LRDE_UFMT_R1_MAXTREE_HH
+#endif // ! OLENA_LRDE_UFMT_R1IC_MAXTREE_HH
Index: 10.246/olena/oln/lrde/ufmt/bin/rpc_maxtree.cc
--- 10.246/olena/oln/lrde/ufmt/bin/rup_maxtree.cc Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/18_rup_maxtre 1.1 644)
+++ 10.246(w)/olena/oln/lrde/ufmt/bin/rpc_maxtree.cc Mon, 21 Aug 2006 15:59:34 +0200 theo (oln/x/18_rup_maxtre 1.1 644)
@@ -3,7 +3,7 @@
#include <ntg/int.hh>
#include <oln/basics2d.hh>
-#include <oln/lrde/ufmt/rup_maxtree.hh>
+#include <oln/lrde/ufmt/rpc_maxtree.hh>
#include <oln/lrde/ufmt/log.hh>
@@ -11,10 +11,11 @@
void usage(char* argv[])
{
std::cerr << "usage: " << argv[0] << " input.pgm c" << std::endl;
- std::cerr << " raster max-tree computation with union-find" << std::endl;
- std::cerr << " inspecting neighbors leads to 'insert' then 'updates'" << std::endl;
- std::cerr << " p as point" << std::endl;
- // FIXME: get precise description...
+ std::cerr << "max-tree computation with union-find" << std::endl;
+ std::cerr << " r. for raster video scan" << std::endl;
+ std::cerr << " p. image<point>" << std::endl;
+ std::cerr << " c. level compression" << std::endl;
+ std::cerr << "inspecting neighbors leads to 'insert' then 'updates'" << std::endl;
exit(1);
}
@@ -33,7 +34,7 @@
if (not (c == 4 or c == 8))
usage(argv);
- typedef lrde::ufmt::rup_maxtree<image_t> algorithm_t;
+ typedef lrde::ufmt::rpc_maxtree<image_t> algorithm_t;
algorithm_t run(input,
c == 4 ? neighb_c4() : neighb_c8());
Index: 10.246/olena/oln/lrde/ufmt/bin/hdc_maxtree.cc
--- 10.246/olena/oln/lrde/ufmt/bin/si_maxtree.cc Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/19_si_maxtree 1.1 644)
+++ 10.246(w)/olena/oln/lrde/ufmt/bin/hdc_maxtree.cc Mon, 21 Aug 2006 16:15:02 +0200 theo (oln/x/19_si_maxtree 1.1 644)
@@ -3,7 +3,7 @@
#include <ntg/int.hh>
#include <oln/basics2d.hh>
-#include <oln/lrde/ufmt/si_maxtree.hh>
+#include <oln/lrde/ufmt/hdc_maxtree.hh>
#include <oln/lrde/ufmt/log.hh>
@@ -12,9 +12,9 @@
{
std::cerr << "usage: " << argv[0] << " input.pgm c" << std::endl;
std::cerr << "max-tree computation with union-find:" << std::endl;
- std::cerr << " no aux data isproc" << std::endl;
- std::cerr << " total level compression" << std::endl;
- std::cerr << " p as index, par is replaced by dpar as image<(delta)index>" << std::endl;
+ std::cerr << " h. for low quant (for h, for p at h)" << std::endl;
+ std::cerr << " d. dpar = image<delta int>" << std::endl;
+ std::cerr << " c. level compression" << std::endl;
// FIXME: get precise description...
exit(1);
}
@@ -34,11 +34,11 @@
if (not (c == 4 or c == 8))
usage(argv);
- typedef lrde::ufmt::si_maxtree<image_t> algorithm_t;
+ typedef lrde::ufmt::hdc_maxtree<image_t> algorithm_t;
algorithm_t run(input,
c == 4 ? neighb_c4() : neighb_c8());
- run.go();
+ run.go<void>();
unsigned n = run.nnodes;
assert(n == n_level_roots(run));
std::cout << "n level roots = " << n << std::endl;
Index: 10.246/olena/oln/lrde/ufmt/bin/hpc_maxtree.cc
--- 10.246/olena/oln/lrde/ufmt/bin/sp_maxtree.cc Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/20_sp_maxtree 1.1 644)
+++ 10.246(w)/olena/oln/lrde/ufmt/bin/hpc_maxtree.cc Mon, 21 Aug 2006 15:38:38 +0200 theo (oln/x/20_sp_maxtree 1.1 644)
@@ -3,7 +3,7 @@
#include <ntg/int.hh>
#include <oln/basics2d.hh>
-#include <oln/lrde/ufmt/sp_maxtree.hh>
+#include <oln/lrde/ufmt/hpc_maxtree.hh>
#include <oln/lrde/ufmt/log.hh>
@@ -12,10 +12,9 @@
{
std::cerr << "usage: " << argv[0] << " input.pgm c" << std::endl;
std::cerr << "max-tree computation with union-find:" << std::endl;
- std::cerr << " no aux data isproc" << std::endl;
- std::cerr << " total level compression" << std::endl;
- std::cerr << " p as point, par as image<point>" << std::endl;
- // FIXME: get precise description...
+ std::cerr << " h. for low quant (for h, for p at h)" << std::endl;
+ std::cerr << " p. image<point>" << std::endl;
+ std::cerr << " c. level compression" << std::endl;
exit(1);
}
@@ -34,11 +33,13 @@
if (not (c == 4 or c == 8))
usage(argv);
- typedef lrde::ufmt::sp_maxtree<image_t> algorithm_t;
+ typedef lrde::ufmt::hpc_maxtree<image_t> algorithm_t;
algorithm_t run(input,
c == 4 ? neighb_c4() : neighb_c8());
- run.go();
+ run.go<void>();
+ // save(tree_image(run, true), "tree.pgm");
+
unsigned n = run.nnodes;
assert(n == n_level_roots(run));
std::cout << "n level roots = " << n << std::endl;
Index: 10.246/olena/oln/lrde/ufmt/bin/r1ic_maxtree.cc
--- 10.246/olena/oln/lrde/ufmt/bin/r1_maxtree.cc Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/21_r1_maxtree 1.1 644)
+++ 10.246(w)/olena/oln/lrde/ufmt/bin/r1ic_maxtree.cc Mon, 21 Aug 2006 16:45:45 +0200 theo (oln/x/21_r1_maxtree 1.1 644)
@@ -3,7 +3,7 @@
#include <ntg/int.hh>
#include <oln/basics1d.hh>
-#include <oln/lrde/ufmt/r1_maxtree.hh>
+#include <oln/lrde/ufmt/r1ic_maxtree.hh>
#include <oln/lrde/ufmt/log.hh>
@@ -12,8 +12,10 @@
{
std::cerr << "usage: " << argv[0] << " input1D.pgm" << std::endl;
std::cerr << "1D raster max-tree computation with union-find" << std::endl;
+ std::cerr << " r. for raster video scan" << std::endl;
+ std::cerr << " i. par = image<int>" << std::endl;
+ std::cerr << " c. level compression" << std::endl;
std::cerr << "inspecting the only neighbor calls 'insert'" << std::endl;
- // FIXME: get precise description...
exit(1);
}
@@ -27,7 +29,7 @@
typedef image1d<ntg::int_u8> image_t;
image_t input = load(argv[1]);
- typedef lrde::ufmt::r1_maxtree<image_t> algorithm_t;
+ typedef lrde::ufmt::r1ic_maxtree<image_t> algorithm_t;
algorithm_t run(input);
run.go();
Index: 10.246/olena/oln/lrde/ufmt/README
--- 10.246/olena/oln/lrde/ufmt/README Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/x/22_README 1.1 644)
+++ 10.246(w)/olena/oln/lrde/ufmt/README Mon, 21 Aug 2006 16:38:18 +0200 theo (oln/x/22_README 1.1 644)
@@ -2,74 +2,6 @@
-
-* to-do
-
-** raster
-
-*** settings
-p as index
-naming: "r_" prefix
-
-*** our versions
-1D ("r1_" prefix)
-nD insert + update ("ru_" prefix)
-nD merge ("rm_" prefix)
-
-*** others
-salembier
-meijster
-
-** FIXME
-
-to be continued
-
-
-* naming
-
-** p encoding
-
-*** p
-p = point2d
-par = image<point>
-
-*** d
-for debug purpose
-p_ref = point2d
-par_ref = image<point>
-dpar_ref = image<dpoint>
-invariant: par_ref[p_ref] = p_ref + dpar_ref[p_ref]
-p = index
-dpar = image<index>
-invariants: p = p_ref and dpar = dpar_ref
-
-*** i
-p = index
-dpar = image<(delta) index>
-par is now a function
-FIXME: we should avoid calling it (instead use dpar)
-
-
-** 1st pass browsing
-
-*** basic
-sorted, simple loop:
-| for all p
-| union-find
-
-*** s
-sorted, _total_ level compression
-| for all h
-| for all p fwd
-| union-find
-| for all p bkd
-| compression
-
-*** r
-raster
-
-
-
* basic_maxtree
** features
@@ -97,42 +29,91 @@
nbh is splitted into pre and post
so isproc is no more aux data
2 functions: isproc_pre and isproc_post
-benefit: memory gain
-
-*** level compression
-''natural'' algorithm enhancement
-browsing is "for h, for p fwd, for p bkd"
-benefit: usually faster thanx to compression
+benefit: memory saving
*** node/levroot counting
during the compression
-benefit: we need to know nnodes
+benefit: we need to know nnodes before the 2nd pass
+without introducing an intermediate pass
-** further (later) optims
-*** point as index
-*** virtual border
+* algorithms deriving from basic_maxtree
-*** fully compressed 2nd parent
-so remove the inner compression pass!
+** browsing
-* specializations
+*** s
+when quantization is high
+std::sort
+browsing is:
+| for all p taken with f(p) decreasing
+| union-find
-** 1D sorted union-find
-level compression
-point as index
-? virtual border
-? 2nd parent
-
-** 2D raster
-FIXME: rup2_maxtree
-FIXME: rui2_maxtree
+*** h
+when quantization is low
+counting sort
+browsing is:
+| for all h
+| for all p fwd s.a. f(p) = h
+| union-find
+| for all p bkd s.a. f(p) = h
+| compression
+benefit: usually faster thanx to compression
+
+*** r
+raster (classic video scan)
+no sorting
+browsing is:
+| for all p fwd
+| union-find
+benefit: incremental, card(nbh)/2
+use: insert (p->tree) and update (tree is in/out)
+
+
+** point encoding
+
+*** p
+point = point2d = (int, int)
+par[p] = point2d
+
+*** i
+point = int
+par[p] = point
+
+*** d
+point = index = int
+dpar[p] = delta point = delta index = int
+benefit: make_sets() = memset(dpar, 0)
+
+
+** compression
+
+*** c
+level-compression of par (resp. dpar)
+find_root = loop over find_level_root
+
+*** x
+use of aux data: c_par (resp. c_dpar)
+for full compressed access to root
+find_root = quicker
+
+
+** further (later) optims
+
+virtual border...
+
+
+** status
+
+hpc impled
+hpx impled
+rpc impled
-** 1D raster
-r1_maxtree // is r1i
+hdc impled
+hdx impled
+r1ic do not compile (ric specialized for 1D images)
* basic_salembier
Only in 10.246: libtool
Only in 10.246: config/ltmain.sh
Only in 10.246: config/config.sub
Only in 10.246: config/config.guess
Only in 10.246: doc/ref/exdoc.mk
Only in 10.246: doc/ref/doxygen.config
Only in 10.246: doc/ref/out/exdoc.config
18 years, 4 months
- 1
- 0
oln-0.10 10.248: Clean up ChangeLogs
by Roland Levillain
Index: 10.247/oln.prj
Index: 10.247/ChangeLog
Index: 10.247/doc/ChangeLog
--- 10.247/oln.prj
+++ 10.248/oln.prj
@@ -1,13 +1,12 @@
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Olena")
-(Project-Version oln 10 247)
-(Parent-Version oln 10 246)
-(Version-Log "Fix Populate-Ignore list and remove generated files from the version
-control.
+(Project-Version oln 10 248)
+(Parent-Version oln 10 247)
+(Version-Log "Clean up ChangeLogs.
")
(New-Version-Log "")
-(Checkin-Time "Thu, 17 Aug 2006 10:47:46 +0200")
+(Checkin-Time "Thu, 17 Aug 2006 11:01:04 +0200")
(Checkin-Login levill_r)
;; diff-ignore tests/data/.*pbm$
;; diff-ignore .*\.pbm$
@@ -117,13 +116,13 @@
(Project-Keywords)
(Files
- (ChangeLog (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.26 600))
- (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.16 600))
- (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.50 600))
- (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.43 600))
- (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.11 600))
+ (ChangeLog (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.27 600))
+ (doc/ChangeLog (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600))
+ (integre/ChangeLog (oln/q/35_ChangeLog 1.12.1.2.1.51 600))
+ (metalic/ChangeLog (oln/q/30_ChangeLog 1.3.1.44 600))
+ (olena/ChangeLog (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.12 600))
(tools/ChangeLog (oln/o/32_ChangeLog 1.10.1.17 600))
- (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.47 600))
+ (tools/swilena/ChangeLog (oln/n/37_ChangeLog 1.7.1.48 600))
(olena/ChangeLog.0 (oln/6_ChangeLog 1.50.1.98.1.5 600))
(doc/ChangeLog.0 (oln/e/1_ChangeLog 1.31 600))
--- 10.247/ChangeLog Fri, 04 Aug 2006 18:48:35 +0200 theo (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.26 600)
+++ 10.248/ChangeLog Thu, 17 Aug 2006 11:01:04 +0200 levill_r (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.27 600)
@@ -1,41 +1,3 @@
-2006-08-04 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
-
- Factor some code in oln/lrde/ufmt/; add video raster scan
- algorithms and some versions with points as indices.
-
- * olena/oln/lrde/ufmt/README: New.
- * olena/oln/lrde/ufmt/basic_maxtree.hh: Move some parts into...
- * olena/oln/lrde/ufmt/ap_maxtree.hh: ...this new file.
- * olena/oln/lrde/ufmt/sp_maxtree.hh: New.
- * olena/oln/lrde/ufmt/ai_maxtree.hh: New.
- * olena/oln/lrde/ufmt/si_maxtree.hh: New.
- * olena/oln/lrde/ufmt/rup_maxtree.hh: New.
- * olena/oln/lrde/ufmt/bin/sp_maxtree.cc: New.
- * olena/oln/lrde/ufmt/bin/si_maxtree.cc: New.
- * olena/oln/lrde/ufmt/bin/rup_maxtree.cc: New.
- * olena/oln/lrde/ufmt/bin/r1_maxtree.cc: New.
-
-2006-08-03 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
-
- Add some first code corresponding to an LRDE publication about
- union-find and max-tree.
-
- * olena/oln/lrde: New directory for code related to LRDE
- publications.
- * olena/oln/lrde/ufmt: New directory specific to union-find and
- max-tree.
- * olena/oln/lrde/ufmt/log.hh: New.
- * olena/oln/lrde/ufmt/utils.hh: New.
- * olena/oln/lrde/ufmt/basic_maxtree.hh: New.
- * olena/oln/lrde/ufmt/basic_salembier.hh: New.
- * olena/oln/lrde/ufmt/bin: New directory for corresponding
- bin source.
- * olena/oln/lrde/ufmt/bin/basic_maxtree.cc: New.
- * olena/oln/lrde/ufmt/bin/basic_salembier.cc: New.
- * olena/oln/lrde/ufmt/img: New directory for tiny test images.
- * olena/oln/lrde/ufmt/img/lena6.pgm: New image file.
- * olena/oln/lrde/ufmt/img/lena64.pgm: Likewise.
-
2006-07-11 Roland Levillain <roland(a)lrde.epita.fr>
Use Libtool.
--- 10.247/doc/ChangeLog Fri, 09 Jul 2004 15:37:35 +0200 palma_g (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.16 600)
+++ 10.248/doc/ChangeLog Thu, 17 Aug 2006 11:01:04 +0200 levill_r (oln/o/31_ChangeLog 1.38.1.7.1.5.1.14.1.17 600)
@@ -65,8 +65,8 @@
2004-04-09 Damien Thivolle <damien(a)lrde.epita.fr>
- * doc/ref/Makefile.am: Use `clean-local' and `distclean-local' to delete
- files.
+ * doc/ref/Makefile.am: Use `clean-local' and `distclean-local' to
+ delete files.
* doc/ref/out/exdoc.config.in: Add `DOC_CPPFLAGS' to the compilation
flags.
@@ -151,7 +151,7 @@
2003-08-26 Geoffroy Fouquier Index: 10.247/integre/ChangeLog
<Geoffroy.Fouquier(a)lrde.epita.fr>
- * dev/oln-dev.texi: fix.
+ * dev/oln-dev.texi: fix.
2003-08-25 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
@@ -499,7 +499,8 @@
* configure.ac: Adjust Olena source path. Use AC_CXX_FLAGS instead
of AC_WITH_CXX_WARNINGS. Use AC_CONFIG_FILES again.
- * Makefile.am: Comment. Correct @OLN_DOC_SUBDIRS@ to $(OLN_DOC_SUBDIRS).
+ * Makefile.am: Comment. Correct @OLN_DOC_SUBDIRS@ to
+ $(OLN_DOC_SUBDIRS).
2003-01-15 Akim Demaille <akim(a)epita.fr>
@@ -525,7 +526,8 @@
2002-12-12 Raphaël Poss <raph(a)lrde.epita.fr>
- * demo/Makefile.am (check_PROGRAMS): Now use OLN_CPPFLAGS and OLN_CXXFLAGS.
+ * demo/Makefile.am (check_PROGRAMS): Now use OLN_CPPFLAGS and
+ OLN_CXXFLAGS.
* doc/Makefile.am (COMMONGETDEFSFLAGS): Likewise. Use OLN_IMG_DIR
and DEFS, too.
--- 10.247/integre/ChangeLog Wed, 05 Jul 2006 18:07:27 +0200 levill_r (oln/q/35_ChangeLog 1.12.1.2.1.50 600)
+++ 10.248/integre/ChangeLog Thu, 17 Aug 2006 11:01:04 +0200 levill_r (oln/q/35_ChangeLog 1.12.1.2.1.51 600)
@@ -11,7 +11,7 @@
* tests/types/tests/float_r2, tests/types/tests/range2,
* tests/types/tests/range2b: Fix tests.
-
+
2005-09-15 Roland Levillain <roland(a)lrde.epita.fr>
Adjust for G++ 4.0.
@@ -38,11 +38,11 @@
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
- * integre/tests/sanity/Makefile.am: Replace maintainer-check by check.
+ * tests/sanity/Makefile.am: Replace maintainer-check by check.
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
- * integre/ntg/core/internal/traits.hh: Include headers so as to pass
+ * ntg/core/internal/traits.hh: Include headers so as to pass
sanity check.
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
@@ -64,13 +64,15 @@
* ntg/makefile.src: Add file.
2004-03-30 Niels Van Vliet <niels(a)lrde.epita.fr>
- * integre/ntg/core/pred_succ.hh: Add default_less.
- * integre/ntg/color/color.hh: Add default_less specialization.
+
+ * ntg/core/pred_succ.hh: Add default_less.
+ * ntg/color/color.hh: Add default_less specialization.
2004-03-26 Niels Van Vliet <niels(a)lrde.epita.fr>
- * integre/ntg/core/macros.hh: Add macros ntg_if_vectorial_nb_comp and
+
+ * ntg/core/macros.hh: Add macros ntg_if_vectorial_nb_comp and
ntg_compare_nb_comp.
- * integre/tests/types/tests/ntg_compare_nb_comp: Add file.
+ * tests/types/tests/ntg_compare_nb_comp: Add file.
2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -82,13 +84,13 @@
2004-03-19 Niels Van Vliet <niels(a)lrde.epita.fr>
- * integre/ntg/core/pred_succ.hh: Add file.
- * integre/ntg/Makefile.am: Add file references.
+ * ntg/core/pred_succ.hh: Add file.
+ * ntg/Makefile.am: Add file references.
2004-03-18 Niels Van Vliet <niels(a)lrde.epita.fr>
- * integre/ntg/real/behavior.hh: Change the unsafe::get<T>::check().
- * integre/ntg/utils/cast.hh: Change cast::force().
+ * ntg/real/behavior.hh: Change the unsafe::get<T>::check().
+ * ntg/utils/cast.hh: Change cast::force().
2004-02-09 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -237,18 +239,18 @@
2003-07-30 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
- * ntg/utils/cast.hh: Fix compilation with g++ 3.4.
- * ntg/utils/debug.hh: Likewise.
- * ntg/core/internal/global_ops_defs.hh: Likewise.
- * ntg/core/internal/global_ops.hh: Likewise.
- * ntg/color/nrgb.hh: Likewise.
- * ntg/real/optraits_builtin_int.hh: Likewise.
- * ntg/real/optraits_scalar.hh: Likewise.
- * ntg/real/typetraits_builtin_int.hh: Likewise.
- * tests/utils/tests/debug1: Likewise.
- * ntg/core/contract.hh: Likewise.
- * ntg/vect/vec.hh: Likewise.
- * ntg/vect/cplx.hh: Likewise.
+ * ntg/utils/cast.hh: Fix compilation with g++ 3.4.
+ * ntg/utils/debug.hh: Likewise.
+ * ntg/core/internal/global_ops_defs.hh: Likewise.
+ * ntg/core/internal/global_ops.hh: Likewise.
+ * ntg/color/nrgb.hh: Likewise.
+ * ntg/real/optraits_builtin_int.hh: Likewise.
+ * ntg/real/optraits_scalar.hh: Likewise.
+ * ntg/real/typetraits_builtin_int.hh: Likewise.
+ * tests/utils/tests/debug1: Likewise.
+ * ntg/coIndex: 10.247/metalic/ChangeLog
Index: 10.247/olena/ChangeLog
re/contract.hh: Likewise.
+ * ntg/vect/vec.hh: Likewise.
+ * ntg/vect/cplx.hh: Likewise.
2003-07-28 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
@@ -733,18 +735,17 @@
2003-03-03 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
- * integre/ntg/behaviour.hh, integre/ntg/global_ops_traits.hh,
+ * ntg/behaviour.hh, integre/ntg/global_ops_traits.hh,
integre/ntg/optraits_cplx.hh, integre/ntg/optraits_int_s.hh,
integre/ntg/optraits_vec.hh: Update includes.
- * integre/ntg/cycle.hh, integre/ntg/global_ops.hh,
+ * ntg/cycle.hh, integre/ntg/global_ops.hh,
integre/ntg/optraits_cplx.hh, integre/ntg/optraits_cycle.hh,
integre/ntg/optraits_int_s.hh, integre/ntg/range.hh,
integre/ntg/behaviour.hh, integre/ntg/cplx.hh,
integre/ntg/optraits_scalar.hh, integre/ntg/optraits_vec.hh:
Likewise.
-
2003-03-02 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
* tests/Makefile.am: Add check/defs.in into EXTRA_DIST.
--- 10.247/metalic/ChangeLog Sat, 26 Jun 2004 23:19:24 +0200 thivol_d (oln/q/30_ChangeLog 1.3.1.43 600)
+++ 10.248/metalic/ChangeLog Thu, 17 Aug 2006 11:01:04 +0200 levill_r (oln/q/30_ChangeLog 1.3.1.44 600)
@@ -4,7 +4,7 @@
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
- * metalic/tests/sanity/Makefile.am: Replace maintainer-check by check.
+ * tests/sanity/Makefile.am: Replace maintainer-check by check.
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
@@ -50,25 +50,25 @@
2003-08-07 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
- * mlc/contract.hh: Fix coding style.
- * mlc/objs.hh: Likewise.
- * mlc/typeadj.hh: Likewise.
- * mlc/type.hh: Likewise.
- * mlc/array/1d.hh: Likewise.
- * mlc/array/1d.hxx: Likewise.
- * mlc/array/2d.hh: Likewise.
- * mlc/array/2d.hxx: Likewise.
- * mlc/array/3d.hh: Likewise.
- * mlc/array/3d.hxx: Likewise.
- * mlc/array/nd.hh: Likewise.
- * mlc/bool.hh: Likewise.
- * mlc/cmp.hh: Likewise.
- * mlc/optional.hh: Likewise.
- * mlc/is_a.hh: Likewise.
- * mlc/math.hh: Likewise.
- * mlc/array/objs.hh: Likewise.
- * tests/main/tests/ensure3: Likewise.
- * tests/main/tests/ensure2: Likewise.
+ * mlc/contract.hh: Fix coding style.
+ * mlc/objs.hh: Likewise.
+ * mlc/typeadj.hh: Likewise.
+ * mlc/type.hh: Likewise.
+ * mlc/array/1d.hh: Likewise.
+ * mlc/array/1d.hxx: Likewise.
+ * mlc/array/2d.hh: Likewise.
+ * mlc/array/2d.hxx: Likewise.
+ * mlc/array/3d.hh: Likewise.
+ * mlc/array/3d.hxx: Likewise.
+ * mlc/array/nd.hh: Likewise.
+ * mlc/bool.hh: Likewise.
+ * mlc/cmp.hh: Likewise.
+ * mlc/optional.hh: Likewise.
+ * mlc/is_a.hh: Likewise.
+ * mlc/math.hh: Likewise.
+ * mlc/array/objs.hh: Likewise.
+ * tests/main/tests/ensure3: Likewise.
+ * tests/main/tests/ensure2: Likewise.
2003-08-06 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
@@ -267,7 +267,7 @@
2003-03-03 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
* mlc/array1d.hh, mlc/array2d.hh, mlc/array3d.hh: Update
- includes.
+ includes.
* mlc/is_a.hh: Likewise.
--- 10.247/olena/ChangeLog Wed, 05 Jul 2006 18:22:20 +0200 levill_r (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.11 600)
+++ 10.248/olena/ChangeLog Thu, 17 Aug 2006 11:01:04 +0200 levill_r (oln/o/30_ChangeLog 1.27.1.36.1.3.1.11.1.5.1.64.1.47.1.93.1.27.2.12 600)
@@ -1,3 +1,41 @@
+2006-08-04 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
+
+ Factor some code in oln/lrde/ufmt/; add video raster scan
+ algorithms and some versions with points as indices.
+
+ * oln/lrde/ufmt/README: New.
+ * oln/lrde/ufmt/basic_maxtree.hh: Move some parts into...
+ * oln/lrde/ufmt/ap_maxtree.hh: ...this new file.
+ * oln/lrde/ufmt/sp_maxtree.hh: New.
+ * oln/lrde/ufmt/ai_maxtree.hh: New.
+ * oln/lrde/ufmt/si_maxtree.hh: New.
+ * oln/lrde/ufmt/rup_maxtree.hh: New.
+ * oln/lrde/ufmt/bin/sp_maxtree.cc: New.
+ * oln/lrde/ufmt/bin/si_maxtree.cc: New.
+ * oln/lrde/ufmt/bin/rup_maxtree.cc: New.
+ * oln/lrde/ufmt/bin/r1_maxtree.cc: New.
+
+2006-08-03 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
+
+ Add some first code corresponding to an LRDE publication about
+ union-find and max-tree.
+
+ * oln/lrde: New directory for code related to LRDE
+ publications.
+ * oln/lrde/ufmt: New directory specific to union-find and
+ max-tree.
+ * oln/lrde/ufmt/log.hh: New.
+ * oln/lrde/ufmt/utils.hh: New.
+ * oln/lrde/ufmt/basic_maxtree.hh: New.
+ * oln/lrde/ufmt/basic_salembier.hh: New.
+ * oln/lrde/ufmt/bin: New directory for corresponding
+ bin source.
+ * oln/lrde/ufmt/bin/basic_maxtree.cc: New.
+ * oln/lrde/ufmt/bin/basic_salembier.cc: New.
+ * oln/lrde/ufmt/img: New directory for tiny test images.
+ * oln/lrde/ufmt/img/lena6.pgm: New image file.
+ * oln/lrde/ufmt/img/lena64.pgm: Likewise.
+
2006-07-05 Roland Levillain <roland(a)lrde.epita.fr>
Fix sanity tests.
@@ -156,10 +194,14 @@
2004-07-09 Giovanni Palma <giovanni(a)lrde.epita.fr>
* oln/utils/qsort.hh: Correct comparison operators.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3: Correct test.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2: Remove file.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3: Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3:
+ Correct test.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2:
+ Remove file.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3:
+ Likewise.
* oln/morpho/attributes.hh: Make code use ntg macros.
* oln/morpho/attribute_union_find.hh: Add a static if for sort choice.
* oln/morpho/attribute_closing_opening.hh: Add prototypes.
@@ -215,8 +257,10 @@
* oln/basics.hh: Add behavior.hh.
* oln/core/behavior.hh: Add an empty constructor for any_with_diamond.
* oln/makefile.src: Add border morpher file.
- * oln/convol/fast_convolution.hh: Use border morpher, fix the size problem.
- * tests/convol/tests/fast_convol: Improve test comparing with slow version.
+ * oln/convol/fast_convolution.hh: Use border morpher, fix the size
+ problem.
+ * tests/convol/tests/fast_convol: Improve test comparing with slow
+ version.
* oln/morpher/border_morpher.hh: Border morpher.
* tests/morpher/tests/border: Test border morpher.
@@ -240,7 +284,8 @@
* oln/convol/fast_convolution.hh: Clean code.
* oln/convol/slow_gaussian.hxx: Fix too generic parameter.
* oln/convol/slow_gaussian.hh: Fix delta computation.
- * oln/convol/fast_gaussian.hxx: Use cast::bound instead of cast::force.
+ * oln/convol/fast_gaussian.hxx: Use cast::bound instead of
+ cast::force.
* oln/convol/slow_convolution.hh: Clean code.
2004-06-14 Simon Odou <simon(a)lrde.epita.fr>
@@ -261,17 +306,19 @@
* tests/convol/tests/fast_convol: New.
2004-06-13 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/tests/convol/tests/slow_gaussian: New file.
+
+ * tests/convol/tests/slow_gaussian: New file.
2004-06-09 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/core/abstract/behavior.hh (adapt_border): Change
+
+ * oln/core/abstract/behavior.hh (adapt_border): Change
constness of the image modified to const.
- * olena/oln/core/behavior.hh: Likewise.
- * olena/oln/convol/slow_gaussian.hh: Add behavior. Remove parameter
+ * oln/core/behavior.hh: Likewise.
+ * oln/convol/slow_gaussian.hh: Add behavior. Remove parameter
mu. Add doc and example. Add radius_factor.
- * olena/oln/convol/slow_gaussian.hxx: Clean code. Remove parameter
+ * oln/convol/slow_gaussian.hxx: Clean code. Remove parameter
mu. Add radius_factor.
- * olena/oln/morpho/gradient.inc: Fix doc.
+ * oln/morpho/gradient.inc: Fix doc.
2004-06-07 Damien Thivolle <damien(a)lrde.epita.fr>
@@ -298,30 +345,30 @@
2004-05-15 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/morpho/attributes.hh (integral): Change the function.
+ * oln/morpho/attributes.hh (integral): Change the function.
2004-05-14 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/morpho/attributes.hh (integral): Fix a bug in the
+ * oln/morpho/attributes.hh (integral): Fix a bug in the
constructor.
2004-05-12 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/core/neighborhood3d.hh: Add some common neighborhoods.
- * olena/oln/convol/slow_gaussian.hh: Add file.
- * olena/oln/convol/slow_gaussian.hxx: Add file.
+ * oln/core/neighborhood3d.hh: Add some common neighborhoods.
+ * oln/convol/slow_gaussian.hh: Add file.
+ * oln/convol/slow_gaussian.hxx: Add file.
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/tests/sanity/Makefile.am: Replace maintainer-check by check.
+ * tests/sanity/Makefile.am: Replace maintainer-check by check.
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/convert/rgbhsl.hh: Include headers so as to pass
+ * oln/convert/rgbhsl.hh: Include headers so as to pass
sanity check.
- * olena/oln/snakes/energies.hh: Likewise.
- * olena/oln/utils/buffer.hh: Likewise.
- * olena/oln/topo/tarjan/tarjan.hh: Likewise.
+ * oln/snakes/energies.hh: Likewise.
+ * oln/utils/buffer.hh: Likewise.
+ * oln/topo/tarjan/tarjan.hh: Likewise.
2004-04-20 Niels Van Vliet <niels(a)lrde.epita.fr>
@@ -348,18 +395,18 @@
2004-04-14 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/tests/morpho/tests/md5_morpho_reconstruction_hh5: Fix to make
+ * tests/morpho/tests/md5_morpho_reconstruction_hh5: Fix to make
compile with ICC. More details are available here:
http://www.lrde.epita.fr/cgi-bin/twiki/view/Projects/OlenaConstImages
- * olena/tests/morpho/tests/md5_morpho_reconstruction_hh4: Likewise.
- * olena/tests/morpho/tests/md5_morpho_reconstruction_hh3: Likewise.
- * olena/tests/morpho/tests/md5_morpho_reconstruction_hh2: Likewise.
- * olena/tests/morpho/tests/md5_morpho_reconstruction_hh1: Likewise.
- * olena/tests/morpho/tests/md5_morpho_reconstruction_hh0: Likewise.
- * olena/tests/morpho/tests/md5_morpho_geodesic_erosion_hh1: Likewise.
- * olena/tests/morpho/tests/md5_morpho_geodesic_erosion_hh0: Likewise.
- * olena/tests/morpho/tests/md5_morpho_geodesic_dilation_hh1: Likewise.
- * olena/tests/morpho/tests/md5_morpho_geodesic_dilation_hh0: Likewise.
+ * tests/morpho/tests/md5_morpho_reconstruction_hh4: Likewise.
+ * tests/morpho/tests/md5_morpho_reconstruction_hh3: Likewise.
+ * tests/morpho/tests/md5_morpho_reconstruction_hh2: Likewise.
+ * tests/morpho/tests/md5_morpho_reconstruction_hh1: Likewise.
+ * tests/morpho/tests/md5_morpho_reconstruction_hh0: Likewise.
+ * tests/morpho/tests/md5_morpho_geodesic_erosion_hh1: Likewise.
+ * tests/morpho/tests/md5_morpho_geodesic_erosion_hh0: Likewise.
+ * tests/morpho/tests/md5_morpho_geodesic_dilation_hh1: Likewise.
+ * tests/morpho/tests/md5_morpho_geodesic_dilation_hh0: Likewise.
2004-04-14 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -368,21 +415,22 @@
2004-04-13 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/tests/convol/tests/md5_convol_fast_gaussian_hh4: Make this test xfail.
- * olena/tests/convol/tests/md5_convol_fast_gaussian_hh1: Likewise.
+ * tests/convol/tests/md5_convol_fast_gaussian_hh4: Make this test
+ xfail.
+ * tests/convol/tests/md5_convol_fast_gaussian_hh1: Likewise.
2004-04-13 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/morpho/geodesic_dilation.hh: Fix to make compile with ICC.
- * olena/oln/morpho/geodesic_erosion.hh: Likewise.
- * olena/oln/morpho/reconstruction.hh: Likewise.
- * olena/oln/topo/tarjan/flat-zone.hh: Likewise.
+ * oln/morpho/geodesic_dilation.hh: Fix to make compile with ICC.
+ * oln/morpho/geodesic_erosion.hh: Likewise.
+ * oln/morpho/reconstruction.hh: Likewise.
+ * oln/topo/tarjan/flat-zone.hh: Likewise.
2004-04-13 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/utils/md5.hxx: Changed abstract::image to
+ * oln/utils/md5.hxx: Changed abstract::image to
oln::abstract::image (ICC error).
- * olena/oln/utils/md5.hh: Likewise.
+ * oln/utils/md5.hh: Likewise.
2004-04-13 Niels Van Vliet <niels(a)lrde.epita.fr>
@@ -414,31 +462,32 @@
2004-04-12 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/core/abstract/image.hh: Fix macro oln_concrete_type.
- * olena/tests/morpho/tests/gradient: New.
+ * oln/core/abstract/image.hh: Fix macro oln_concrete_type.
+ * tests/morpho/tests/gradient: New.
2004-04-12 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/morpho/laplacian.inc: Add a FIXME.
- * olena/oln/morpho/watershed.hh: Add a FIXME.
+ * oln/morpho/laplacian.inc: Add a FIXME.
+ * oln/morpho/watershed.hh: Add a FIXME.
2004-04-11 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/core/point2d.hh: Add header include.
- * olena/oln/core/point2d.hxx: Likewise.
- * olena/oln/core/point3d.hh: Likewise.
- * olena/oln/core/point3d.hxx: Likewise.
+ * oln/core/point2d.hh: Add header include.
+ * oln/core/point2d.hxx: Likewise.
+ * oln/core/point3d.hh: Likewise.
+ * oln/core/point3d.hxx: Likewise.
2004-04-07 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/Makefile.am: Add forgotten files to the distribution.
+ * oln/Makefile.am: Add forgotten files to the distribution.
2004-04-04 Simon Odou <simon(a)lrde.epita.fr>
* oln/core/image1d.hh: Add informations to image_id.
* oln/core/image2d.hh: Likewise
- * oln/core/image3d.hh: Likewise
- * oln/core/impl/image_array1d.hh: Add empty constructor for any_with_diamond.
+ * oln/core/image3d.hh: Likewise
+ * oln/core/impl/image_array1d.hh: Add empty constructor for
+ any_with_diamond.
* oln/core/impl/image_array.hh: Likewise.
* oln/core/impl/image_array2d.hh: Likewise.
* oln/core/impl/image_array3d.hh: Likewise.
@@ -451,7 +500,8 @@
* tests/morpher/tests/iter: New.
* tests/morpher/tests/slicing: New.
* oln/core/abstract/image.hh: Size() returns const inside of const &.
- * oln/morpher/piece_morpher.hh: Adapt to new version of generic morpher.
+ * oln/morpher/piece_morpher.hh: Adapt to new version of generic
+ morpher.
Respect 80 columns.
* oln/morpher/slicing_morpher.hh: Likewise.
* oln/morpher/iter_morpher.hh: Likewise.
@@ -461,17 +511,17 @@
2004-04-03 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/Makefile.am: Add files.
- * olena/oln/morpher/generic_morpher.hh: Repair unmorph().
- * olena/oln/morpher/color_morpher.hh: Correct comments.
- * olena/tests/morpher/tests/color_morph: Readd a test.
+ * oln/Makefile.am: Add files.
+ * oln/morpher/generic_morpher.hh: Repair unmorph().
+ * oln/morpher/color_morpher.hh: Correct comments.
+ * tests/morpher/tests/color_morph: Readd a test.
2004-04-03 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/morpher/generic_morpher.hh: Inherit directly from oln::image.
- * olena/oln/morpher/subq_morpher.hh: Change inheritance system.
- * olena/oln/morpher/color_morpher.hh: Likewise.
- * olena/tests/morpher/tests/color_morph: Remove a test.
+ * oln/morpher/generic_morpher.hh: Inherit directly from oln::image.
+ * oln/morpher/subq_morpher.hh: Change inheritance system.
+ * oln/morpher/color_morpher.hh: Likewise.
+ * tests/morpher/tests/color_morph: Remove a test.
2004-04-02 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -480,17 +530,19 @@
* oln/topo/tarjan/tarjan_with_attr.hh: Correct code.
2004-04-02 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/io/gz_stream.hh: Fix doc.
- * olena/oln/morpho/extrema.hxx: Likewise.
- * olena/oln/convol/nagao.hh: Likewise.
- * olena/oln/transforms/dwt.hh: Likewise.
+
+ * oln/io/gz_stream.hh: Fix doc.
+ * oln/morpho/extrema.hxx: Likewise.
+ * oln/convol/nagao.hh: Likewise.
+ * oln/transforms/dwt.hh: Likewise.
2004-04-02 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/morpho/laplacian.inc (laplacian): Remove slarger_t.
+
+ * oln/morpho/laplacian.inc (laplacian): Remove slarger_t.
Add the parameter DestValue. Fix doc.
- * olena/tests/morpho/tests/md5_morpho_laplacian_inc1: Change the
+ * tests/morpho/tests/md5_morpho_laplacian_inc1: Change the
test.
- * olena/oln/morpho/watershed.hh: Change the two examples.
+ * oln/morpho/watershed.hh: Change the two examples.
2004-04-02 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -502,14 +554,15 @@
* tests/topo/tests/cmap: Make the test use the good flat_zone.
2004-04-02 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/core/image1d.hh: Return exact_type in clone_.
- * olena/oln/core/image2d.hh: Likewise.
- * olena/oln/core/image3d.hh: Likewise.
- * olena/oln/core/neighborhood2d.hh: Remove a FIXME. Remove operator=.
- * olena/oln/core/window2d.hh: Likewise.
- * olena/oln/core/w_window2d.hh: Add comments.
- * olena/oln/level/cc.hh: Remove headers.
- * olena/oln/morpho/top_hat.inc: Remove a FIXME.
+
+ * oln/core/image1d.hh: Return exact_type in clone_.
+ * oln/core/image2d.hh: Likewise.
+ * oln/core/image3d.hh: Likewise.
+ * oln/core/neighborhood2d.hh: Remove a FIXME. Remove operator=.
+ * oln/core/window2d.hh: Likewise.
+ * oln/core/w_window2d.hh: Add comments.
+ * oln/level/cc.hh: Remove headers.
+ * oln/morpho/top_hat.inc: Remove a FIXME.
2004-03-31 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -522,28 +575,28 @@
2004-03-30 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/Makefile.am: Add files from oln/morpher/
- * olena/oln/morpher/generic_morpher.hh: Correct comments and code.
- * olena/oln/morpher/subq_morpher.hh: Likewise.
- * olena/oln/morpher/color_morpher.hh: Likewise.
- * olena/tests/morpher/tests/compose_morph: New file, contains
+ * oln/Makefile.am: Add files from oln/morpher/
+ * oln/morpher/generic_morpher.hh: Correct comments and code.
+ * oln/morpher/subq_morpher.hh: Likewise.
+ * oln/morpher/color_morpher.hh: Likewise.
+ * tests/morpher/tests/compose_morph: New file, contains
morpher composition tests.
- * olena/tests/morpher/tests/sq_morph: New file, contains sub
+ * tests/morpher/tests/sq_morph: New file, contains sub
quantifying morpher tests.
- * olena/tests/morpher/tests/color_morph: New file, contains color
+ * tests/morpher/tests/color_morph: New file, contains color
morpher tests.
- * olena/tests/morpher/tests/sq_morph_8: Remove file.
- * olena/tests/morpher/tests/sq_morph_7: Likewise.
- * olena/tests/morpher/tests/sq_morph_6: Likewise.
- * olena/tests/morpher/tests/sq_morph_5: Likewise.
- * olena/tests/morpher/tests/sq_morph_4: Likewise.
- * olena/tests/morpher/tests/sq_morph_3: Likewise.
- * olena/tests/morpher/tests/sq_morph_2: Likewise.
- * olena/tests/morpher/tests/sq_morph_1: Likewise.
- * olena/tests/morpher/tests/rmorph: Likewise.
- * olena/tests/morpher/tests/gmorph: Likewise.
- * olena/tests/morpher/tests/color_sq_morph: Likewise.
- * olena/tests/morpher/tests/bmorph: Likewise.
+ * tests/morpher/tests/sq_morph_8: Remove file.
+ * tests/morpher/tests/sq_morph_7: Likewise.
+ * tests/morpher/tests/sq_morph_6: Likewise.
+ * tests/morpher/tests/sq_morph_5: Likewise.
+ * tests/morpher/tests/sq_morph_4: Likewise.
+ * tests/morpher/tests/sq_morph_3: Likewise.
+ * tests/morpher/tests/sq_morph_2: Likewise.
+ * tests/morpher/tests/sq_morph_1: Likewise.
+ * tests/morpher/tests/rmorph: Likewise.
+ * tests/morpher/tests/gmorph: Likewise.
+ * tests/morpher/tests/color_sq_morph: Likewise.
+ * tests/morpher/tests/bmorph: Likewise.
@@ -568,38 +621,40 @@
* oln/morpher/slicing_morpher.hh: Minor fix.
- * olena/oln/core/bkd_iter1d.hh: Fix comments.
- * olena/oln/core/bkd_iter2d.hh: Likewise.
- * olena/oln/core/bkd_iter3d.hh: Likewise.
- * olena/oln/core/fwd_iter1d.hh: Likewise.
- * olena/oln/core/fwd_iter2d.hh: Likewise.
- * olena/oln/core/fwd_iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter1d.hh: Likewise.
- * olena/oln/core/abstract/iter2d.hh: Likewise.
- * olena/oln/core/abstract/iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter.hh: Likewise.
- * olena/oln/core/neighborhood1d.hh: Likewise.
- * olena/oln/core/neighborhood2d.hh: Likewise.
- * olena/oln/core/neighborhood3d.hh: Likewise.
- * olena/oln/core/abstract/neighborhood.hh: Likewise.
- * olena/oln/core/window1d.hh: Likewise.
- * olena/oln/core/window2d.hh: Likewise.
- * olena/oln/core/window3d.hh: Likewise.
- * olena/oln/core/abstract/window.hh: Likewise.
- * olena/oln/core/w_window1d.hh: Likewise.
- * olena/oln/core/w_window2d.hh: Likewise.
- * olena/oln/core/w_window3d.hh: Likewise.
- * olena/oln/core/abstract/w_window.hh: Likewise.
- * olena/oln/core/abstract/window_base.hh: Likewise.
- * olena/oln/core/abstract/windownd.hh: Likewise.
- * olena/oln/core/abstract/w_windownd.hh: Likewise.
- * olena/oln/core/abstract/neighborhoodnd.hh: Likewise.
+ * oln/core/bkd_iter1d.hh: Fix comments.
+ * oln/core/bkd_iter2d.hh: Likewise.
+ * oln/core/bkd_iter3d.hh: Likewise.
+ * oln/core/fwd_iter1d.hh: Likewise.
+ * oln/core/fwd_iter2d.hh: Likewise.
+ * oln/core/fwd_iter3d.hh: Likewise.
+ * oln/core/abstract/iter1d.hh: Likewise.
+ * oln/core/abstract/iter2d.hh: Likewise.
+ * oln/core/abstract/iter3d.hh: Likewise.
+ * oln/core/abstract/iter.hh: Likewise.
+ * oln/core/neighborhood1d.hh: Likewise.
+ * oln/core/neighborhood2d.hh: Likewise.
+ * oln/core/neighborhood3d.hh: Likewise.
+ * oln/core/abstract/neighborhood.hh: Likewise.
+ * oln/core/window1d.hh: Likewise.
+ * oln/core/window2d.hh: Likewise.
+ * oln/core/window3d.hh: Likewise.
+ * oln/core/abstract/window.hh: Likewise.
+ * oln/core/w_window1d.hh: Likewise.
+ * oln/core/w_window2d.hh: Likewise.
+ * oln/core/w_window3d.hh: Likewise.
+ * oln/core/abstract/w_window.hh: Likewise.
+ * oln/core/abstract/window_base.hh: Likewise.
+ * oln/core/abstract/windownd.hh: Likewise.
+ * oln/core/abstract/w_windownd.hh: Likewise.
+ * oln/core/abstract/neighborhoodnd.hh: Likewise.
* oln/morpher/slicing_morpher.hh: To have a slice of an image.
* oln/morpher/iter_morpher.hh: To have a specific default iterator.
- * oln/morpher/piece_morpher.hh: To use a piece of image like a real one.
+ * oln/morpher/piece_morpher.hh: To use a piece of image like a
+ real one.
+
* oln/core/abstract/image_with_impl.hh:
* oln/core/point2d.hh: Able to construct a point2d from a point1d.
* oln/core/point2d.hxx: Likewise.
@@ -609,63 +664,66 @@
* oln/core/abstract/image_with_impl.hh: Fix (same).
2004-03-29 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/topo/inter-pixel/inter-pixel.hh: Change the return type
+
+ * oln/topo/inter-pixel/inter-pixel.hh: Change the return type
of operator[] from const & to const.
2004-03-29 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/morpher/generic_morpher.hh: Correct code and comments.
- * olena/oln/morpher/subq_morpher.hh: Add file. Sub quantify morpher
+ * oln/morpher/generic_morpher.hh: Correct code and comments.
+ * oln/morpher/subq_morpher.hh: Add file. Sub quantify morpher
implementation.
- * olena/oln/morpher/color_morpher.hh: Add file. Color morpher
+ * oln/morpher/color_morpher.hh: Add file. Color morpher
implementation.
- * olena/tests/morpher/Makefile.am: Add file. Morphers test suite.
- * olena/tests/morpher/tests/sq_morph_8: Add file.
- * olena/tests/morpher/tests/sq_morph_7: Likewise.
- * olena/tests/morpher/tests/sq_morph_6: Likewise.
- * olena/tests/morpher/tests/sq_morph_5: Likewise.
- * olena/tests/morpher/tests/sq_morph_4: Likewise.
- * olena/tests/morpher/tests/sq_morph_3: Likewise.
- * olena/tests/morpher/tests/sq_morph_2: Likewise.
- * olena/tests/morpher/tests/sq_morph_1: Likewise.
- * olena/tests/morpher/tests/rmorph: Likewise.
- * olena/tests/morpher/tests/gmorph: Likewise.
- * olena/tests/morpher/tests/color_sq_morph: Likewise.
- * olena/tests/morpher/tests/bmorph: Likewise.
+ * tests/morpher/Makefile.am: Add file. Morphers test suite.
+ * tests/morpher/tests/sq_morph_8: Add file.
+ * tests/morpher/tests/sq_morph_7: Likewise.
+ * tests/morpher/tests/sq_morph_6: Likewise.
+ * tests/morpher/tests/sq_morph_5: Likewise.
+ * tests/morpher/tests/sq_morph_4: Likewise.
+ * tests/morpher/tests/sq_morph_3: Likewise.
+ * tests/morpher/tests/sq_morph_2: Likewise.
+ * tests/morpher/tests/sq_morph_1: Likewise.
+ * tests/morpher/tests/rmorph: Likewise.
+ * tests/morpher/tests/gmorph: Likewise.
+ * tests/morpher/tests/color_sq_morph: Likewise.
+ * tests/morpher/tests/bmorph: Likewise.
2004-03-27 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/utils/histogram.hh: Change the return type
+
+ * oln/utils/histogram.hh: Change the return type
of `at' method to const value_type.
- * olena/oln/morpho/attributes.hh: Uncomment some lines.
+ * oln/morpho/attributes.hh: Uncomment some lines.
- * olena/oln/convol/nagao.hh: Correct comments.
- * olena/oln/convol/nagao.hxx: Likewise.
- * olena/oln/utils/se_stat.hh: Likewise.
- * olena/oln/utils/se_stat.hxx: Likewise.
+ * oln/convol/nagao.hh: Correct comments.
+ * oln/convol/nagao.hxx: Likewise.
+ * oln/utils/se_stat.hh: Likewise.
+ * oln/utils/se_stat.hxx: Likewise.
2004-03-26 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/math/macros.hh: Add dot_product.
- * olena/oln/utils/se_stat.hh: Add file. Mean and variance using a
+
+ * oln/math/macros.hh: Add dot_product.
+ * oln/utils/se_stat.hh: Add file. Mean and variance using a
structuring element.
- * olena/oln/utils/se_stat.hxx: Add file.
- * olena/oln/convol/nagao.hh: Add file. Nagao filter.
- * olena/oln/convol/nagao.hxx: Add file.
- * olena/tests/convol/tests/nagao : Add file.
+ * oln/utils/se_stat.hxx: Add file.
+ * oln/convol/nagao.hh: Add file. Nagao filter.
+ * oln/convol/nagao.hxx: Add file.
+ * tests/convol/tests/nagao : Add file.
2004-03-25 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/core/abstract/image.hh: Correct macros.
- * olena/oln/core/abstract/image_with_impl.hh: Change the return type
+ * oln/core/abstract/image.hh: Correct macros.
+ * oln/core/abstract/image_with_impl.hh: Change the return type
of `at' method to const value_type.
- * olena/oln/morpher/generic_morpher.hh: Correct comments.
+ * oln/morpher/generic_morpher.hh: Correct comments.
Change parameter names. Fix coding style.
2004-03-25 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/core/abstract/image.hh: Change the return type of
+ * oln/core/abstract/image.hh: Change the return type of
`operator[]' method to const value_type.
Add macros for retrieving types associated to an image.
- * olena/oln/morpher/generic_morpher.hh: generic_morpher implementation.
+ * oln/morpher/generic_morpher.hh: generic_morpher implementation.
2004-03-25 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -678,12 +736,12 @@
2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr>
- * olena/tests/level/tests/md5_level_hh0: Add file.
+ * tests/level/tests/md5_level_hh0: Add file.
2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr>
- * olena/tests/level/tests/md5_level_set_level_hh0: Add file.
- * olena/tests/level/tests/md5_level_threshold_hh0: Likewise.
+ * tests/level/tests/md5_level_set_level_hh0: Add file.
+ * tests/level/tests/md5_level_threshold_hh0: Likewise.
2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -692,38 +750,70 @@
2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr>
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2: Add file.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh4: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh5: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh6: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh7: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh8: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh9: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh0: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh1: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh2: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh3: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh4: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh5: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh0: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh1: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh10: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh11: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh12: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh13: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh14: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh15: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh16: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh17: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh4: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh5: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh6: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh7: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh8: Likewise.
- * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh9: Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh2: Add
+ file.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh3:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh4:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh5:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh6:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh7:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh8:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_hh9:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh0:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh1:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh2:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh3:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh4:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_light_hh5:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh0:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh1:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh10:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh11:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh12:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh13:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh14:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh15:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh16:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh17:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh2:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh3:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh4:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh5:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh6:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh7:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh8:
+ Likewise.
+ * tests/morpho/tests/md5_morpho_attribute_closing_opening_map_hh9:
+ Likewise.
* tests/morpho/tests/md5_morpho_closing_inc0: Likewise.
* tests/morpho/tests/md5_morpho_dilation_hh0: Likewise.
* tests/morpho/tests/md5_morpho_dilation_hh1: Likewise.
@@ -779,12 +869,18 @@
* tests/convol/tests/md5_convol_fast_gaussian_hh4: Add file.
* tests/convol/tests/md5_convol_fast_gaussian_hh5: Add file.
- * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh0: Remove file.
- * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh1: Remove file.
- * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh2: Remove file.
- * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh3: Remove file.
- * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh4: Remove file.
- * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh5: Remove file.
+ * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh0:
+ Remove file.
+ * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh1:
+ Remove file.
+ * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh2:
+ Remove file.
+ * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh3:
+ Remove file.
+ * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh4:
+ Remove file.
+ * tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh5:
+ Remove file.
2004-03-23 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -800,45 +896,46 @@
* tests/convol/tests/out_olena_oln_convol_fast_gaussian_hh5: Add file.
2004-03-23 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/level/cc.hh (frontp_connected_component): Change image to
+
+ * oln/level/cc.hh (frontp_connected_component): Change image to
binary_image.
- * olena/oln/level/connected.hh (connected_component): Change image to
+ * oln/level/connected.hh (connected_component): Change image to
binary_image_with_dim.
- * olena/oln/morpho/extrema_killer.hh (internal_kill_cc_area): Change
+ * oln/morpho/extrema_killer.hh (internal_kill_cc_area): Change
non_vectorial_image to binary_image_with_dim
- * olena/oln/morpho/attribute_closing_opening_map.hh (f_tarjan_map):
+ * oln/morpho/attribute_closing_opening_map.hh (f_tarjan_map):
Change image to non_vectorial_image.
2004-03-19 Simon Odou <simon(a)lrde.epita.fr>
- * olena/oln/core/bkd_iter1d.hh: Correct comments.
- * olena/oln/core/bkd_iter2d.hh: Likewise.
- * olena/oln/core/bkd_iter3d.hh: Likewise.
- * olena/oln/core/fwd_iter1d.hh: Likewise.
- * olena/oln/core/fwd_iter2d.hh: Likewise.
- * olena/oln/core/fwd_iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter1d.hh: Likewise.
- * olena/oln/core/abstract/iter2d.hh: Likewise.
- * olena/oln/core/abstract/iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter.hh: Likewise.
- * olena/oln/core/neighborhood1d.hh: Likewise.
- * olena/oln/core/neighborhood2d.hh: Likewise.
- * olena/oln/core/neighborhood3d.hh: Likewise.
- * olena/oln/core/abstract/neighborhood.hh: Likewise.
- * olena/oln/core/abstract/struct_elt.hh: Likewise.
- * olena/oln/core/window1d.hh: Likewise.
- * olena/oln/core/window2d.hh: Likewise.
- * olena/oln/core/window3d.hh: Likewise.
- * olena/oln/core/abstract/window.hh: Likewise.
- * olena/oln/core/w_window1d.hh: Likewise.
- * olena/oln/core/w_window2d.hh: Likewise.
- * olena/oln/core/w_window3d.hh: Likewise.
- * olena/oln/core/abstract/w_window.hh: Likewise.
- * olena/oln/io/base.hh: Likewise.
- * olena/oln/core/abstract/window_base.hh: Likewise.
- * olena/oln/core/abstract/windownd.hh: Likewise.
- * olena/oln/core/abstract/w_windownd.hh: Likewise.
- * olena/oln/core/abstract/neighborhoodnd.hh: Likewise.
+ * oln/core/bkd_iter1d.hh: Correct comments.
+ * oln/core/bkd_iter2d.hh: Likewise.
+ * oln/core/bkd_iter3d.hh: Likewise.
+ * oln/core/fwd_iter1d.hh: Likewise.
+ * oln/core/fwd_iter2d.hh: Likewise.
+ * oln/core/fwd_iter3d.hh: Likewise.
+ * oln/core/abstract/iter1d.hh: Likewise.
+ * oln/core/abstract/iter2d.hh: Likewise.
+ * oln/core/abstract/iter3d.hh: Likewise.
+ * oln/core/abstract/iter.hh: Likewise.
+ * oln/core/neighborhood1d.hh: Likewise.
+ * oln/core/neighborhood2d.hh: Likewise.
+ * oln/core/neighborhood3d.hh: Likewise.
+ * oln/core/abstract/neighborhood.hh: Likewise.
+ * oln/core/abstract/struct_elt.hh: Likewise.
+ * oln/core/window1d.hh: Likewise.
+ * oln/core/window2d.hh: Likewise.
+ * oln/core/window3d.hh: Likewise.
+ * oln/core/abstract/window.hh: Likewise.
+ * oln/core/w_window1d.hh: Likewise.
+ * oln/core/w_window2d.hh: Likewise.
+ * oln/core/w_window3d.hh: Likewise.
+ * oln/core/abstract/w_window.hh: Likewise.
+ * oln/io/base.hh: Likewise.
+ * oln/core/abstract/window_base.hh: Likewise.
+ * oln/core/abstract/windownd.hh: Likewise.
+ * oln/core/abstract/w_windownd.hh: Likewise.
+ * oln/core/abstract/neighborhoodnd.hh: Likewise.
2004-03-19 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -871,26 +968,28 @@
* oln/transforms/fft.hh: Likewise.
2004-03-19 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/utils/histogram.hh: Fix doc.
- * olena/oln/convert/value_to_point.hh: Likewise.
+
+ * oln/utils/histogram.hh: Fix doc.
+ * oln/convert/value_to_point.hh: Likewise.
2004-03-18 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/convert/value_to_point.hh: Fix value_to_point<bin>.
- * olena/oln/utils/histogram.hh: Fix hisogram<bin>.
- * olena/oln/morpho/fast_morpho.hxx: Histogram to abstract histogram.
-
- * olena/oln/morpho/hit_or_miss.inc: Enable code in the doc.
- * olena/oln/morpho/top_hat.inc: Likewise.
- * olena/oln/morpho/opening.inc: Likewise.
- * olena/oln/morpho/dilation.hh: Likewise.
- * olena/oln/morpho/erosion.hh: Likewise.
- * olena/oln/morpho/dilation.hh: Likewise.
-
- * olena/tests/morpho/tests/edoc: Add tests.
-
- * olena/oln/morpho/attribute_closing_opening_map.hh: Rename images.
- * olena/oln/morpho/extrema.hxx: Add doc.
- * olena/oln/morpho/closing.inc: Remove fixme.
+
+ * oln/convert/value_to_point.hh: Fix value_to_point<bin>.
+ * oln/utils/histogram.hh: Fix hisogram<bin>.
+ * oln/morpho/fast_morpho.hxx: Histogram to abstract histogram.
+
+ * oln/morpho/hit_or_miss.inc: Enable code in the doc.
+ * oln/morpho/top_hat.inc: Likewise.
+ * oln/morpho/opening.inc: Likewise.
+ * oln/morpho/dilation.hh: Likewise.
+ * oln/morpho/erosion.hh: Likewise.
+ * oln/morpho/dilation.hh: Likewise.
+
+ * tests/morpho/tests/edoc: Add tests.
+
+ * oln/morpho/attribute_closing_opening_map.hh: Rename images.
+ * oln/morpho/extrema.hxx: Add doc.
+ * oln/morpho/closing.inc: Remove fixme.
2004-03-16 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -899,85 +998,86 @@
* oln/transforms/wavelet_coeffs.hh: Likewise.
2004-03-15 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/core/apply.hh: Correct comments.
- * olena/oln/core/compose.hh: Correct comments.
- * olena/oln/io/file.hh: Add comments.
- * olena/oln/io/gz.hh: Likewise.
- * olena/oln/io/gz_stream.hh: Likewise.
- * olena/oln/io/pnm_read_3d.hh: Likewise.
- * olena/oln/io/pnm_read.hh: Likewise.
- * olena/oln/io/pnm_write_3d.hh: Likewise.
- * olena/oln/io/pnm_write.hh: Likewise.
- * olena/oln/io/pnm_common.hh: Likewise.
- * olena/oln/io/stream_wrapper.hh: Likewise.
- * olena/oln/io/pnm_read_data.hh: Likewise.
- * olena/oln/io/pnm_write_data.hh: Likewise.
- * olena/oln/io/pnm_read_2d.hh: Likewise.
- * olena/oln/io/pnm_write_2d.hh: Likewise.
+ * oln/core/apply.hh: Correct comments.
+ * oln/core/compose.hh: Correct comments.
+ * oln/io/file.hh: Add comments.
+ * oln/io/gz.hh: Likewise.
+ * oln/io/gz_stream.hh: Likewise.
+ * oln/io/pnm_read_3d.hh: Likewise.
+ * oln/io/pnm_read.hh: Likewise.
+ * oln/io/pnm_write_3d.hh: Likewise.
+ * oln/io/pnm_write.hh: Likewise.
+ * oln/io/pnm_common.hh: Likewise.
+ * oln/io/stream_wrapper.hh: Likewise.
+ * oln/io/pnm_read_data.hh: Likewise.
+ * oln/io/pnm_write_data.hh: Likewise.
+ * oln/io/pnm_read_2d.hh: Likewise.
+ * oln/io/pnm_write_2d.hh: Likewise.
2004-03-15 Simon Odou <simon(a)lrde.epita.fr>
- * olena/oln/io/base.hh: Add comments.
- * olena/oln/io/readable.hh: Likewise.
- * olena/oln/io/se_neighborhood.hh: Likewise.
- * olena/oln/io/se_window.hh: Likewise.
- * olena/oln/io/image_base.hh: Likewise.
- * olena/oln/io/image_write.hh: Likewise.
- * olena/oln/io/stream_wrapper.hh: Likewise.
- * olena/oln/io/utils.hh: Likewise.
- * olena/oln/io/image_read.hh: Likewise.
- * olena/oln/core/abstract/image.hh: Likewise.
- * olena/oln/core/bkd_iter1d.hh: Correct comments.
- * olena/oln/core/bkd_iter2d.hh: Likewise.
- * olena/oln/core/bkd_iter3d.hh: Likewise.
- * olena/oln/core/fwd_iter1d.hh: Likewise.
- * olena/oln/core/fwd_iter2d.hh: Likewise.
- * olena/oln/core/fwd_iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter1d.hh: Likewise.
- * olena/oln/core/abstract/iter2d.hh: Likewise.
- * olena/oln/core/abstract/iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter.hh: Likewise.
- * olena/oln/core/neighborhood1d.hh: Likewise.
- * olena/oln/core/neighborhood2d.hh: Likewise.
- * olena/oln/core/neighborhood3d.hh: Likewise.
- * olena/oln/core/abstract/neighborhood.hh: Likewise.
- * olena/oln/core/abstract/struct_elt.hh: Likewise.
- * olena/oln/core/window1d.hh: Likewise.
- * olena/oln/core/window2d.hh: Likewise.
- * olena/oln/core/window3d.hh: Likewise.
- * olena/oln/core/abstract/window.hh: Likewise.
- * olena/oln/core/w_window1d.hh: Likewise.
- * olena/oln/core/w_window2d.hh: Likewise.
- * olena/oln/core/w_window3d.hh: Likewise.
- * olena/oln/core/abstract/w_window.hh: Likewise.
- * olena/oln/core/abstract/window_base.hh: Likewise.
- * olena/oln/core/abstract/windownd.hh: Likewise.
- * olena/oln/core/abstract/w_windownd.hh: Likewise.
- * olena/oln/core/abstract/neighborhoodnd.hh: Likewise.
+ * oln/io/base.hh: Add comments.
+ * oln/io/readable.hh: Likewise.
+ * oln/io/se_neighborhood.hh: Likewise.
+ * oln/io/se_window.hh: Likewise.
+ * oln/io/image_base.hh: Likewise.
+ * oln/io/image_write.hh: Likewise.
+ * oln/io/stream_wrapper.hh: Likewise.
+ * oln/io/utils.hh: Likewise.
+ * oln/io/image_read.hh: Likewise.
+ * oln/core/abstract/image.hh: Likewise.
+ * oln/core/bkd_iter1d.hh: Correct comments.
+ * oln/core/bkd_iter2d.hh: Likewise.
+ * oln/core/bkd_iter3d.hh: Likewise.
+ * oln/core/fwd_iter1d.hh: Likewise.
+ * oln/core/fwd_iter2d.hh: Likewise.
+ * oln/core/fwd_iter3d.hh: Likewise.
+ * oln/core/abstract/iter1d.hh: Likewise.
+ * oln/core/abstract/iter2d.hh: Likewise.
+ * oln/core/abstract/iter3d.hh: Likewise.
+ * oln/core/abstract/iter.hh: Likewise.
+ * oln/core/neighborhood1d.hh: Likewise.
+ * oln/core/neighborhood2d.hh: Likewise.
+ * oln/core/neighborhood3d.hh: Likewise.
+ * oln/core/abstract/neighborhood.hh: Likewise.
+ * oln/core/abstract/struct_elt.hh: Likewise.
+ * oln/core/window1d.hh: Likewise.
+ * oln/core/window2d.hh: Likewise.
+ * oln/core/window3d.hh: Likewise.
+ * oln/core/abstract/window.hh: Likewise.
+ * oln/core/w_window1d.hh: Likewise.
+ * oln/core/w_window2d.hh: Likewise.
+ * oln/core/w_window3d.hh: Likewise.
+ * oln/core/abstract/w_window.hh: Likewise.
+ * oln/core/abstract/window_base.hh: Likewise.
+ * oln/core/abstract/windownd.hh: Likewise.
+ * oln/core/abstract/w_windownd.hh: Likewise.
+ * oln/core/abstract/neighborhoodnd.hh: Likewise.
2004-03-15 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/arith/internal/opdecls.hh: Clean doc.
- * olena/oln/arith/ops.hh: Likewise.
- * olena/oln/convert/conversion.hh: Likewise.
- * olena/oln/convol/convolution.hh: Likewise.
- * olena/oln/convol/fast_gaussian.hh: Likewise.
- * olena/oln/convol/fast_gaussian.hxx: Likewise.
- * olena/oln/core/abstract/dpoint.hh: Likewise.
- * olena/oln/core/abstract/iter.hh: Likewise.
- * olena/oln/level/cc.hh: Likewise.
- * olena/oln/math/macros.hh: Likewise.
- * olena/oln/morpho/extrema.hh: Likewise.
- * olena/oln/morpho/extrema.hxx: Likewise.
- * olena/oln/morpho/fast_morpho.hxx: Likewise.
- * olena/oln/topo/dmap.hh: Likewise.
- * olena/oln/utils/histogram.hh: Likewise.
- * olena/oln/topo/tarjan/union.hh: Likewise.
- * olena/oln/topo/inter-pixel/internal/dir.hh: Likewise.
- * olena/oln/core/abstract/image.hh: Likewise.
- * olena/oln/core/impl/image_array.hh: Likewise.
- * olena/oln/convert/abstract/conversion.hh: Likewise.
- * olena/oln/snakes/snakes_base.hh: Likewise.
- * olena/oln/morpho/attributes.hh: Likewise.
- * olena/oln/morpho/attribute_closing_opening_map.hh: Likewise.
+
+ * oln/arith/internal/opdecls.hh: Clean doc.
+ * oln/arith/ops.hh: Likewise.
+ * oln/convert/conversion.hh: Likewise.
+ * oln/convol/convolution.hh: Likewise.
+ * oln/convol/fast_gaussian.hh: Likewise.
+ * oln/convol/fast_gaussian.hxx: Likewise.
+ * oln/core/abstract/dpoint.hh: Likewise.
+ * oln/core/abstract/iter.hh: Likewise.
+ * oln/level/cc.hh: Likewise.
+ * oln/math/macros.hh: Likewise.
+ * oln/morpho/extrema.hh: Likewise.
+ * oln/morpho/extrema.hxx: Likewise.
+ * oln/morpho/fast_morpho.hxx: Likewise.
+ * oln/topo/dmap.hh: Likewise.
+ * oln/utils/histogram.hh: Likewise.
+ * oln/topo/tarjan/union.hh: Likewise.
+ * oln/topo/inter-pixel/internal/dir.hh: Likewise.
+ * oln/core/abstract/image.hh: Likewise.
+ * oln/core/impl/image_array.hh: Likewise.
+ * oln/convert/abstract/conversion.hh: Likewise.
+ * oln/snakes/snakes_base.hh: Likewise.
+ * oln/morpho/attributes.hh: Likewise.
+ * oln/morpho/attribute_closing_opening_map.hh: Likewise.
2004-03-15 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -985,58 +1085,61 @@
* tests/morpho/tests/area: Likewise.
2004-03-14 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/arith/internal/opdecls.hh: Changed doxygen commands
+
+ * oln/arith/internal/opdecls.hh: Changed doxygen commands
"\{''|attention|warning|bug|note} FIXME" to "\todo FIXME", "\ref" to
"REF: ", "\file *.hh" to "\file oln/full/path/*.hh".
- * olena/oln/convert/bound.hh: Likewise.
- * olena/oln/convert/nrgbxyz.hh: Likewise.
- * olena/oln/convert/rgbnrgb.hh: Likewise.
- * olena/oln/convert/rgbxyz.hh: Likewise.
- * olena/oln/convol/fast_gaussian.hxx: Likewise.
- * olena/oln/level/cc.hh: Likewise.
- * olena/oln/level/connected.hh: Likewise.
- * olena/oln/level/invert.hh: Likewise.
- * olena/oln/math/macros.hh: Likewise.
- * olena/oln/morpho/extrema.hxx: Likewise.
- * olena/oln/topo/dmap.hh: Likewise.
- * olena/oln/topo/dmap.hh: Likewise.
- * olena/oln/utils/copy.hh: Likewise.
- * olena/oln/utils/histogram.hh: Likewise.
- * olena/oln/morpho/attribute_union_find.hh: Likewise.
- * olena/oln/topo/tarjan/union.hh: Likewise.
- * olena/oln/topo/inter-pixel/inter-pixel.hh: Likewise.
- * olena/oln/topo/tarjan/flat-zone.hh: Likewise.
- * olena/oln/topo/combinatorial-map/cmap.hh: Likewise.
- * olena/oln/topo/inter-pixel/fwd-dir-iter.hh: Likewise.
- * olena/oln/topo/inter-pixel/bkd-dir-iter.hh: Likewise.
- * olena/oln/topo/inter-pixel/internal/dir.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/anyfunc.hh: Likewise.
- * olena/oln/convert/rgbhsv.hh: Likewise.
- * olena/oln/convert/rgbhsl.hh: Likewise.
- * olena/oln/convert/rgbhsi.hh: Likewise.
- * olena/oln/convert/rgbyuv.hh: Likewise.
- * olena/oln/convert/rgbyiq.hh: Likewise.
- * olena/oln/snakes/snakes_base.hh: Likewise.
- * olena/oln/snakes/node.hh: Likewise.
- * olena/oln/snakes/segment.hh: Likewise.
+ * oln/convert/bound.hh: Likewise.
+ * oln/convert/nrgbxyz.hh: Likewise.
+ * oln/convert/rgbnrgb.hh: Likewise.
+ * oln/convert/rgbxyz.hh: Likewise.
+ * oln/convol/fast_gaussian.hxx: Likewise.
+ * oln/level/cc.hh: Likewise.
+ * oln/level/connected.hh: Likewise.
+ * oln/level/invert.hh: Likewise.
+ * oln/math/macros.hh: Likewise.
+ * oln/morpho/extrema.hxx: Likewise.
+ * oln/topo/dmap.hh: Likewise.
+ * oln/topo/dmap.hh: Likewise.
+ * oln/utils/copy.hh: Likewise.
+ * oln/utils/histogram.hh: Likewise.
+ * oln/morpho/attribute_union_find.hh: Likewise.
+ * oln/topo/tarjan/union.hh: Likewise.
+ * oln/topo/inter-pixel/inter-pixel.hh: Likewise.
+ * oln/topo/tarjan/flat-zone.hh: Likewise.
+ * oln/topo/combinatorial-map/cmap.hh: Likewise.
+ * oln/topo/inter-pixel/fwd-dir-iter.hh: Likewise.
+ * oln/topo/inter-pixel/bkd-dir-iter.hh: Likewise.
+ * oln/topo/inter-pixel/internal/dir.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/anyfunc.hh: Likewise.
+ * oln/convert/rgbhsv.hh: Likewise.
+ * oln/convert/rgbhsl.hh: Likewise.
+ * oln/convert/rgbhsi.hh: Likewise.
+ * oln/convert/rgbyuv.hh: Likewise.
+ * oln/convert/rgbyiq.hh: Likewise.
+ * oln/snakes/snakes_base.hh: Likewise.
+ * oln/snakes/node.hh: Likewise.
+ * oln/snakes/segment.hh: Likewise.
2004-03-14 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/topo/dmap.hh: Correct comments.
- * olena/oln/topo/tarjan/flat-zone.hh: Likewise.
+
+ * oln/topo/dmap.hh: Correct comments.
+ * oln/topo/tarjan/flat-zone.hh: Likewise.
2004-03-14 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/convert/nrgbxyz.hh: Correct comments.
- * olena/oln/convert/stretch.hh: Likewise.
- * olena/oln/level/cc.hh: Likewise.
- * olena/oln/morpho/gradient.inc: Likewise.
- * olena/oln/morpho/attribute_closing_opening.hh: Likewise.
- * olena/oln/morpho/attribute_union_find.hh: Likewise.
- * olena/oln/topo/inter-pixel/inter-pixel.hh: Likewise.
- * olena/oln/topo/inter-pixel/node.hh: Likewise.
- * olena/oln/core/abstract/image_with_dim.hh: Likewise.
- * olena/oln/core/impl/image_impl.hh: Likewise.
- * olena/oln/morpho/attributes.hh: Likewise.
- * olena/oln/utils/special_points.hh: Likewise.
+
+ * oln/convert/nrgbxyz.hh: Correct comments.
+ * oln/convert/stretch.hh: Likewise.
+ * oln/level/cc.hh: Likewise.
+ * oln/morpho/gradient.inc: Likewise.
+ * oln/morpho/attribute_closing_opening.hh: Likewise.
+ * oln/morpho/attribute_union_find.hh: Likewise.
+ * oln/topo/inter-pixel/inter-pixel.hh: Likewise.
+ * oln/topo/inter-pixel/node.hh: Likewise.
+ * oln/core/abstract/image_with_dim.hh: Likewise.
+ * oln/core/impl/image_impl.hh: Likewise.
+ * oln/morpho/attributes.hh: Likewise.
+ * oln/utils/special_points.hh: Likewise.
2004-03-14 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -1071,124 +1174,129 @@
* oln/core/abstract/iter.hh: Likewise.
2004-03-14 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/core/abstract/iter1d.hh: Fix a bug.
- * olena/oln/core/abstract/iter2d.hh: Fix a bug.
- * olena/oln/core/abstract/iter3d.hh: Fix a bug.
- * olena/oln/morpho/attribute_union_find.hh: Add a FIXME.
- * olena/oln/topo/dmap.hh: Add comments.
- * olena/oln/topo/tarjan/union.hh: Likewise.
- * olena/oln/topo/inter-pixel/inter-pixel.hh: Likewise.
- * olena/oln/topo/tarjan/flat-zone.hh: Likewise.
- * olena/oln/topo/combinatorial-map/cmap.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/zeta.hh: Likewise.
- * olena/oln/topo/inter-pixel/fwd-dir-iter.hh: Likewise.
- * olena/oln/topo/inter-pixel/bkd-dir-iter.hh: Likewise.
- * olena/oln/topo/inter-pixel/node.hh: Likewise.
- * olena/oln/topo/inter-pixel/internal/dir-iter.hh: Likewise.
- * olena/oln/topo/inter-pixel/internal/dir.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/alpha.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/anyfunc.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/beta.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/lambda.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/level.hh: Likewise.
- * olena/oln/topo/combinatorial-map/internal/sigma.hh : Likewise.
+
+ * oln/core/abstract/iter1d.hh: Fix a bug.
+ * oln/core/abstract/iter2d.hh: Fix a bug.
+ * oln/core/abstract/iter3d.hh: Fix a bug.
+ * oln/morpho/attribute_union_find.hh: Add a FIXME.
+ * oln/topo/dmap.hh: Add comments.
+ * oln/topo/tarjan/union.hh: Likewise.
+ * oln/topo/inter-pixel/inter-pixel.hh: Likewise.
+ * oln/topo/tarjan/flat-zone.hh: Likewise.
+ * oln/topo/combinatorial-map/cmap.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/zeta.hh: Likewise.
+ * oln/topo/inter-pixel/fwd-dir-iter.hh: Likewise.
+ * oln/topo/inter-pixel/bkd-dir-iter.hh: Likewise.
+ * oln/topo/inter-pixel/node.hh: Likewise.
+ * oln/topo/inter-pixel/internal/dir-iter.hh: Likewise.
+ * oln/topo/inter-pixel/internal/dir.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/alpha.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/anyfunc.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/beta.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/lambda.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/level.hh: Likewise.
+ * oln/topo/combinatorial-map/internal/sigma.hh : Likewise.
2004-03-13 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/utils/copy.hh: Add comments.
- * olena/oln/utils/histogram.hh: Likewise.
- * olena/oln/utils/stat.hh: Likewise.
- * olena/oln/utils/timer.hh: Likewise.
- * olena/oln/utils/special_points.hh: Likewise.
+
+ * oln/utils/copy.hh: Add comments.
+ * oln/utils/histogram.hh: Likewise.
+ * oln/utils/stat.hh: Likewise.
+ * oln/utils/timer.hh: Likewise.
+ * oln/utils/special_points.hh: Likewise.
2004-03-13 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/arith/internal/opdecls.hh: Add comments.
- * olena/oln/arith/logic.hh: Likewise.
- * olena/oln/arith/ops.hh: Likewise.
- * olena/oln/math/macros.hh: Likewise.
- * olena/oln/config/pconf-hh.in: Likewise.
+
+ * oln/arith/internal/opdecls.hh: Add comments.
+ * oln/arith/logic.hh: Likewise.
+ * oln/arith/ops.hh: Likewise.
+ * oln/math/macros.hh: Likewise.
+ * oln/config/pconf-hh.in: Likewise.
2004-03-13 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/convert/basics.hh: Add comments.
- * olena/oln/convert/bound.hh: Likewise.
- * olena/oln/convert/abstract/colorconv.hh: Likewise.
- * olena/oln/convert/conversion.hh: Likewise.
- * olena/oln/convert/conversion_ng_se.hh: Likewise.
- * olena/oln/convert/force.hh: Likewise.
- * olena/oln/convert/nrgbxyz.hh: Likewise.
- * olena/oln/convert/rgbnrgb.hh: Likewise.
- * olena/oln/convert/rgbxyz.hh: Likewise.
- * olena/oln/convert/abstract/conversion.hh: Likewise.
- * olena/oln/convert/cast.hh: Likewise.
- * olena/oln/convert/rgbhsv.hh: Likewise.
- * olena/oln/convert/rgbhsl.hh: Likewise.
- * olena/oln/convert/rgbhsi.hh: Likewise.
- * olena/oln/convert/rgbyuv.hh: Likewise.
- * olena/oln/convert/rgbyiq.hh: Likewise.
- * olena/oln/convert/value_to_point.hh: Likewise.
- * olena/oln/convert/stretch.hh: Fix bug.
+
+ * oln/convert/basics.hh: Add comments.
+ * oln/convert/bound.hh: Likewise.
+ * oln/convert/abstract/colorconv.hh: Likewise.
+ * oln/convert/conversion.hh: Likewise.
+ * oln/convert/conversion_ng_se.hh: Likewise.
+ * oln/convert/force.hh: Likewise.
+ * oln/convert/nrgbxyz.hh: Likewise.
+ * oln/convert/rgbnrgb.hh: Likewise.
+ * oln/convert/rgbxyz.hh: Likewise.
+ * oln/convert/abstract/conversion.hh: Likewise.
+ * oln/convert/cast.hh: Likewise.
+ * oln/convert/rgbhsv.hh: Likewise.
+ * oln/convert/rgbhsl.hh: Likewise.
+ * oln/convert/rgbhsi.hh: Likewise.
+ * oln/convert/rgbyuv.hh: Likewise.
+ * oln/convert/rgbyiq.hh: Likewise.
+ * oln/convert/value_to_point.hh: Likewise.
+ * oln/convert/stretch.hh: Fix bug.
2004-03-13 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/convert/stretch.hh: Add stretch_balance. Add comments.
+
+ * oln/convert/stretch.hh: Add stretch_balance. Add comments.
2004-03-12 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/core/accum.hh: Add comments.
- * olena/oln/core/apply.hh: Likewise.
- * olena/oln/core/compose.hh: Likewise.
- * olena/oln/core/coord.hh: Likewise.
- * olena/oln/core/dpoint1d.hh: Likewise.
- * olena/oln/core/dpoint2d.hh: Likewise.
- * olena/oln/core/dpoint3d.hh: Likewise.
- * olena/oln/core/fold.hh: Likewise.
- * olena/oln/core/image1d.hh: Likewise.
- * olena/oln/core/image1d_size.hh: Likewise.
- * olena/oln/core/image2d.hh: Likewise.
- * olena/oln/core/image2d_size.hh: Likewise.
- * olena/oln/core/image3d.hh: Likewise.
- * olena/oln/core/image3d_size.hh: Likewise.
- * olena/oln/core/image.hh: Likewise.
- * olena/oln/core/point1d.hh: Likewise.
- * olena/oln/core/point2d.hh: Likewise.
- * olena/oln/core/point3d.hh: Likewise.
- * olena/oln/core/traverse.hh: Likewise.
- * olena/oln/core/abstract/image.hh: Correct comments.
- * olena/oln/core/impl/image_impl.hh: Add comments.
- * olena/oln/core/impl/image_array.hh: Likewise.
- * olena/oln/core/impl/image_array3d.hh: Likewise.
- * olena/oln/core/impl/image_array2d.hh: Likewise.
- * olena/oln/core/impl/image_array1d.hh: Likewise.
- * olena/oln/core/behavior.hh: Likewise.
+ * oln/core/accum.hh: Add comments.
+ * oln/core/apply.hh: Likewise.
+ * oln/core/compose.hh: Likewise.
+ * oln/core/coord.hh: Likewise.
+ * oln/core/dpoint1d.hh: Likewise.
+ * oln/core/dpoint2d.hh: Likewise.
+ * oln/core/dpoint3d.hh: Likewise.
+ * oln/core/fold.hh: Likewise.
+ * oln/core/image1d.hh: Likewise.
+ * oln/core/image1d_size.hh: Likewise.
+ * oln/core/image2d.hh: Likewise.
+ * oln/core/image2d_size.hh: Likewise.
+ * oln/core/image3d.hh: Likewise.
+ * oln/core/image3d_size.hh: Likewise.
+ * oln/core/image.hh: Likewise.
+ * oln/core/point1d.hh: Likewise.
+ * oln/core/point2d.hh: Likewise.
+ * oln/core/point3d.hh: Likewise.
+ * oln/core/traverse.hh: Likewise.
+ * oln/core/abstract/image.hh: Correct comments.
+ * oln/core/impl/image_impl.hh: Add comments.
+ * oln/core/impl/image_array.hh: Likewise.
+ * oln/core/impl/image_array3d.hh: Likewise.
+ * oln/core/impl/image_array2d.hh: Likewise.
+ * oln/core/impl/image_array1d.hh: Likewise.
+ * oln/core/behavior.hh: Likewise.
2004-03-12 Simon Odou <simon(a)lrde.epita.fr>
- * olena/oln/core/bkd_iter1d.hh: Correct comments.
- * olena/oln/core/bkd_iter2d.hh: Likewise.
- * olena/oln/core/bkd_iter3d.hh: Likewise.
- * olena/oln/core/fwd_iter1d.hh: Likewise.
- * olena/oln/core/fwd_iter2d.hh: Likewise.
- * olena/oln/core/fwd_iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter1d.hh: Likewise.
- * olena/oln/core/abstract/iter2d.hh: Likewise.
- * olena/oln/core/abstract/iter3d.hh: Likewise.
- * olena/oln/core/abstract/iter.hh: Likewise.
- * olena/oln/core/neighborhood1d.hh: Likewise.
- * olena/oln/core/neighborhood2d.hh: Likewise.
- * olena/oln/core/neighborhood3d.hh: Likewise.
- * olena/oln/core/abstract/neighborhood.hh: Likewise.
- * olena/oln/core/abstract/struct_elt.hh: Likewise.
- * olena/oln/core/window1d.hh: Likewise.
- * olena/oln/core/window2d.hh: Likewise.
- * olena/oln/core/window3d.hh: Likewise.
- * olena/oln/core/abstract/window.hh: Likewise.
- * olena/oln/core/w_window1d.hh: Likewise.
- * olena/oln/core/w_window2d.hh: Likewise.
- * olena/oln/core/w_window3d.hh: Likewise.
- * olena/oln/core/abstract/w_window.hh: Likewise.
- * olena/oln/core/abstract/image.hh: Likewise.
- * olena/oln/core/abstract/window_base.hh: Likewise.
- * olena/oln/core/abstract/windownd.hh: Likewise.
- * olena/oln/core/abstract/w_windownd.hh: Likewise.
- * olena/oln/core/abstract/neighborhoodnd.hh: Likewise.
+ * oln/core/bkd_iter1d.hh: Correct comments.
+ * oln/core/bkd_iter2d.hh: Likewise.
+ * oln/core/bkd_iter3d.hh: Likewise.
+ * oln/core/fwd_iter1d.hh: Likewise.
+ * oln/core/fwd_iter2d.hh: Likewise.
+ * oln/core/fwd_iter3d.hh: Likewise.
+ * oln/core/abstract/iter1d.hh: Likewise.
+ * oln/core/abstract/iter2d.hh: Likewise.
+ * oln/core/abstract/iter3d.hh: Likewise.
+ * oln/core/abstract/iter.hh: Likewise.
+ * oln/core/neighborhood1d.hh: Likewise.
+ * oln/core/neighborhood2d.hh: Likewise.
+ * oln/core/neighborhood3d.hh: Likewise.
+ * oln/core/abstract/neighborhood.hh: Likewise.
+ * oln/core/abstract/struct_elt.hh: Likewise.
+ * oln/core/window1d.hh: Likewise.
+ * oln/core/window2d.hh: Likewise.
+ * oln/core/window3d.hh: Likewise.
+ * oln/core/abstract/window.hh: Likewise.
+ * oln/core/w_window1d.hh: Likewise.
+ * oln/core/w_window2d.hh: Likewise.
+ * oln/core/w_window3d.hh: Likewise.
+ * oln/core/abstract/w_window.hh: Likewise.
+ * oln/core/abstract/image.hh: Likewise.
+ * oln/core/abstract/window_base.hh: Likewise.
+ * oln/core/abstract/windownd.hh: Likewise.
+ * oln/core/abstract/w_windownd.hh: Likewise.
+ * oln/core/abstract/neighborhoodnd.hh: Likewise.
2004-03-12 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -1222,44 +1330,45 @@
* oln/morpho/watershed.hxx: Likewise.
2004-03-11 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/core/abstract/image.hh: Add comments.
- * olena/oln/core/abstract/image_with_dim.hh: Correct comments.
+ * oln/core/abstract/image.hh: Add comments.
+ * oln/core/abstract/image_with_dim.hh: Correct comments.
2004-03-11 Simon Odou <simon(a)lrde.epita.fr>
- * olena/oln/core/abstract/image.hh: Add same macros without the
+ * oln/core/abstract/image.hh: Add same macros without the
'template' keyword.
2004-03-11 Damien Thivolle <damien(a)lrde.epita.fr>
- * olena/oln/core/abstract/dpoint.hh: Add comments.
- * olena/oln/core/abstract/image_size.hh: Add comments.
- * olena/oln/core/abstract/point.hh: Add comments.
- * olena/oln/core/abstract/image.hh: Add comments.
- * olena/oln/core/abstract/image_with_dim.hh: Add comments.
- * olena/oln/core/abstract/image_with_impl.hh: Add comments.
- * olena/oln/core/abstract/image_with_type.hh: Add comments.
- * olena/oln/core/abstract/image_with_type_with_dim.hh: Add comments.
- * olena/oln/core/abstract/behavior.hh: Add comments.
+ * oln/core/abstract/dpoint.hh: Add comments.
+ * oln/core/abstract/image_size.hh: Add comments.
+ * oln/core/abstract/point.hh: Add comments.
+ * oln/core/abstract/image.hh: Add comments.
+ * oln/core/abstract/image_with_dim.hh: Add comments.
+ * oln/core/abstract/image_with_impl.hh: Add comments.
+ * oln/core/abstract/image_with_type.hh: Add comments.
+ * oln/core/abstract/image_with_type_with_dim.hh: Add comments.
+ * oln/core/abstract/behavior.hh: Add comments.
2004-03-10 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/level/compare.hh: Add comments.
- * olena/oln/level/connected.hh: Add comments.
- * olena/oln/level/fill.hh: Add comments.
- * olena/oln/level/invert.hh: Add comments.
- * olena/oln/level/lut.hh: Add comments.
- * olena/oln/level/set_level.hh: Add comments.
- * olena/oln/level/threshold.hh: Add comments.
+
+ * oln/level/compare.hh: Add comments.
+ * oln/level/connected.hh: Add comments.
+ * oln/level/fill.hh: Add comments.
+ * oln/level/invert.hh: Add comments.
+ * oln/level/lut.hh: Add comments.
+ * oln/level/set_level.hh: Add comments.
+ * oln/level/threshold.hh: Add comments.
2004-03-10 Niels Van Vliet <niels(a)lrde.epita.fr>
- * olena/oln/snakes/snakes_base.hh: Add comments.
- * olena/oln/snakes/energies.hh: Add comments.
- * olena/oln/snakes/greedy.hh: Add comments.
- * olena/oln/snakes/node.hh: Add comments.
- * olena/oln/snakes/segment.hh: Add comments.
- * olena/oln/snakes/snakes_base.hh: Add comments.
- * olena/oln/morpho/attribute_closing_opening.hh: Fix bug in doc.
- * olena/oln/morpho/attribute_closing_opening_map.hh: Fix bug in doc.
+ * oln/snakes/snakes_base.hh: Add comments.
+ * oln/snakes/energies.hh: Add comments.
+ * oln/snakes/greedy.hh: Add comments.
+ * oln/snakes/node.hh: Add comments.
+ * oln/snakes/segment.hh: Add comments.
+ * oln/snakes/snakes_base.hh: Add comments.
+ * oln/morpho/attribute_closing_opening.hh: Fix bug in doc.
+ * oln/morpho/attribute_closing_opening_map.hh: Fix bug in doc.
2004-03-10 Giovanni Palma <giovanni(a)lrde.epita.fr>
@@ -1279,7 +1388,8 @@
* tests/morpho/tests/attr_op_cl: Change tests to make them taking
care of new attribute names.
- * oln/morpho/attribute_closing_opening_map.hh: Change some function names.
+ * oln/morpho/attribute_closing_opening_map.hh: Change some
+ function names.
* oln/morpho/attributes.hh: Rename some attributes. Add new ones.
* oln/Makefile.am: Add file references.
* oln/morpho/attribute_union_find.hh: Remove old attribute class.
@@ -1837,7 +1947,7 @@
* oln/core/abstract/image_with_impl.hh: ...here.
- * olena/oln/core/image.hh: Fix constructors.
+ * oln/core/image.hh: Fix constructors.
* tests/core/tests/image2: Adapt and fix.
@@ -1950,26 +2060,26 @@
* oln/utils/histogram.hh: Check if the given data type is valid.
* oln/morpho/closing.inc: Take non_vectorial_image instead of image.
- * oln/morpho/dilation.hh: Likewise.
- * oln/morpho/erosion.hh: Likewise.
- * oln/morpho/extrema.hxx: Likewise.
- * oln/morpho/extrema_killer.hh: Likewise.
- * oln/morpho/fast_morpho.hh: Likewise.
- * oln/morpho/fast_morpho.hxx: Likewise.
- * oln/morpho/geodesic_dilation.hh: Likewise.
- * oln/morpho/geodesic_erosion.hh: Likewise.
- * oln/morpho/gradient.inc: Likewise.
- * oln/morpho/hit_or_miss.inc: Likewise.
- * oln/morpho/laplacian.inc: Likewise.
- * oln/morpho/opening.inc: Likewise.
- * oln/morpho/reconstruction.hh: Likewise.
- * oln/morpho/stat.hh: Likewise.
- * oln/morpho/thickening.inc: Likewise.
- * oln/morpho/thinning.inc: Likewise.
- * oln/morpho/top_hat.inc: Likewise.
- * oln/morpho/watershed.hh: Likewise.
- * oln/morpho/watershed.hxx: Likewise.
- * oln/morpho/attribute_closing_opening.hh: Likewise.
+ * oln/morpho/dilation.hh: Likewise.
+ * oln/morpho/erosion.hh: Likewise.
+ * oln/morpho/extrema.hxx: Likewise.
+ * oln/morpho/extrema_killer.hh: Likewise.
+ * oln/morpho/fast_morpho.hh: Likewise.
+ * oln/morpho/fast_morpho.hxx: Likewise.
+ * oln/morpho/geodesic_dilation.hh: Likewise.
+ * oln/morpho/geodesic_erosion.hh: Likewise.
+ * oln/morpho/gradient.inc: Likewise.
+ * oln/morpho/hit_or_miss.inc: Likewise.
+ * oln/morpho/laplacian.inc: Likewise.
+ * oln/morpho/opening.inc: Likewise.
+ * oln/morpho/reconstruction.hh: Likewise.
+ * oln/morpho/stat.hh: Likewise.
+ * oln/morpho/thickening.inc: Likewise.
+ * oln/morpho/thinning.inc: Likewise.
+ * oln/morpho/top_hat.inc: Likewise.
+ * oln/morpho/watershed.hh: Likewise.
+ * oln/morpho/watershed.hxx: Likewise.
+ * oln/morpho/attribute_closing_opening.hh: Likewise.
2003-08-03 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
@@ -2342,43 +2452,43 @@
2003-07-30 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
- * oln/arith/ops.hh: Fix compilation with g++ 3.4.
- * oln/core/abstract/dpoint.hh: Likewise.
- * oln/core/image1d.hh: Likewise.
- * oln/core/image2d.hh: Likewise.
- * oln/core/image3d.hh: Likewise.
- * oln/core/abstract/iter1d.hh: Likewise.
- * oln/core/abstract/iter2d.hh: Likewise.
- * oln/core/abstract/iter3d.hh: Likewise.
- * oln/core/abstract/iter.hh: Likewise.
- * oln/core/neighborhood1d.hh: Likewise.
- * oln/core/neighborhood2d.hh: Likewise.
- * oln/core/neighborhood3d.hh: Likewise.
- * oln/core/abstract/neighborhood.hh: Likewise.
- * oln/core/abstract/point.hh: Likewise.
- * oln/core/abstract/struct_elt.hh: Likewise.
- * oln/core/window1d.hh: Likewise.
- * oln/core/window2d.hh: Likewise.
- * oln/core/window3d.hh: Likewise.
- * oln/core/abstract/window.hh: Likewise.
- * oln/core/w_window1d.hh: Likewise.
- * oln/core/w_window2d.hh: Likewise.
- * oln/core/w_window3d.hh: Likewise.
- * oln/core/abstract/w_window.hh: Likewise.
- * oln/level/invert.hh: Likewise.
- * oln/morpho/erosion.hh: Likewise.
- * tests/morpho/extrkiller.cc: Likewise.
- * oln/topo/inter-pixel/internal/dir-iter.hh: Likewise.
- * oln/core/abstract/image.hh: Likewise.
- * oln/core/abstract/image_with_dim.hh: Likewise.
- * oln/core/abstract/image_with_impl.hh: Likewise.
- * oln/core/abstract/image_with_type.hh: Likewise.
- * oln/core/impl/image_impl.hh: Likewise.
- * oln/core/impl/image_array.hh: Likewise.
- * oln/core/abstract/window_base.hh: Likewise.
- * oln/core/abstract/windownd.hh: Likewise.
- * oln/core/abstract/w_windownd.hh: Likewise.
- * oln/core/abstract/neighborhoodnd.hh: Likewise.
+ * oln/arith/ops.hh: Fix compilation with g++ 3.4.
+ * oln/core/abstract/dpoint.hh: Likewise.
+ * oln/core/image1d.hh: Likewise.
+ * oln/core/image2d.hh: Likewise.
+ * oln/core/image3d.hh: Likewise.
+ * oln/core/abstract/iter1d.hh: Likewise.
+ * oln/core/abstract/iter2d.hh: Likewise.
+ * oln/core/abstract/iter3d.hh: Likewise.
+ * oln/core/abstract/iter.hh: Likewise.
+ * oln/core/neighborhood1d.hh: Likewise.
+ * oln/core/neighborhood2d.hh: Likewise.
+ * oln/core/neighborhood3d.hh: Likewise.
+ * oln/core/abstract/neighborhood.hh: Likewise.
+ * oln/core/abstract/point.hh: Likewise.
+ * oln/core/abstract/struct_elt.hh: Likewise.
+ * oln/core/window1d.hh: Likewise.
+ * oln/core/window2d.hh: Likewise.
+ * oln/core/window3d.hh: Likewise.
+ * oln/core/abstract/window.hh: Likewise.
+ * oln/core/w_window1d.hh: Likewise.
+ * oln/core/w_window2d.hh: Likewise.
+ * oln/core/w_window3d.hh: Likewise.
+ * oln/core/abstract/w_window.hh: Likewise.
+ * oln/level/invert.hh: Likewise.
+ * oln/morpho/erosion.hh: Likewise.
+ * tests/morpho/extrkiller.cc: Likewise.
+ * oln/topo/inter-pixel/internal/dir-iter.hh: Likewise.
+ * oln/core/abstract/image.hh: Likewise.
+ * oln/core/abstract/image_with_dim.hh: Likewise.
+ * oln/core/abstract/image_with_impl.hh: Likewise.
+ * oln/core/abstract/image_with_type.hh: Likewise.
+ * oln/core/impl/image_impl.hh: Likewise.
+ * oln/core/impl/image_array.hh: Likewise.
+ * oln/core/abstract/window_base.hh: Likewise.
+ * oln/core/abstract/windownd.hh: Likewise.
+ * oln/core/abstract/w_windownd.hh: Likewise.
+ * oln/core/abstract/neighborhoodnd.hh: Likewise.
2003-07-30 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
@@ -3481,7 +3591,7 @@
2003-03-12 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
* tests/check/Makefile.flags, tests/sanity/Makefile.am: Remove
- useless flags.
+ useless flags.
* Makefile.am: Adjust consequently.
@@ -3569,7 +3679,7 @@
* oln/Makefile.am (nobase_oln_HEADERS): Adjust.
* oln/morpho/attribute_union_find.hh: Fix includes and
- namespaces.
+ namespaces.
2003-03-07 Nicolas Burrus <burrus_n(a)lrde.epita.fr>
@@ -4Index: 10.247/tools/swilena/ChangeLog
183,7 +4293,8 @@
* configure.ac: Merge tests/configure.ac. Use AC_CONFIG_FILES
instead of AC_CONFIG_HEADERS for pconf.inc.
- * tests/defs.in (CXXFLAGS): Remove warning options (added by "configure")
+ * tests/defs.in (CXXFLAGS): Remove warning options (added by
+ "configure")
* tests/Makefile.am (SUBDIRS): Correct @OLN_TESTS_SUBDIRS@ to
$(OLN_TESTS_SUBDIRS). Add comments.
@@ -4268,7 +4379,7 @@
* oln/core/point3d.hh: Add dpoint3d typedef.
* oln/core/point.hh: Minor change.
* oln/meta/basics.hh: Add an 'undefined' class for static
- error reporting.
+ error reporting.
* oln/core/box.hh:
- Parameter is changed to 'PointType'.
- (overlay): New.
@@ -4447,29 +4558,29 @@
2002-12-26 Reda Dehak <reda(a)nemours.epita.fr>
- * oln/convol/convolution.hh: Fix include files.
- * tests/convol/slow_sum_2d_1.cc: Change accordingly.
- * tests/convol/slow_sum_2d_2.cc: Change accordingly.
- * tests/convol/sobel_gradient.cc: Change accordingly.
+ * oln/convol/convolution.hh: Fix include files.
+ * tests/convol/slow_sum_2d_1.cc: Change accordingly.
+ * tests/convol/slow_sum_2d_2.cc: Change accordingly.
+ * tests/convol/sobel_gradient.cc: Change accordingly.
2002-12-11 Quoc Peyrot <chojin(a)lrde.epita.fr>
- * oln/Makefile.am (nobase_oln_HEADERS): Add morpho/extrema.hxx.
- move level/extrema_killer.hh to morpho/extrema_killer.hh.
+ * oln/Makefile.am (nobase_oln_HEADERS): Add morpho/extrema.hxx.
+ move level/extrema_killer.hh to morpho/extrema_killer.hh.
- * oln/morpho/extrema_killer.hh: Change namespace.
- * demo/test-reconstruction.cc: Change accordingly.
+ * oln/morpho/extrema_killer.hh: Change namespace.
+ * demo/test-reconstruction.cc: Change accordingly.
2002-12-11 Reda Dehak <reda(a)lrde.epita.fr>
- * oln/convol/convolution.hh: Fix convolve function.
- * test/convol/slow_sum_2d_1.hh: Modify accordingly.
- * test/convol/slow_sum_2d_2.hh: Modify accordingly.
- * test/convol/sobel_gradient.hh: Modify accordingly.
+ * oln/convol/convolution.hh: Fix convolve function.
+ * test/convol/slow_sum_2d_1.hh: Modify accordingly.
+ * test/convol/slow_sum_2d_2.hh: Modify accordingly.
+ * test/convol/sobel_gradient.hh: Modify accordingly.
2002-12-11 Quoc Peyrot <chojin(a)lrde.epita.fr>
- * Branch for olena 0.6 stable
+ * Branch for olena 0.6 stable
(End of changes from 0.6)
--- 10.247/tools/swilena/ChangeLog Thu, 13 Jul 2006 16:20:10 +0200 levill_r (oln/n/37_ChangeLog 1.7.1.47 600)
+++ 10.248/tools/swilena/ChangeLog Thu, 17 Aug 2006 11:01:04 +0200 levill_r (oln/n/37_ChangeLog 1.7.1.48 600)
@@ -15,11 +15,11 @@
Complete Rblena test suite.
* ruby/tests/arith.rb, ruby/tests/conversions.rb,
- * ruby/tests/morpho.rb: New tests
+ * ruby/tests/morpho.rb: New tests
* ruby/tests/Makefile.am (dist_noinst_DATA): Add arith.rb,
conversions.rb and morpho.rb.
- * python/tests/conversions.py, python/tests/morpho.py:
+ * python/tests/conversions.py, python/tests/morpho.py:
* python/tests/simple1.py: Reduce the number of imported modules.
* python/tests/Makefile.am, python/tests/arith.py,
* python/tests/sanity.py, ruby/tests/conversions.rb,
18 years, 4 months
- 1
- 0
oln-0.10 10.247: Fix Populate-Ignore list
by Roland Levillain
Index: 10.246/oln.prj
Only in 10.246: libtool
Only in 10.246: config/ltmain.sh
Only in 10.246: config/config.sub
Only in 10.246: config/config.guess
Only in 10.246: doc/ref/exdoc.mk
Only in 10.246: doc/ref/doxygen.config
Only in 10.246: doc/ref/out/exdoc.config
--- 10.246/oln.prj
+++ 10.247/oln.prj
@@ -1,28 +1,14 @@
;; -*- Prcs -*-
(Created-By-Prcs-Version 1 3 3)
(Project-Description "Olena")
-(Project-Version oln 10 246)
-(Parent-Version oln 10 245)
-(Version-Log "2006-08-04 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
-
- Factor some code in oln/lrde/ufmt/; add video raster scan
- algorithms and some versions with points as indices.
-
- * olena/oln/lrde/ufmt/README: New.
- * olena/oln/lrde/ufmt/basic_maxtree.hh: Move some parts into...
- * olena/oln/lrde/ufmt/ap_maxtree.hh: ...this new file.
- * olena/oln/lrde/ufmt/sp_maxtree.hh: New.
- * olena/oln/lrde/ufmt/ai_maxtree.hh: New.
- * olena/oln/lrde/ufmt/si_maxtree.hh: New.
- * olena/oln/lrde/ufmt/rup_maxtree.hh: New.
- * olena/oln/lrde/ufmt/bin/sp_maxtree.cc: New.
- * olena/oln/lrde/ufmt/bin/si_maxtree.cc: New.
- * olena/oln/lrde/ufmt/bin/rup_maxtree.cc: New.
- * olena/oln/lrde/ufmt/bin/r1_maxtree.cc: New.
+(Project-Version oln 10 247)
+(Parent-Version oln 10 246)
+(Version-Log "Fix Populate-Ignore list and remove generated files from the version
+control.
")
(New-Version-Log "")
-(Checkin-Time "Fri, 04 Aug 2006 18:48:35 +0200")
-(Checkin-Login theo)
+(Checkin-Time "Thu, 17 Aug 2006 10:47:46 +0200")
+(Checkin-Login levill_r)
;; diff-ignore tests/data/.*pbm$
;; diff-ignore .*\.pbm$
;; diff-ignore .*\.pgm$
@@ -87,6 +73,9 @@
"config.h\\(in\\)\\?$"
"doc/ref/ref-level.tex"
"doc/ref/ref-morpho.tex"
+ "^doc/ref/exdoc\\.mk$"
+ "^doc/ref/doxygen\\.config$"
+ "^doc/ref/out/exdoc\\.config$"
"utilities/.*\\.1$"
"^attic/"
"oln-"
@@ -120,7 +109,11 @@
"olena/img/lena1d.pbm"
"olena/img/lena1d16b.ppbm"
"\\.xvpics/"
- "old/"))
+ "old/"
+ "^libtool$"
+ "^config/ltmain\\.sh$"
+ "^config/config\\.guess$"
+ "^config/config\\.sub$"))
(Project-Keywords)
(Files
@@ -1526,10 +1519,10 @@
;; Files added by populate at Thu, 03 Aug 2006 15:59:48 +0200,
;; to version 10.244(w), by theo:
- (libtool (oln/w/47_libtool 1.1 755))
- (config/ltmain.sh (oln/w/48_ltmain.sh 1.1 644))
- (config/config.sub (oln/w/49_config.sub 1.1 755))
- (config/config.guess (oln/w/50_config.gue 1.1 755))
+
+
+
+
(olena/oln/lrde/ufmt/basic_salembier.hh (oln/w/51_basic_sale 1.1 644))
(olena/oln/lrde/ufmt/bin/basic_maxtree.cc (oln/x/0_basic_maxt 1.2 644))
(olena/oln/lrde/ufmt/bin/basic_salembier.cc (oln/x/1_basic_sale 1.1 644))
@@ -1541,9 +1534,9 @@
(olena/oln/lrde/ufmt/img/lena64.pgm (oln/x/6_lena64.pgm 1.1 644))
(olena/oln/lrde/ufmt/img/lena6.pgm (oln/x/7_lena6.pgm 1.1 644))
(olena/oln/lrde/ufmt/utils.hh (oln/x/8_utils.hh 1.2 644))
- (doc/ref/exdoc.mk (oln/x/9_exdoc.mk 1.1 644))
- (doc/ref/doxygen.config (oln/x/10_doxygen.co 1.1 644))
- (doc/ref/out/exdoc.config (oln/x/11_exdoc.conf 1.1 644))
+
+
+
;; Files added by populate at Fri, 04 Aug 2006 18:38:31 +0200,
;; to version 10.245(w), by theo:
@@ -1575,8 +1568,17 @@
; (olena/oln/lrde/ufmt/bin/exe/rup_maxtree () :no-keywords)
; (olena/oln/lrde/ufmt/bin/exe/basic_salembier () :no-keywords)
; (olena/oln/lrde/ufmt/bin/exe/basic_maxtree () :no-keywords)
+
+;; Files deleted by depopulate at Thu, 17 Aug 2006 10:46:05 +0200,
+;; from version 10.246(w), by levill_r:
+
+ ; (libtool ())
+ ; (config/ltmain.sh ())
+ ; (config/config.sub ())
+ ; (config/config.guess ())
+ ; (doc/ref/exdoc.mk ())
+ ; (doc/ref/doxygen.config ())
+ ; (doc/ref/out/exdoc.config ())
)
-(Merge-Parents
- (10.245 complete)
-)
+(Merge-Parents)
(New-Merge-Parents)
18 years, 4 months
- 1
- 0
oln-0.10 10.246: Update in olena/oln/lrde/ufmt/.
by Thierry GERAUD
2006-08-04 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
Factor some code in oln/lrde/ufmt/; add video raster scan
algorithms and some versions with points as indices.
* olena/oln/lrde/ufmt/README: New.
* olena/oln/lrde/ufmt/basic_maxtree.hh: Move some parts into...
* olena/oln/lrde/ufmt/ap_maxtree.hh: ...this new file.
* olena/oln/lrde/ufmt/sp_maxtree.hh: New.
* olena/oln/lrde/ufmt/ai_maxtree.hh: New.
* olena/oln/lrde/ufmt/si_maxtree.hh: New.
* olena/oln/lrde/ufmt/rup_maxtree.hh: New.
* olena/oln/lrde/ufmt/bin/sp_maxtree.cc: New.
* olena/oln/lrde/ufmt/bin/si_maxtree.cc: New.
* olena/oln/lrde/ufmt/bin/rup_maxtree.cc: New.
* olena/oln/lrde/ufmt/bin/r1_maxtree.cc: New.
Index: 10.245/oln.prj
--- 10.245/oln.prj
+++ 10.245(w)/oln.prj
@@ -1548,6 +1548,39 @@
(doc/ref/exdoc.mk (oln/x/9_exdoc.mk 1.1 644))
(doc/ref/doxygen.config (oln/x/10_doxygen.co 1.1 644))
(doc/ref/out/exdoc.config (oln/x/11_exdoc.conf 1.1 644))
+
+;; Files added by populate at Fri, 04 Aug 2006 18:38:31 +0200,
+;; to version 10.245(w), by theo:
+
+ (olena/oln/lrde/ufmt/ai_maxtree.hh ())
+ (olena/oln/lrde/ufmt/si_maxtree.hh ())
+ (olena/oln/lrde/ufmt/rup_maxtree.hh ())
+ (olena/oln/lrde/ufmt/sp_maxtree.hh ())
+ (olena/oln/lrde/ufmt/ap_maxtree.hh ())
+ (olena/oln/lrde/ufmt/r1_maxtree.hh ())
+ (olena/oln/lrde/ufmt/bin/rup_maxtree.cc ())
+ (olena/oln/lrde/ufmt/bin/si_maxtree.cc ())
+ (olena/oln/lrde/ufmt/bin/sp_maxtree.cc ())
+ (olena/oln/lrde/ufmt/bin/r1_maxtree.cc ())
+
+
+
+
+
+
+ (olena/oln/lrde/ufmt/README ())
+
+;; Files deleted by depopulate at Fri, 04 Aug 2006 18:41:16 +0200,
+;; from version 10.245(w), by theo:
+
+ ; (olena/oln/lrde/ufmt/bin/exe/si_maxtree () :no-keywords)
+ ; (olena/oln/lrde/ufmt/bin/exe/rup2_maxtree () :no-keywords)
+ ; (olena/oln/lrde/ufmt/bin/exe/sp_maxtree () :no-keywords)
+ ; (olena/oln/lrde/ufmt/bin/exe/rup_maxtree () :no-keywords)
+ ; (olena/oln/lrde/ufmt/bin/exe/basic_salembier () :no-keywords)
+ ; (olena/oln/lrde/ufmt/bin/exe/basic_maxtree () :no-keywords)
)
(Merge-Parents)
-(New-Merge-Parents)
+(New-Merge-Parents
+ (10.245 complete)
+)
Index: 10.245/olena/oln/lrde/ufmt/bin/basic_maxtree.cc
--- 10.245/olena/oln/lrde/ufmt/bin/basic_maxtree.cc Thu, 03 Aug 2006 16:06:43 +0200 theo (oln/x/0_basic_maxt 1.1 644)
+++ 10.245(w)/olena/oln/lrde/ufmt/bin/basic_maxtree.cc Fri, 04 Aug 2006 10:26:17 +0200 theo (oln/x/0_basic_maxt 1.1 644)
@@ -36,5 +36,6 @@
algorithm_t run(input,
c == 4 ? neighb_c4() : neighb_c8());
run.go();
+
std::cout << "n level roots = " << n_level_roots(run) << std::endl;
}
Index: 10.245/olena/oln/lrde/ufmt/basic_maxtree.hh
--- 10.245/olena/oln/lrde/ufmt/basic_maxtree.hh Thu, 03 Aug 2006 16:06:43 +0200 theo (oln/x/4_basic_maxt 1.1 644)
+++ 10.245(w)/olena/oln/lrde/ufmt/basic_maxtree.hh Fri, 04 Aug 2006 11:53:39 +0200 theo (oln/x/4_basic_maxt 1.1 644)
@@ -30,6 +30,7 @@
# include <oln/level/fill.hh>
# include <oln/lrde/ufmt/utils.hh>
+# include <oln/lrde/ufmt/ap_maxtree.hh>
@@ -46,20 +47,16 @@
// FIXME: doc.
template <class I>
- struct basic_maxtree
+ struct basic_maxtree : public ap_maxtree<I>
{
- typedef I image;
- typedef oln_point_type(I) point;
- typedef oln_value_type(I) value;
- typedef oln_neighborhood_type(I) Nbh;
- typedef oln_iter_type(Nbh) niter;
-
- // input
- const I& f;
- const Nbh& nbh;
+ typedef ap_maxtree<I> super;
+ using super::f;
+ using super::nbh;
+ using super::par;
+ oln_lrde_ufmt_import_ap_maxtree_typedefs;
+
// aux data
- typename mute<I, point>::ret par;
typename mute<I, bool>::ret isproc;
std::vector<point> S;
@@ -69,10 +66,7 @@
basic_maxtree(const abstract::image<I>& f,
const oln_neighborhood_type(I)& nbh)
:
- f(f.exact()),
- nbh(nbh),
- // FIXME: par and isproc should NOT be initialized here! (but in "init()")
- par(f.size()),
+ super(f, nbh),
isproc(f.size())
{
}
@@ -110,67 +104,21 @@
// FIXME: TODO
}
- void make_set(const point& x)
- {
- par[x] = x;
- }
-
void do_union(const point& n, const point& p)
{
- point r = find_tree_root(n);
+ point r = find_root(n);
if (r != p)
par[r] = p;
}
- bool is_tree_root(const point& x) const
- {
- return par[x] == x;
- }
-
- bool is_level_root(const point& x) const
- {
- return is_tree_root(x) or f[par[x]] < f[x];
- }
-
- point find_level_root(const point& x)
- {
- if (is_level_root(x))
- return x;
- else
- return par[x] = find_level_root(par[x]);
- }
-
- point find_tree_root(point x)
+ point find_root(point x)
{
- while (not is_tree_root(x))
+ while (not is_root(x))
x = find_level_root(par[x]);
return x;
}
-
- // uniformized interface
-
- const point& parent_(const point& p) const {
- return par[p];
- }
- const value& f_(const point& p) const {
- return f[p];
- }
- const I& f_() const {
- return f;
- }
- bool is_tree_root_(const point& p) const {
- return is_tree_root(p);
- }
- bool is_level_root_(const point& p) const {
- return is_level_root(p);
- }
-
- // end of uniformized interface
-
-
-
}; // end of class basic_maxtree
Index: 10.245/olena/oln/lrde/ufmt/utils.hh
--- 10.245/olena/oln/lrde/ufmt/utils.hh Thu, 03 Aug 2006 16:06:43 +0200 theo (oln/x/8_utils.hh 1.1 644)
+++ 10.245(w)/olena/oln/lrde/ufmt/utils.hh Fri, 04 Aug 2006 16:00:07 +0200 theo (oln/x/8_utils.hh 1.1 644)
@@ -32,6 +32,14 @@
# include <vector>
+
+
+
+# define oln_neighborhood_type(I) \
+typename oln::lrde::ufmt::internal::neighborhood<I>::ret
+
+
+
namespace oln
{
@@ -138,6 +146,7 @@
}
+
template <class I>
std::vector<oln_point_type(I)>
histogram_reverse_sort_p(const abstract::image<I>& input,
@@ -166,6 +175,56 @@
}
+ // _i
+
+ template <class I>
+ std::vector<int>
+ histogram_reverse_sort_i(const abstract::image<I>& input,
+ size_t N,
+ std::vector<size_t>& H)
+ {
+ H = histogram(input, N);
+
+ // preparing output data
+
+ unsigned nvalues = uint_nvalues(input);
+ std::vector<int> loc(nvalues);
+ loc[nvalues - 1] = 0;
+ for (int l = int(nvalues) - 2; l >= 0; --l)
+ loc[l] = loc[l+1] + H[l+1];
+
+ std::vector<int> vec(N);
+
+ // storing output data
+
+ typedef oln_value_type(I) value_t;
+ typedef oln_point_type(I) point_t;
+
+ I& input_ = const_cast<I&>(input.exact());
+ value_t* orig = &(input_[point_t()]);
+ oln_iter_type(I) p(input);
+ size_t count = 0;
+ for_all(p)
+ {
+ vec[loc[input[p]]++] = int(&(input_[p]) - orig);
+ if (++count == N)
+ return vec;
+ }
+
+ return vec;
+ }
+
+
+ template <class I>
+ std::vector<int>
+ histogram_reverse_sort_i(const abstract::image<I>& input,
+ std::vector<size_t>& H)
+ {
+ return histogram_reverse_sort_i(input, input.npoints(), H);
+ }
+
+
+
// Extra traits to get the classical neighborhood types from
// classical image types.
@@ -185,6 +244,59 @@
+ template <class I>
+ unsigned pre(const oln_neighborhood_type(I)& nbh,
+ std::vector<oln_dpoint_type(I)>& pre)
+ {
+ for (unsigned i = 0; i < nbh.card(); ++i)
+ {
+ unsigned d;
+ for (d = 0; d < I::dim; ++d)
+ if (nbh.dp(i).nth(d) < 0) {
+ pre.push_back(nbh.dp(i));
+ break;
+ }
+ else if (nbh.dp(i).nth(d) > 0)
+ break;
+ }
+ assert(pre.size() == (nbh.card() / 2));
+ return pre.size();
+ }
+
+
+ template <class I>
+ unsigned split(const oln_neighborhood_type(I)& nbh,
+ std::vector<oln_dpoint_type(I)>& pre,
+ std::vector<oln_dpoint_type(I)>& post)
+ {
+ for (unsigned i = 0; i < nbh.card(); ++i)
+ {
+ unsigned d;
+ bool is_post = true;
+ for (d = 0; d < I::dim; ++d)
+ if (nbh.dp(i).nth(d) < 0) {
+ pre.push_back(nbh.dp(i));
+ is_post = false;
+ break;
+ }
+ else if (nbh.dp(i).nth(d) > 0)
+ break;
+ if (is_post)
+ post.push_back(nbh.dp(i));
+ }
+ if (not ((pre.size() + post.size()) == nbh.card())
+ or not (pre.size() == post.size()))
+ {
+ std::cerr << "pb in oln::lrde::ufmt::split (utils.hh) so abort!" << std::endl;
+ abort();
+ }
+ assert((pre.size() + post.size()) == nbh.card());
+ assert(pre.size() == post.size());
+ return pre.size();
+ }
+
+
+
} // end of namespace oln::lrde::ufmt
} // end of namespace oln::lrde
@@ -193,9 +305,5 @@
-# define oln_neighborhood_type(I) \
-typename oln::lrde::ufmt::internal::neighborhood<I>::ret
-
-
#endif // ! OLENA_LRDE_UFMT_UTILS_HH
Only in 10.245(w): olena/oln/lrde/ufmt/ai_maxtree.hh
Only in 10.245(w): olena/oln/lrde/ufmt/si_maxtree.hh
Only in 10.245(w): olena/oln/lrde/ufmt/rup_maxtree.hh
Only in 10.245(w): olena/oln/lrde/ufmt/sp_maxtree.hh
Only in 10.245(w): olena/oln/lrde/ufmt/ap_maxtree.hh
Only in 10.245(w): olena/oln/lrde/ufmt/r1_maxtree.hh
Only in 10.245(w): olena/oln/lrde/ufmt/bin/rup_maxtree.cc
Only in 10.245(w): olena/oln/lrde/ufmt/bin/si_maxtree.cc
Only in 10.245(w): olena/oln/lrde/ufmt/bin/sp_maxtree.cc
Only in 10.245(w): olena/oln/lrde/ufmt/bin/r1_maxtree.cc
Only in 10.245(w): olena/oln/lrde/ufmt/README
18 years, 4 months
- 1
- 0
oln-0.10 10.245: Add some research/publication code.
by Thierry GERAUD
Index: 10.244/ChangeLog
--- 10.244/ChangeLog Tue, 11 Jul 2006 15:25:21 +0200 levill_r (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.24 600)
+++ 10.244(w)/ChangeLog Thu, 03 Aug 2006 16:05:38 +0200 theo (oln/o/33_ChangeLog 1.37.1.16.1.17.1.19.1.24 600)
@@ -1,3 +1,24 @@
+2006-08-03 Thierry GERAUD <theo(a)tegucigalpa.lrde.epita.fr>
+
+ Add some first code corresponding to an LRDE publication about
+ union-find and max-tree.
+
+ * olena/oln/lrde: New directory for code related to LRDE
+ publications.
+ * olena/oln/lrde/ufmt: New directory specific to union-find and
+ max-tree.
+ * olena/oln/lrde/ufmt/log.hh: New.
+ * olena/oln/lrde/ufmt/utils.hh: New.
+ * olena/oln/lrde/ufmt/basic_maxtree.hh: New.
+ * olena/oln/lrde/ufmt/basic_salembier.hh: New.
+ * olena/oln/lrde/ufmt/bin: New directory for corresponding
+ bin source.
+ * olena/oln/lrde/ufmt/bin/basic_maxtree.cc: New.
+ * olena/oln/lrde/ufmt/bin/basic_salembier.cc: New.
+ * olena/oln/lrde/ufmt/img: New directory for tiny test images.
+ * olena/oln/lrde/ufmt/img/lena6.pgm: New image file.
+ * olena/oln/lrde/ufmt/img/lena64.pgm: Likewise.
+
2006-07-11 Roland Levillain <roland(a)lrde.epita.fr>
Use Libtool.
Index: 10.244/libtool
--- 10.244/libtool Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/libtool Fri, 28 Jul 2006 11:45:17 +0200 theo (oln/w/47_libtool 644)
@@ -0,0 +1,7364 @@
+#! /bin/sh
+
+# libtoolT - Provide generalized library-building support services.
+# Generated automatically by (GNU olena 0.10)
+# NOTE: Changes made to this file will be lost: look at ltmain.sh.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
+# Free Software Foundation, Inc.
+#
+# This file is part of GNU Libtool:
+# Originally by Gordon Matzigkeit <gord(a)gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# A sed program that does not truncate output.
+SED="/bin/sed"
+
+# Sed that helps us avoid accidentally triggering echo(1) options like -n.
+Xsed="/bin/sed -e s/^X//"
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
+
+# The names of the tagged configurations supported by this script.
+available_tags=" CXX F77"
+
+# ### BEGIN LIBTOOL CONFIG
+
+# Libtool was configured on host tegucigalpa:
+
+# Shell to use when invoking shell scripts.
+SHELL="/bin/sh"
+
+# Whether or not to build shared libraries.
+build_libtool_libs=yes
+
+# Whether or not to build static libraries.
+build_old_libs=yes
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=no
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=no
+
+# Whether or not to optimize for fast installation.
+fast_install=yes
+
+# The host system.
+host_alias=
+host=i686-pc-linux-gnu
+
+# An echo program that does not interpret backslashes.
+echo="echo"
+
+# The archiver.
+AR="ar"
+AR_FLAGS="cru"
+
+# A C compiler.
+LTCC="gcc"
+
+# A language-specific compiler.
+CC="gcc"
+
+# Is the compiler the GNU C compiler?
+with_gcc=yes
+
+# An ERE matcher.
+EGREP="grep -E"
+
+# The linker used to build libraries.
+LD="/usr/bin/ld"
+
+# Whether we need hard or soft links.
+LN_S="ln -s"
+
+# A BSD-compatible nm program.
+NM="/usr/bin/nm -B"
+
+# A symbol stripping program
+STRIP="strip"
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=file
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="dlltool"
+
+# Used on cygwin: object dumper.
+OBJDUMP="objdump"
+
+# Used on cygwin: assembler.
+AS="as"
+
+# The name of the directory that contains temporary libtool files.
+objdir=.libs
+
+# How to create reloadable object files.
+reload_flag=" -r"
+reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
+
+# How to pass a linker flag through the compiler.
+wl="-Wl,"
+
+# Object file suffix (normally "o").
+objext="o"
+
+# Old archive suffix (normally "a").
+libext="a"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='.so'
+
+# Executable file suffix (normally "").
+exeext=""
+
+# Additional compiler flags for building library objects.
+pic_flag=" -fPIC -DPIC"
+pic_mode=default
+
+# What is the maximum length of a command?
+max_cmd_len=32768
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o="yes"
+
+# Must we lock files when doing compilation ?
+need_locks="no"
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=no
+
+# Do we need a version for libraries?
+need_version=no
+
+# Whether dlopen is supported.
+dlopen_support=unknown
+
+# Whether dlopen of programs is supported.
+dlopen_self=unknown
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=unknown
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag="-static"
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=" -fno-builtin"
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec="\${wl}--export-dynamic"
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=""
+
+# Library versioning type.
+version_type=linux
+
+# Format of library name prefix.
+libname_spec="lib\$name"
+
+# List of archive names. First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
+
+# The coded name of the library, if different from the real name.
+soname_spec="\${libname}\${release}\${shared_ext}\$major"
+
+# Commands used to build and install an old-style archive.
+RANLIB="ranlib"
+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
+old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
+old_postuninstall_cmds=""
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=""
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=""
+
+# Commands used to build and install a shared archive.
+archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
+archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
+cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
+\$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
+ \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
+postinstall_cmds=""
+postuninstall_cmds=""
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=""
+module_expsym_cmds=""
+
+# Commands to strip libraries.
+old_striplib="strip --strip-debug"
+striplib="strip --strip-unneeded"
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=""
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=""
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=""
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=""
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=""
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method="pass_all"
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd="\$MAGIC_CMD"
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=""
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=""
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=""
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'"
+
+# This is the shared library runtime path variable.
+runpath_var=LD_RUN_PATH
+
+# This is the shared library path variable.
+shlibpath_var=LD_LIBRARY_PATH
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=no
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=immediate
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=yes
+
+# Flag to hardcode $libdir into a binary during linking.
+# This must work even if $libdir does not exist.
+hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
+
+# If ld is used when linking, flag to hardcode $libdir into
+# a binary during linking. This must work even if $libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=""
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=""
+
+# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=no
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=no
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=unsupported
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=no
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=no
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux/3.3.5/ /usr/lib/gcc/i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../ /lib/i486-linux/3.3.5/ /lib/ /usr/lib/i486-linux/3.3.5/ /usr/lib/"
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/lib/libc5-compat /lib/libc5-compat /usr/i486-linuxlibc1/lib /usr/lib/sse/atlas /usr/lib/atlas/sse /usr/lib/sse /usr/lib/sse2/atlas /usr/lib/atlas/sse2 /usr/lib/sse2 /usr/lib/atlas "
+
+# Fix the shell variable $srcfile for the compiler.
+fix_srcfile_path=""
+
+# Set to yes if exported symbols are required.
+always_export_symbols=no
+
+# The commands to list exported symbols.
+export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=""
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+
+# Symbols that must always be exported.
+include_expsyms=""
+
+# ### END LIBTOOL CONFIG
+
+# ltmain.sh - Provide generalized library-building support services.
+# NOTE: Changing this file will not affect anything until you rerun configure.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
+# Free Software Foundation, Inc.
+# Originally by Gordon Matzigkeit <gord(a)gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+basename="s,^.*/,,g"
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+progname=`echo "$progpath" | $SED $basename`
+modename="$progname"
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=1.5.6
+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
+
+
+# Check that we have a working $echo.
+if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+elif test "X$1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+ # Yippee, $echo works!
+ :
+else
+ # Restart under the correct shell, and then maybe $echo will work.
+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<EOF
+$*
+EOF
+ exit $EXIT_SUCCESS
+fi
+
+default_mode=
+help="Try \`$progname --help' for more information."
+magic="%%%MAGIC variable%%%"
+mkdir="mkdir"
+mv="mv -f"
+rm="rm -f"
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+# test EBCDIC or ASCII
+case `echo A|tr A '\301'` in
+ A) # EBCDIC based system
+ SP2NL="tr '\100' '\n'"
+ NL2SP="tr '\r\n' '\100\100'"
+ ;;
+ *) # Assume ASCII based system
+ SP2NL="tr '\040' '\012'"
+ NL2SP="tr '\015\012' '\040\040'"
+ ;;
+esac
+
+# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+# We save the old values to restore during execute mode.
+if test "${LC_ALL+set}" = set; then
+ save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+fi
+if test "${LANG+set}" = set; then
+ save_LANG="$LANG"; LANG=C; export LANG
+fi
+
+# Make sure IFS has a sensible default
+: ${IFS="
+"}
+
+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ $echo "$modename: not configured to build any kind of library" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit $EXIT_FAILURE
+fi
+
+# Global variables.
+mode=$default_mode
+nonopt=
+prev=
+prevopt=
+run=
+show="$echo"
+show_help=
+execute_dlfiles=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+
+#####################################
+# Shell function definitions:
+# This seems to be the best place for them
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+func_win32_libid () {
+ win32_libid_type="unknown"
+ win32_fileres=`file -L $1 2>/dev/null`
+ case $win32_fileres in
+ *ar\ archive\ import\ library*) # definitely import
+ win32_libid_type="x86 archive import"
+ ;;
+ *ar\ archive*) # could be an import, or static
+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 | \
+ sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+ if test "X$win32_nmres" = "Ximport" ; then
+ win32_libid_type="x86 archive import"
+ else
+ win32_libid_type="x86 archive static"
+ fi
+ fi
+ ;;
+ *DLL*)
+ win32_libid_type="x86 DLL"
+ ;;
+ *executable*) # but shell scripts are "executable" too...
+ case $win32_fileres in
+ *MS\ Windows\ PE\ Intel*)
+ win32_libid_type="x86 DLL"
+ ;;
+ esac
+ ;;
+ esac
+ $echo $win32_libid_type
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag () {
+ if test -n "$available_tags" && test -z "$tagname"; then
+ CC_quoted=
+ for arg in $CC; do
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+ CC_quoted="$CC_quoted $arg"
+ done
+ case $@ in
+ # Blanks in the command may have been stripped by the calling shell,
+ # but not from the CC environment variable when configure was run.
+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+ # Blanks at the start of $base_compile will cause this to fail
+ # if we don't check for them as well.
+ *)
+ for z in $available_tags; do
+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+ # Evaluate the configuration.
+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+ CC_quoted=
+ for arg in $CC; do
+ # Double-quote args containing other shell metacharacters.
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+ CC_quoted="$CC_quoted $arg"
+ done
+ case "$@ " in
+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+ # The compiler in the base compile command matches
+ # the one in the tagged configuration.
+ # Assume this is the tagged configuration we want.
+ tagname=$z
+ break
+ ;;
+ esac
+ fi
+ done
+ # If $tagname still isn't set, then no tagged configuration
+ # was found and let the user know that the "--tag" command
+ # line option must be used.
+ if test -z "$tagname"; then
+ $echo "$modename: unable to infer tagged configuration"
+ $echo "$modename: specify a tag with \`--tag'" 1>&2
+ exit $EXIT_FAILURE
+# else
+# $echo "$modename: using $tagname tagged configuration"
+ fi
+ ;;
+ esac
+ fi
+}
+# End of Shell function definitions
+#####################################
+
+# Darwin sucks
+eval std_shrext=\"$shrext_cmds\"
+
+# Parse our command line options once, thoroughly.
+while test "$#" -gt 0
+do
+ arg="$1"
+ shift
+
+ case $arg in
+ -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ # If the previous option needs an argument, assign it.
+ if test -n "$prev"; then
+ case $prev in
+ execute_dlfiles)
+ execute_dlfiles="$execute_dlfiles $arg"
+ ;;
+ tag)
+ tagname="$arg"
+ preserve_args="${preserve_args}=$arg"
+
+ # Check whether tagname contains only valid characters
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ $echo "$progname: invalid tag name: $tagname" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $tagname in
+ CC)
+ # Don't test for the "default" C tag, as we know, it's there, but
+ # not specially marked.
+ ;;
+ *)
+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+ taglist="$taglist $tagname"
+ # Evaluate the configuration.
+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+ else
+ $echo "$progname: ignoring unknown tag $tagname" 1>&2
+ fi
+ ;;
+ esac
+ ;;
+ *)
+ eval "$prev=\$arg"
+ ;;
+ esac
+
+ prev=
+ prevopt=
+ continue
+ fi
+
+ # Have we seen a non-optional argument yet?
+ case $arg in
+ --help)
+ show_help=yes
+ ;;
+
+ --version)
+ $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+ $echo
+ $echo "Copyright (C) 2003 Free Software Foundation, Inc."
+ $echo "This is free software; see the source for copying conditions. There is NO"
+ $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+ exit $EXIT_SUCCESS
+ ;;
+
+ --config)
+ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+ # Now print the configurations for the tags.
+ for tagname in $taglist; do
+ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+ done
+ exit $EXIT_SUCCESS
+ ;;
+
+ --debug)
+ $echo "$progname: enabling shell trace mode"
+ set -x
+ preserve_args="$preserve_args $arg"
+ ;;
+
+ --dry-run | -n)
+ run=:
+ ;;
+
+ --features)
+ $echo "host: $host"
+ if test "$build_libtool_libs" = yes; then
+ $echo "enable shared libraries"
+ else
+ $echo "disable shared libraries"
+ fi
+ if test "$build_old_libs" = yes; then
+ $echo "enable static libraries"
+ else
+ $echo "disable static libraries"
+ fi
+ exit $EXIT_SUCCESS
+ ;;
+
+ --finish) mode="finish" ;;
+
+ --mode) prevopt="--mode" prev=mode ;;
+ --mode=*) mode="$optarg" ;;
+
+ --preserve-dup-deps) duplicate_deps="yes" ;;
+
+ --quiet | --silent)
+ show=:
+ preserve_args="$preserve_args $arg"
+ ;;
+
+ --tag) prevopt="--tag" prev=tag ;;
+ --tag=*)
+ set tag "$optarg" ${1+"$@"}
+ shift
+ prev=tag
+ preserve_args="$preserve_args --tag"
+ ;;
+
+ -dlopen)
+ prevopt="-dlopen"
+ prev=execute_dlfiles
+ ;;
+
+ -*)
+ $echo "$modename: unrecognized option \`$arg'" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+
+ *)
+ nonopt="$arg"
+ break
+ ;;
+ esac
+done
+
+if test -n "$prevopt"; then
+ $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+fi
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end. This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+if test -z "$show_help"; then
+
+ # Infer the operation mode.
+ if test -z "$mode"; then
+ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+ $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
+ case $nonopt in
+ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+ mode=link
+ for arg
+ do
+ case $arg in
+ -c)
+ mode=compile
+ break
+ ;;
+ esac
+ done
+ ;;
+ *db | *dbx | *strace | *truss)
+ mode=execute
+ ;;
+ *install*|cp|mv)
+ mode=install
+ ;;
+ *rm)
+ mode=uninstall
+ ;;
+ *)
+ # If we have no mode, but dlfiles were specified, then do execute mode.
+ test -n "$execute_dlfiles" && mode=execute
+
+ # Just use the default operation mode.
+ if test -z "$mode"; then
+ if test -n "$nonopt"; then
+ $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+ else
+ $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+ fi
+ fi
+ ;;
+ esac
+ fi
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
+ $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+ generic_help="$help"
+ help="Try \`$modename --help --mode=$mode' for more information."
+
+ # These modes are in order of execution frequency so that they run quickly.
+ case $mode in
+ # libtool compile mode
+ compile)
+ modename="$modename: compile"
+ # Get the compilation command and the source file.
+ base_compile=
+ srcfile="$nonopt" # always keep a non-empty value in "srcfile"
+ suppress_opt=yes
+ suppress_output=
+ arg_mode=normal
+ libobj=
+ later=
+
+ for arg
+ do
+ case "$arg_mode" in
+ arg )
+ # do not "continue". Instead, add this to base_compile
+ lastarg="$arg"
+ arg_mode=normal
+ ;;
+
+ target )
+ libobj="$arg"
+ arg_mode=normal
+ continue
+ ;;
+
+ normal )
+ # Accept any command-line options.
+ case $arg in
+ -o)
+ if test -n "$libobj" ; then
+ $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ arg_mode=target
+ continue
+ ;;
+
+ -static | -prefer-pic | -prefer-non-pic)
+ later="$later $arg"
+ continue
+ ;;
+
+ -no-suppress)
+ suppress_opt=no
+ continue
+ ;;
+
+ -Xcompiler)
+ arg_mode=arg # the next one goes into the "base_compile" arg list
+ continue # The current "srcfile" will either be retained or
+ ;; # replaced later. I would guess that would be a bug.
+
+ -Wc,*)
+ args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ lastarg=
+ save_ifs="$IFS"; IFS=','
+ for arg in $args; do
+ IFS="$save_ifs"
+
+ # Double-quote args containing other shell metacharacters.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+ lastarg="$lastarg $arg"
+ done
+ IFS="$save_ifs"
+ lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+
+ # Add the arguments to base_compile.
+ base_compile="$base_compile $lastarg"
+ continue
+ ;;
+
+ * )
+ # Accept the current argument as the source file.
+ # The previous "srcfile" becomes the current argument.
+ #
+ lastarg="$srcfile"
+ srcfile="$arg"
+ ;;
+ esac # case $arg
+ ;;
+ esac # case $arg_mode
+
+ # Aesthetically quote the previous argument.
+ lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+
+ case $lastarg in
+ # Double-quote args containing other shell metacharacters.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ lastarg="\"$lastarg\""
+ ;;
+ esac
+
+ base_compile="$base_compile $lastarg"
+ done # for arg
+
+ case $arg_mode in
+ arg)
+ $echo "$modename: you must specify an argument for -Xcompile"
+ exit $EXIT_FAILURE
+ ;;
+ target)
+ $echo "$modename: you must specify a target with \`-o'" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ *)
+ # Get the name of the library object.
+ [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+ ;;
+ esac
+
+ # Recognize several different file suffixes.
+ # If the user specifies -o file.o, it is replaced with file.lo
+ xform='[cCFSifmso]'
+ case $libobj in
+ *.ada) xform=ada ;;
+ *.adb) xform=adb ;;
+ *.ads) xform=ads ;;
+ *.asm) xform=asm ;;
+ *.c++) xform=c++ ;;
+ *.cc) xform=cc ;;
+ *.ii) xform=ii ;;
+ *.class) xform=class ;;
+ *.cpp) xform=cpp ;;
+ *.cxx) xform=cxx ;;
+ *.f90) xform=f90 ;;
+ *.for) xform=for ;;
+ *.java) xform=java ;;
+ esac
+
+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+
+ case $libobj in
+ *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+ *)
+ $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ func_infer_tag $base_compile
+
+ for arg in $later; do
+ case $arg in
+ -static)
+ build_old_libs=yes
+ continue
+ ;;
+
+ -prefer-pic)
+ pic_mode=yes
+ continue
+ ;;
+
+ -prefer-non-pic)
+ pic_mode=no
+ continue
+ ;;
+ esac
+ done
+
+ objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$obj"; then
+ xdir=
+ else
+ xdir=$xdir/
+ fi
+ lobj=${xdir}$objdir/$objname
+
+ if test -z "$base_compile"; then
+ $echo "$modename: you must specify a compilation command" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Delete any leftover library objects.
+ if test "$build_old_libs" = yes; then
+ removelist="$obj $lobj $libobj ${libobj}T"
+ else
+ removelist="$lobj $libobj ${libobj}T"
+ fi
+
+ $run $rm $removelist
+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+
+ # On Cygwin there's no "real" PIC flag so we must build both object types
+ case $host_os in
+ cygwin* | mingw* | pw32* | os2*)
+ pic_mode=default
+ ;;
+ esac
+ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ # non-PIC code in shared libraries is not supported
+ pic_mode=default
+ fi
+
+ # Calculate the filename of the output object if compiler does
+ # not support -o with -c
+ if test "$compiler_c_o" = no; then
+ output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ lockfile="$output_obj.lock"
+ removelist="$removelist $output_obj $lockfile"
+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+ else
+ output_obj=
+ need_locks=no
+ lockfile=
+ fi
+
+ # Lock this critical section if it is needed
+ # We use this script file to make the link, it avoids creating a new file
+ if test "$need_locks" = yes; then
+ until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ $show "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+ elif test "$need_locks" = warn; then
+ if test -f "$lockfile"; then
+ $echo "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together. If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+ $run $rm $removelist
+ exit $EXIT_FAILURE
+ fi
+ $echo $srcfile > "$lockfile"
+ fi
+
+ if test -n "$fix_srcfile_path"; then
+ eval srcfile=\"$fix_srcfile_path\"
+ fi
+
+ $run $rm "$libobj" "${libobj}T"
+
+ # Create a libtool object file (analogous to a ".la" file),
+ # but don't create it if we're doing a dry run.
+ test -z "$run" && cat > ${libobj}T <<EOF
+# $libobj - a libtool object file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+EOF
+
+ # Only build a PIC object if we are building libtool libraries.
+ if test "$build_libtool_libs" = yes; then
+ # Without this assignment, base_compile gets emptied.
+ fbsd_hideous_sh_bug=$base_compile
+
+ if test "$pic_mode" != no; then
+ command="$base_compile $srcfile $pic_flag"
+ else
+ # Don't build PIC code
+ command="$base_compile $srcfile"
+ fi
+
+ if test ! -d "${xdir}$objdir"; then
+ $show "$mkdir ${xdir}$objdir"
+ $run $mkdir ${xdir}$objdir
+ status=$?
+ if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+ exit $status
+ fi
+ fi
+
+ if test -z "$output_obj"; then
+ # Place PIC objects in $objdir
+ command="$command -o $lobj"
+ fi
+
+ $run $rm "$lobj" "$output_obj"
+
+ $show "$command"
+ if $run eval "$command"; then :
+ else
+ test -n "$output_obj" && $run $rm $removelist
+ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+ $echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together. If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+ $run $rm $removelist
+ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed, then go on to compile the next one
+ if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+ $show "$mv $output_obj $lobj"
+ if $run $mv $output_obj $lobj; then :
+ else
+ error=$?
+ $run $rm $removelist
+ exit $error
+ fi
+ fi
+
+ # Append the name of the PIC object to the libtool object file.
+ test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object='$objdir/$objname'
+
+EOF
+
+ # Allow error messages only from the first compilation.
+ if test "$suppress_opt" = yes; then
+ suppress_output=' >/dev/null 2>&1'
+ fi
+ else
+ # No PIC object so indicate it doesn't exist in the libtool
+ # object file.
+ test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object=none
+
+EOF
+ fi
+
+ # Only build a position-dependent object if we build old libraries.
+ if test "$build_old_libs" = yes; then
+ if test "$pic_mode" != yes; then
+ # Don't build PIC code
+ command="$base_compile $srcfile"
+ else
+ command="$base_compile $srcfile $pic_flag"
+ fi
+ if test "$compiler_c_o" = yes; then
+ command="$command -o $obj"
+ fi
+
+ # Suppress compiler output if we already did a PIC compilation.
+ command="$command$suppress_output"
+ $run $rm "$obj" "$output_obj"
+ $show "$command"
+ if $run eval "$command"; then :
+ else
+ $run $rm $removelist
+ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+ $echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together. If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+ $run $rm $removelist
+ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed
+ if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+ $show "$mv $output_obj $obj"
+ if $run $mv $output_obj $obj; then :
+ else
+ error=$?
+ $run $rm $removelist
+ exit $error
+ fi
+ fi
+
+ # Append the name of the non-PIC object the libtool object file.
+ # Only append if the libtool object file exists.
+ test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object='$objname'
+
+EOF
+ else
+ # Append the name of the non-PIC object the libtool object file.
+ # Only append if the libtool object file exists.
+ test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object=none
+
+EOF
+ fi
+
+ $run $mv "${libobj}T" "${libobj}"
+
+ # Unlock the critical section if it was locked
+ if test "$need_locks" != no; then
+ $run $rm "$lockfile"
+ fi
+
+ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool link mode
+ link | relink)
+ modename="$modename: link"
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ # It is impossible to link a dll without this setting, and
+ # we shouldn't force the makefile maintainer to figure out
+ # which system we are compiling for in order to pass an extra
+ # flag for every libtool invocation.
+ # allow_undefined=no
+
+ # FIXME: Unfortunately, there are problems with the above when trying
+ # to make a dll which has undefined symbols, in which case not
+ # even a static library is built. For now, we need to specify
+ # -no-undefined on the libtool link line when we can be certain
+ # that all symbols are satisfied, otherwise we get a static library.
+ allow_undefined=yes
+ ;;
+ *)
+ allow_undefined=yes
+ ;;
+ esac
+ libtool_args="$nonopt"
+ base_compile="$nonopt $@"
+ compile_command="$nonopt"
+ finalize_command="$nonopt"
+
+ compile_rpath=
+ finalize_rpath=
+ compile_shlibpath=
+ finalize_shlibpath=
+ convenience=
+ old_convenience=
+ deplibs=
+ old_deplibs=
+ compiler_flags=
+ linker_flags=
+ dllsearchpath=
+ lib_search_path=`pwd`
+ inst_prefix_dir=
+
+ avoid_version=no
+ dlfiles=
+ dlprefiles=
+ dlself=no
+ export_dynamic=no
+ export_symbols=
+ export_symbols_regex=
+ generated=
+ libobjs=
+ ltlibs=
+ module=no
+ no_install=no
+ objs=
+ non_pic_objects=
+ precious_files_regex=
+ prefer_static_libs=no
+ preload=no
+ prev=
+ prevarg=
+ release=
+ rpath=
+ xrpath=
+ perm_rpath=
+ temp_rpath=
+ thread_safe=no
+ vinfo=
+ vinfo_number=no
+
+ func_infer_tag $base_compile
+
+ # We need to know -static, to get the right output filenames.
+ for arg
+ do
+ case $arg in
+ -all-static | -static)
+ if test "X$arg" = "X-all-static"; then
+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ fi
+ if test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ else
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ fi
+ build_libtool_libs=no
+ build_old_libs=yes
+ prefer_static_libs=yes
+ break
+ ;;
+ esac
+ done
+
+ # See if our shared archives depend on static archives.
+ test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+ # Go through the arguments, transforming them on the way.
+ while test "$#" -gt 0; do
+ arg="$1"
+ shift
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
+ ;;
+ *) qarg=$arg ;;
+ esac
+ libtool_args="$libtool_args $qarg"
+
+ # If the previous option needs an argument, assign it.
+ if test -n "$prev"; then
+ case $prev in
+ output)
+ compile_command="$compile_command @OUTPUT@"
+ finalize_command="$finalize_command @OUTPUT@"
+ ;;
+ esac
+
+ case $prev in
+ dlfiles|dlprefiles)
+ if test "$preload" = no; then
+ # Add the symbol object into the linking commands.
+ compile_command="$compile_command @SYMFILE@"
+ finalize_command="$finalize_command @SYMFILE@"
+ preload=yes
+ fi
+ case $arg in
+ *.la | *.lo) ;; # We handle these cases below.
+ force)
+ if test "$dlself" = no; then
+ dlself=needless
+ export_dynamic=yes
+ fi
+ prev=
+ continue
+ ;;
+ self)
+ if test "$prev" = dlprefiles; then
+ dlself=yes
+ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ dlself=yes
+ else
+ dlself=needless
+ export_dynamic=yes
+ fi
+ prev=
+ continue
+ ;;
+ *)
+ if test "$prev" = dlfiles; then
+ dlfiles="$dlfiles $arg"
+ else
+ dlprefiles="$dlprefiles $arg"
+ fi
+ prev=
+ continue
+ ;;
+ esac
+ ;;
+ expsyms)
+ export_symbols="$arg"
+ if test ! -f "$arg"; then
+ $echo "$modename: symbol file \`$arg' does not exist"
+ exit $EXIT_FAILURE
+ fi
+ prev=
+ continue
+ ;;
+ expsyms_regex)
+ export_symbols_regex="$arg"
+ prev=
+ continue
+ ;;
+ inst_prefix)
+ inst_prefix_dir="$arg"
+ prev=
+ continue
+ ;;
+ precious_regex)
+ precious_files_regex="$arg"
+ prev=
+ continue
+ ;;
+ release)
+ release="-$arg"
+ prev=
+ continue
+ ;;
+ objectlist)
+ if test -f "$arg"; then
+ save_arg=$arg
+ moreargs=
+ for fil in `cat $save_arg`
+ do
+# moreargs="$moreargs $fil"
+ arg=$fil
+ # A libtool-controlled object.
+
+ # Check to see that this really is a libtool object.
+ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ pic_object=
+ non_pic_object=
+
+ # Read the .lo file
+ # If there is no directory component, then add one.
+ case $arg in
+ */* | *\\*) . $arg ;;
+ *) . ./$arg ;;
+ esac
+
+ if test -z "$pic_object" || \
+ test -z "$non_pic_object" ||
+ test "$pic_object" = none && \
+ test "$non_pic_object" = none; then
+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Extract subdirectory from the argument.
+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$arg"; then
+ xdir=
+ else
+ xdir="$xdir/"
+ fi
+
+ if test "$pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+ pic_object="$xdir$pic_object"
+
+ if test "$prev" = dlfiles; then
+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ dlfiles="$dlfiles $pic_object"
+ prev=
+ continue
+ else
+ # If libtool objects are unsupported, then we need to preload.
+ prev=dlprefiles
+ fi
+ fi
+
+ # CHECK ME: I think I busted this. -Ossama
+ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+ dlprefiles="$dlprefiles $pic_object"
+ prev=
+ fi
+
+ # A PIC object.
+ libobjs="$libobjs $pic_object"
+ arg="$pic_object"
+ fi
+
+ # Non-PIC object.
+ if test "$non_pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+ non_pic_object="$xdir$non_pic_object"
+
+ # A standard non-PIC object
+ non_pic_objects="$non_pic_objects $non_pic_object"
+ if test -z "$pic_object" || test "$pic_object" = none ; then
+ arg="$non_pic_object"
+ fi
+ fi
+ else
+ # Only an error if not doing a dry-run.
+ if test -z "$run"; then
+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+ exit $EXIT_FAILURE
+ else
+ # Dry-run case.
+
+ # Extract subdirectory from the argument.
+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$arg"; then
+ xdir=
+ else
+ xdir="$xdir/"
+ fi
+
+ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+ libobjs="$libobjs $pic_object"
+ non_pic_objects="$non_pic_objects $non_pic_object"
+ fi
+ fi
+ done
+ else
+ $echo "$modename: link input file \`$save_arg' does not exist"
+ exit $EXIT_FAILURE
+ fi
+ arg=$save_arg
+ prev=
+ continue
+ ;;
+ rpath | xrpath)
+ # We need an absolute path.
+ case $arg in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+ if test "$prev" = rpath; then
+ case "$rpath " in
+ *" $arg "*) ;;
+ *) rpath="$rpath $arg" ;;
+ esac
+ else
+ case "$xrpath " in
+ *" $arg "*) ;;
+ *) xrpath="$xrpath $arg" ;;
+ esac
+ fi
+ prev=
+ continue
+ ;;
+ xcompiler)
+ compiler_flags="$compiler_flags $qarg"
+ prev=
+ compile_command="$compile_command $qarg"
+ finalize_command="$finalize_command $qarg"
+ continue
+ ;;
+ xlinker)
+ linker_flags="$linker_flags $qarg"
+ compiler_flags="$compiler_flags $wl$qarg"
+ prev=
+ compile_command="$compile_command $wl$qarg"
+ finalize_command="$finalize_command $wl$qarg"
+ continue
+ ;;
+ xcclinker)
+ linker_flags="$linker_flags $qarg"
+ compiler_flags="$compiler_flags $qarg"
+ prev=
+ compile_command="$compile_command $qarg"
+ finalize_command="$finalize_command $qarg"
+ continue
+ ;;
+ shrext)
+ shrext_cmds="$arg"
+ prev=
+ continue
+ ;;
+ *)
+ eval "$prev=\"\$arg\""
+ prev=
+ continue
+ ;;
+ esac
+ fi # test -n "$prev"
+
+ prevarg="$arg"
+
+ case $arg in
+ -all-static)
+ if test -n "$link_static_flag"; then
+ compile_command="$compile_command $link_static_flag"
+ finalize_command="$finalize_command $link_static_flag"
+ fi
+ continue
+ ;;
+
+ -allow-undefined)
+ # FIXME: remove this flag sometime in the future.
+ $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+ continue
+ ;;
+
+ -avoid-version)
+ avoid_version=yes
+ continue
+ ;;
+
+ -dlopen)
+ prev=dlfiles
+ continue
+ ;;
+
+ -dlpreopen)
+ prev=dlprefiles
+ continue
+ ;;
+
+ -export-dynamic)
+ export_dynamic=yes
+ continue
+ ;;
+
+ -export-symbols | -export-symbols-regex)
+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ $echo "$modename: more than one -exported-symbols argument is not allowed"
+ exit $EXIT_FAILURE
+ fi
+ if test "X$arg" = "X-export-symbols"; then
+ prev=expsyms
+ else
+ prev=expsyms_regex
+ fi
+ continue
+ ;;
+
+ -inst-prefix-dir)
+ prev=inst_prefix
+ continue
+ ;;
+
+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+ # so, if we see these flags be careful not to treat them like -L
+ -L[A-Z][A-Z]*:*)
+ case $with_gcc/$host in
+ no/*-*-irix* | /*-*-irix*)
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ ;;
+ esac
+ continue
+ ;;
+
+ -L*)
+ dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+ $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ dir="$absdir"
+ ;;
+ esac
+ case "$deplibs " in
+ *" -L$dir "*) ;;
+ *)
+ deplibs="$deplibs -L$dir"
+ lib_search_path="$lib_search_path $dir"
+ ;;
+ esac
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ case :$dllsearchpath: in
+ *":$dir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$dir";;
+ esac
+ ;;
+ esac
+ continue
+ ;;
+
+ -l*)
+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ case $host in
+ *-*-cygwin* | *-*-pw32* | *-*-beos*)
+ # These systems don't actually have a C or math library (as such)
+ continue
+ ;;
+ *-*-mingw* | *-*-os2*)
+ # These systems don't actually have a C library (as such)
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-openbsd* | *-*-freebsd*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C and math libraries are in the System framework
+ deplibs="$deplibs -framework System"
+ continue
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+ *-*-openbsd* | *-*-freebsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
+ fi
+ deplibs="$deplibs $arg"
+ continue
+ ;;
+
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ deplibs="$deplibs $arg"
+ continue
+ ;;
+
+ -module)
+ module=yes
+ continue
+ ;;
+
+ # gcc -m* arguments should be passed to the linker via $compiler_flags
+ # in order to pass architecture information to the linker
+ # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo
+ # but this is not reliable with gcc because gcc may use -mfoo to
+ # select a different linker, different libraries, etc, while
+ # -Wl,-mfoo simply passes -mfoo to the linker.
+ -m*)
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ if test "$with_gcc" = "yes" ; then
+ compiler_flags="$compiler_flags $arg"
+ fi
+ continue
+ ;;
+
+ -shrext)
+ prev=shrext
+ continue
+ ;;
+
+ -no-fast-install)
+ fast_install=no
+ continue
+ ;;
+
+ -no-install)
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ # The PATH hackery in wrapper scripts is required on Windows
+ # in order for the loader to find any dlls it needs.
+ $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ fast_install=no
+ ;;
+ *) no_install=yes ;;
+ esac
+ continue
+ ;;
+
+ -no-undefined)
+ allow_undefined=no
+ continue
+ ;;
+
+ -objectlist)
+ prev=objectlist
+ continue
+ ;;
+
+ -o) prev=output ;;
+
+ -precious-files-regex)
+ prev=precious_regex
+ continue
+ ;;
+
+ -release)
+ prev=release
+ continue
+ ;;
+
+ -rpath)
+ prev=rpath
+ continue
+ ;;
+
+ -R)
+ prev=xrpath
+ continue
+ ;;
+
+ -R*)
+ dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+ case "$xrpath " in
+ *" $dir "*) ;;
+ *) xrpath="$xrpath $dir" ;;
+ esac
+ continue
+ ;;
+
+ -static)
+ # The effects of -static are defined in a previous loop.
+ # We used to do the same as -all-static on platforms that
+ # didn't have a PIC flag, but the assumption that the effects
+ # would be equivalent was wrong. It would break on at least
+ # Digital Unix and AIX.
+ continue
+ ;;
+
+ -thread-safe)
+ thread_safe=yes
+ continue
+ ;;
+
+ -version-info)
+ prev=vinfo
+ continue
+ ;;
+ -version-number)
+ prev=vinfo
+ vinfo_number=yes
+ continue
+ ;;
+
+ -Wc,*)
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+ arg=
+ save_ifs="$IFS"; IFS=','
+ for flag in $args; do
+ IFS="$save_ifs"
+ case $flag in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ flag="\"$flag\""
+ ;;
+ esac
+ arg="$arg $wl$flag"
+ compiler_flags="$compiler_flags $flag"
+ done
+ IFS="$save_ifs"
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ ;;
+
+ -Wl,*)
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ arg=
+ save_ifs="$IFS"; IFS=','
+ for flag in $args; do
+ IFS="$save_ifs"
+ case $flag in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ flag="\"$flag\""
+ ;;
+ esac
+ arg="$arg $wl$flag"
+ compiler_flags="$compiler_flags $wl$flag"
+ linker_flags="$linker_flags $flag"
+ done
+ IFS="$save_ifs"
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ ;;
+
+ -Xcompiler)
+ prev=xcompiler
+ continue
+ ;;
+
+ -Xlinker)
+ prev=xlinker
+ continue
+ ;;
+
+ -XCClinker)
+ prev=xcclinker
+ continue
+ ;;
+
+ # Some other compiler flag.
+ -* | +*)
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+ ;;
+
+ *.$objext)
+ # A standard object.
+ objs="$objs $arg"
+ ;;
+
+ *.lo)
+ # A libtool-controlled object.
+
+ # Check to see that this really is a libtool object.
+ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ pic_object=
+ non_pic_object=
+
+ # Read the .lo file
+ # If there is no directory component, then add one.
+ case $arg in
+ */* | *\\*) . $arg ;;
+ *) . ./$arg ;;
+ esac
+
+ if test -z "$pic_object" || \
+ test -z "$non_pic_object" ||
+ test "$pic_object" = none && \
+ test "$non_pic_object" = none; then
+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Extract subdirectory from the argument.
+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$arg"; then
+ xdir=
+ else
+ xdir="$xdir/"
+ fi
+
+ if test "$pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+ pic_object="$xdir$pic_object"
+
+ if test "$prev" = dlfiles; then
+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ dlfiles="$dlfiles $pic_object"
+ prev=
+ continue
+ else
+ # If libtool objects are unsupported, then we need to preload.
+ prev=dlprefiles
+ fi
+ fi
+
+ # CHECK ME: I think I busted this. -Ossama
+ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+ dlprefiles="$dlprefiles $pic_object"
+ prev=
+ fi
+
+ # A PIC object.
+ libobjs="$libobjs $pic_object"
+ arg="$pic_object"
+ fi
+
+ # Non-PIC object.
+ if test "$non_pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+ non_pic_object="$xdir$non_pic_object"
+
+ # A standard non-PIC object
+ non_pic_objects="$non_pic_objects $non_pic_object"
+ if test -z "$pic_object" || test "$pic_object" = none ; then
+ arg="$non_pic_object"
+ fi
+ fi
+ else
+ # Only an error if not doing a dry-run.
+ if test -z "$run"; then
+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+ exit $EXIT_FAILURE
+ else
+ # Dry-run case.
+
+ # Extract subdirectory from the argument.
+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$arg"; then
+ xdir=
+ else
+ xdir="$xdir/"
+ fi
+
+ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+ libobjs="$libobjs $pic_object"
+ non_pic_objects="$non_pic_objects $non_pic_object"
+ fi
+ fi
+ ;;
+
+ *.$libext)
+ # An archive.
+ deplibs="$deplibs $arg"
+ old_deplibs="$old_deplibs $arg"
+ continue
+ ;;
+
+ *.la)
+ # A libtool-controlled library.
+
+ if test "$prev" = dlfiles; then
+ # This library was specified with -dlopen.
+ dlfiles="$dlfiles $arg"
+ prev=
+ elif test "$prev" = dlprefiles; then
+ # The library was specified with -dlpreopen.
+ dlprefiles="$dlprefiles $arg"
+ prev=
+ else
+ deplibs="$deplibs $arg"
+ fi
+ continue
+ ;;
+
+ # Some other compiler argument.
+ *)
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+ ;;
+ esac # arg
+
+ # Now actually substitute the argument into the commands.
+ if test -n "$arg"; then
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ fi
+ done # argument parsing loop
+
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+ eval arg=\"$export_dynamic_flag_spec\"
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ fi
+
+ oldlibs=
+ # calculate the name of the file, without its directory
+ outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+ libobjs_save="$libobjs"
+
+ if test -n "$shlibpath_var"; then
+ # get the directories listed in $shlibpath_var
+ eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+ else
+ shlib_search_path=
+ fi
+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+ output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$output_objdir" = "X$output"; then
+ output_objdir="$objdir"
+ else
+ output_objdir="$output_objdir/$objdir"
+ fi
+ # Create the object directory.
+ if test ! -d "$output_objdir"; then
+ $show "$mkdir $output_objdir"
+ $run $mkdir $output_objdir
+ status=$?
+ if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+ exit $status
+ fi
+ fi
+
+ # Determine the type of output
+ case $output in
+ "")
+ $echo "$modename: you must specify an output file" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ *.$libext) linkmode=oldlib ;;
+ *.lo | *.$objext) linkmode=obj ;;
+ *.la) linkmode=lib ;;
+ *) linkmode=prog ;; # Anything else should be a program.
+ esac
+
+ case $host in
+ *cygwin* | *mingw* | *pw32*)
+ # don't eliminate duplications in $postdeps and $predeps
+ duplicate_compiler_generated_deps=yes
+ ;;
+ *)
+ duplicate_compiler_generated_deps=$duplicate_deps
+ ;;
+ esac
+ specialdeplibs=
+
+ libs=
+ # Find all interdependent deplibs by searching for libraries
+ # that are linked more than once (e.g. -la -lb -la)
+ for deplib in $deplibs; do
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ libs="$libs $deplib"
+ done
+
+ if test "$linkmode" = lib; then
+ libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+ # Compute libraries that are listed more than once in $predeps
+ # $postdeps and mark them as special (i.e., whose duplicates are
+ # not to be eliminated).
+ pre_post_deps=
+ if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+ for pre_post_dep in $predeps $postdeps; do
+ case "$pre_post_deps " in
+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+ esac
+ pre_post_deps="$pre_post_deps $pre_post_dep"
+ done
+ fi
+ pre_post_deps=
+ fi
+
+ deplibs=
+ newdependency_libs=
+ newlib_search_path=
+ need_relink=no # whether we're linking any uninstalled libtool libraries
+ notinst_deplibs= # not-installed libtool libraries
+ notinst_path= # paths that contain not-installed libtool libraries
+ case $linkmode in
+ lib)
+ passes="conv link"
+ for file in $dlfiles $dlprefiles; do
+ case $file in
+ *.la) ;;
+ *)
+ $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+ ;;
+ prog)
+ compile_deplibs=
+ finalize_deplibs=
+ alldeplibs=no
+ newdlfiles=
+ newdlprefiles=
+ passes="conv scan dlopen dlpreopen link"
+ ;;
+ *) passes="conv"
+ ;;
+ esac
+ for pass in $passes; do
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan"; then
+ libs="$deplibs"
+ deplibs=
+ fi
+ if test "$linkmode" = prog; then
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
+ esac
+ fi
+ if test "$pass" = dlopen; then
+ # Collect dlpreopened libraries
+ save_deplibs="$deplibs"
+ deplibs=
+ fi
+ for deplib in $libs; do
+ lib=
+ found=no
+ case $deplib in
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ fi
+ continue
+ ;;
+ -l*)
+ if test "$linkmode" != lib && test "$linkmode" != prog; then
+ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ continue
+ fi
+ name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+ for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ for search_ext in .la $std_shrext .so .a; do
+ # Search the libtool library
+ lib="$searchdir/lib${name}${search_ext}"
+ if test -f "$lib"; then
+ if test "$search_ext" = ".la"; then
+ found=yes
+ else
+ found=no
+ fi
+ break 2
+ fi
+ done
+ done
+ if test "$found" != yes; then
+ # deplib doesn't seem to be a libtool library
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
+ else # deplib is a libtool library
+ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+ # We need to do some special things here, and not later.
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $deplib "*)
+ if (${SED} -e '2q' $lib |
+ grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ library_names=
+ old_library=
+ case $lib in
+ */* | *\\*) . $lib ;;
+ *) . ./$lib ;;
+ esac
+ for l in $old_library $library_names; do
+ ll="$l"
+ done
+ if test "X$ll" = "X$old_library" ; then # only static version available
+ found=no
+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$ladir" = "X$lib" && ladir="."
+ lib=$ladir/$old_library
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
+ fi
+ fi
+ ;;
+ *) ;;
+ esac
+ fi
+ fi
+ ;; # -l
+ -L*)
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+ test "$pass" = conv && continue
+ newdependency_libs="$deplib $newdependency_libs"
+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ ;;
+ prog)
+ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ continue
+ fi
+ if test "$pass" = scan; then
+ deplibs="$deplib $deplibs"
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ ;;
+ *)
+ $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+ ;;
+ esac # linkmode
+ continue
+ ;; # -L
+ -R*)
+ if test "$pass" = link; then
+ dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+ # Make sure the xrpath contains only unique directories.
+ case "$xrpath " in
+ *" $dir "*) ;;
+ *) xrpath="$xrpath $dir" ;;
+ esac
+ fi
+ deplibs="$deplib $deplibs"
+ continue
+ ;;
+ *.la) lib="$deplib" ;;
+ *.$libext)
+ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ continue
+ fi
+ case $linkmode in
+ lib)
+ if test "$deplibs_check_method" != pass_all; then
+ $echo
+ $echo "*** Warning: Trying to link with static lib archive $deplib."
+ $echo "*** I have the capability to make that library automatically link in when"
+ $echo "*** you link to this library. But I can only do this if you have a"
+ $echo "*** shared version of the library, which you do not appear to have"
+ $echo "*** because the file extensions .$libext of this argument makes me believe"
+ $echo "*** that it is just a static archive that I should not used here."
+ else
+ $echo
+ $echo "*** Warning: Linking the shared library $output against the"
+ $echo "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+ fi
+ continue
+ ;;
+ prog)
+ if test "$pass" != link; then
+ deplibs="$deplib $deplibs"
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
+ continue
+ ;;
+ esac # linkmode
+ ;; # *.$libext
+ *.lo | *.$objext)
+ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ elif test "$linkmode" = prog; then
+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ # If there is no dlopen support or we're linking statically,
+ # we need to preload.
+ newdlprefiles="$newdlprefiles $deplib"
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ newdlfiles="$newdlfiles $deplib"
+ fi
+ fi
+ continue
+ ;;
+ %DEPLIBS%)
+ alldeplibs=yes
+ continue
+ ;;
+ esac # case $deplib
+ if test "$found" = yes || test -f "$lib"; then :
+ else
+ $echo "$modename: cannot find the library \`$lib'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Check to see that this really is a libtool archive.
+ if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$ladir" = "X$lib" && ladir="."
+
+ dlname=
+ dlopen=
+ dlpreopen=
+ libdir=
+ library_names=
+ old_library=
+ # If the library was installed with an old release of libtool,
+ # it will not redefine variables installed, or shouldnotlink
+ installed=yes
+ shouldnotlink=no
+
+ # Read the .la file
+ case $lib in
+ */* | *\\*) . $lib ;;
+ *) . ./$lib ;;
+ esac
+
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan" ||
+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ fi
+
+ if test "$pass" = conv; then
+ # Only check for convenience libraries
+ deplibs="$lib $deplibs"
+ if test -z "$libdir"; then
+ if test -z "$old_library"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ $echo "$modename: \`$lib' is not a convenience library" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ continue
+ fi # $pass = conv
+
+
+ # Get the name of the library we link against.
+ linklib=
+ for l in $old_library $library_names; do
+ linklib="$l"
+ done
+ if test -z "$linklib"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # This library was specified with -dlopen.
+ if test "$pass" = dlopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ if test -z "$dlname" ||
+ test "$dlopen_support" != yes ||
+ test "$build_libtool_libs" = no; then
+ # If there is no dlname, no dlopen support or we're linking
+ # statically, we need to preload. We also need to preload any
+ # dependent libraries so libltdl's deplib preloader doesn't
+ # bomb out in the load deplibs phase.
+ dlprefiles="$dlprefiles $lib $dependency_libs"
+ else
+ newdlfiles="$newdlfiles $lib"
+ fi
+ continue
+ fi # $pass = dlopen
+
+ # We need an absolute path.
+ case $ladir in
+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ *)
+ abs_ladir=`cd "$ladir" && pwd`
+ if test -z "$abs_ladir"; then
+ $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
+ $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+ abs_ladir="$ladir"
+ fi
+ ;;
+ esac
+ laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+
+ # Find the relevant object directory and library name.
+ if test "X$installed" = Xyes; then
+ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ $echo "$modename: warning: library \`$lib' was moved." 1>&2
+ dir="$ladir"
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ else
+ dir="$libdir"
+ absdir="$libdir"
+ fi
+ else
+ dir="$ladir/$objdir"
+ absdir="$abs_ladir/$objdir"
+ # Remove this search path later
+ notinst_path="$notinst_path $abs_ladir"
+ fi # $installed = yes
+ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+ # This library was specified with -dlpreopen.
+ if test "$pass" = dlpreopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+ if test -n "$old_library"; then
+ newdlprefiles="$newdlprefiles $dir/$old_library"
+ # Otherwise, use the dlname, so that lt_dlopen finds it.
+ elif test -n "$dlname"; then
+ newdlprefiles="$newdlprefiles $dir/$dlname"
+ else
+ newdlprefiles="$newdlprefiles $dir/$linklib"
+ fi
+ fi # $pass = dlpreopen
+
+ if test -z "$libdir"; then
+ # Link the convenience library
+ if test "$linkmode" = lib; then
+ deplibs="$dir/$old_library $deplibs"
+ elif test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$dir/$old_library $compile_deplibs"
+ finalize_deplibs="$dir/$old_library $finalize_deplibs"
+ else
+ deplibs="$lib $deplibs" # used for prog,scan pass
+ fi
+ continue
+ fi
+
+
+ if test "$linkmode" = prog && test "$pass" != link; then
+ newlib_search_path="$newlib_search_path $ladir"
+ deplibs="$lib $deplibs"
+
+ linkalldeplibs=no
+ if test "$link_all_deplibs" != no || test -z "$library_names" ||
+ test "$build_libtool_libs" = no; then
+ linkalldeplibs=yes
+ fi
+
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ case $deplib in
+ -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+ esac
+ # Need to link against all dependency_libs?
+ if test "$linkalldeplibs" = yes; then
+ deplibs="$deplib $deplibs"
+ else
+ # Need to hardcode shared library paths
+ # or/and link against static libraries
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done # for deplib
+ continue
+ fi # $linkmode = prog...
+
+ if test "$linkmode,$pass" = "prog,link"; then
+ if test -n "$library_names" &&
+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ # We need to hardcode the library path
+ if test -n "$shlibpath_var"; then
+ # Make sure the rpath contains only unique directories.
+ case "$temp_rpath " in
+ *" $dir "*) ;;
+ *" $absdir "*) ;;
+ *) temp_rpath="$temp_rpath $dir" ;;
+ esac
+ fi
+
+ # Hardcode the library path.
+ # Skip directories that are in the system default run-time
+ # search path.
+ case " $sys_lib_dlsearch_path " in
+ *" $absdir "*) ;;
+ *)
+ case "$compile_rpath " in
+ *" $absdir "*) ;;
+ *) compile_rpath="$compile_rpath $absdir"
+ esac
+ ;;
+ esac
+ case " $sys_lib_dlsearch_path " in
+ *" $libdir "*) ;;
+ *)
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_rpath="$finalize_rpath $libdir"
+ esac
+ ;;
+ esac
+ fi # $linkmode,$pass = prog,link...
+
+ if test "$alldeplibs" = yes &&
+ { test "$deplibs_check_method" = pass_all ||
+ { test "$build_libtool_libs" = yes &&
+ test -n "$library_names"; }; }; then
+ # We only need to search for static libraries
+ continue
+ fi
+ fi
+
+ link_static=no # Whether the deplib will be linked statically
+ if test -n "$library_names" &&
+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+ need_relink=yes
+ fi
+ # This is a shared library
+
+ # Warn about portability, can't link against -module's on
+ # some systems (darwin)
+ if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ $echo
+ if test "$linkmode" = prog; then
+ $echo "*** Warning: Linking the executable $output against the loadable module"
+ else
+ $echo "*** Warning: Linking the shared library $output against the loadable module"
+ fi
+ $echo "*** $linklib is not portable!"
+ fi
+ if test "$linkmode" = lib &&
+ test "$hardcode_into_libs" = yes; then
+ # Hardcode the library path.
+ # Skip directories that are in the system default run-time
+ # search path.
+ case " $sys_lib_dlsearch_path " in
+ *" $absdir "*) ;;
+ *)
+ case "$compile_rpath " in
+ *" $absdir "*) ;;
+ *) compile_rpath="$compile_rpath $absdir"
+ esac
+ ;;
+ esac
+ case " $sys_lib_dlsearch_path " in
+ *" $libdir "*) ;;
+ *)
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_rpath="$finalize_rpath $libdir"
+ esac
+ ;;
+ esac
+ fi
+
+ if test -n "$old_archive_from_expsyms_cmds"; then
+ # figure out the soname
+ set dummy $library_names
+ realname="$2"
+ shift; shift
+ libname=`eval \\$echo \"$libname_spec\"`
+ # use dlname if we got it. it's perfectly good, no?
+ if test -n "$dlname"; then
+ soname="$dlname"
+ elif test -n "$soname_spec"; then
+ # bleh windows
+ case $host in
+ *cygwin* | mingw*)
+ major=`expr $current - $age`
+ versuffix="-$major"
+ ;;
+ esac
+ eval soname=\"$soname_spec\"
+ else
+ soname="$realname"
+ fi
+
+ # Make a new name for the extract_expsyms_cmds to use
+ soroot="$soname"
+ soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
+ newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+
+ # If the library has no export list, then create one now
+ if test -f "$output_objdir/$soname-def"; then :
+ else
+ $show "extracting exported symbol list from \`$soname'"
+ save_ifs="$IFS"; IFS='~'
+ cmds=$extract_expsyms_cmds
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ fi
+
+ # Create $newlib
+ if test -f "$output_objdir/$newlib"; then :; else
+ $show "generating import library for \`$soname'"
+ save_ifs="$IFS"; IFS='~'
+ cmds=$old_archive_from_expsyms_cmds
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ fi
+ # make sure the library variables are pointing to the new library
+ dir=$output_objdir
+ linklib=$newlib
+ fi # test -n "$old_archive_from_expsyms_cmds"
+
+ if test "$linkmode" = prog || test "$mode" != relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+ lib_linked=yes
+ case $hardcode_action in
+ immediate | unsupported)
+ if test "$hardcode_direct" = no; then
+ add="$dir/$linklib"
+ case $host in
+ *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+ *-*-darwin* )
+ # if the lib is a module then we can not link against
+ # it, someone is ignoring the new warnings I added
+ if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
+ $echo "** Warning, lib $linklib is a module, not a shared library"
+ if test -z "$old_library" ; then
+ $echo
+ $echo "** And there doesn't seem to be a static archive available"
+ $echo "** The link will probably fail, sorry"
+ else
+ add="$dir/$old_library"
+ fi
+ fi
+ esac
+ elif test "$hardcode_minus_L" = no; then
+ case $host in
+ *-*-sunos*) add_shlibpath="$dir" ;;
+ esac
+ add_dir="-L$dir"
+ add="-l$name"
+ elif test "$hardcode_shlibpath_var" = no; then
+ add_shlibpath="$dir"
+ add="-l$name"
+ else
+ lib_linked=no
+ fi
+ ;;
+ relink)
+ if test "$hardcode_direct" = yes; then
+ add="$dir/$linklib"
+ elif test "$hardcode_minus_L" = yes; then
+ add_dir="-L$dir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+ case "$libdir" in
+ [\\/]*)
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+ add="-l$name"
+ elif test "$hardcode_shlibpath_var" = yes; then
+ add_shlibpath="$dir"
+ add="-l$name"
+ else
+ lib_linked=no
+ fi
+ ;;
+ *) lib_linked=no ;;
+ esac
+
+ if test "$lib_linked" != yes; then
+ $echo "$modename: configuration error: unsupported hardcode properties"
+ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$add_shlibpath"; then
+ case :$compile_shlibpath: in
+ *":$add_shlibpath:"*) ;;
+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ esac
+ fi
+ if test "$linkmode" = prog; then
+ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+ test -n "$add" && compile_deplibs="$add $compile_deplibs"
+ else
+ test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ test -n "$add" && deplibs="$add $deplibs"
+ if test "$hardcode_direct" != yes && \
+ test "$hardcode_minus_L" != yes && \
+ test "$hardcode_shlibpath_var" = yes; then
+ case :$finalize_shlibpath: in
+ *":$libdir:"*) ;;
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ esac
+ fi
+ fi
+ fi
+
+ if test "$linkmode" = prog || test "$mode" = relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+ # Finalize command for both is simple: just hardcode it.
+ if test "$hardcode_direct" = yes; then
+ add="$libdir/$linklib"
+ elif test "$hardcode_minus_L" = yes; then
+ add_dir="-L$libdir"
+ add="-l$name"
+ elif test "$hardcode_shlibpath_var" = yes; then
+ case :$finalize_shlibpath: in
+ *":$libdir:"*) ;;
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ esac
+ add="-l$name"
+ elif test "$hardcode_automatic" = yes; then
+ if test -n "$inst_prefix_dir" &&
+ test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ add="$inst_prefix_dir$libdir/$linklib"
+ else
+ add="$libdir/$linklib"
+ fi
+ else
+ # We cannot seem to hardcode it, guess we'll fake it.
+ add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+ case "$libdir" in
+ [\\/]*)
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+ add="-l$name"
+ fi
+
+ if test "$linkmode" = prog; then
+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ else
+ test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ test -n "$add" && deplibs="$add $deplibs"
+ fi
+ fi
+ elif test "$linkmode" = prog; then
+ # Here we assume that one of hardcode_direct or hardcode_minus_L
+ # is not unsupported. This is valid on all known static and
+ # shared platforms.
+ if test "$hardcode_direct" != unsupported; then
+ test -n "$old_library" && linklib="$old_library"
+ compile_deplibs="$dir/$linklib $compile_deplibs"
+ finalize_deplibs="$dir/$linklib $finalize_deplibs"
+ else
+ compile_deplibs="-l$name -L$dir $compile_deplibs"
+ finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+ fi
+ elif test "$build_libtool_libs" = yes; then
+ # Not a shared library
+ if test "$deplibs_check_method" != pass_all; then
+ # We're trying link a shared library against a static one
+ # but the system doesn't support it.
+
+ # Just print a warning and add the library to dependency_libs so
+ # that the program can be linked against the static library.
+ $echo
+ $echo "*** Warning: This system can not link to static lib archive $lib."
+ $echo "*** I have the capability to make that library automatically link in when"
+ $echo "*** you link to this library. But I can only do this if you have a"
+ $echo "*** shared version of the library, which you do not appear to have."
+ if test "$module" = yes; then
+ $echo "*** But as you try to build a module library, libtool will still create "
+ $echo "*** a static module, that should work as long as the dlopening application"
+ $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ if test -z "$global_symbol_pipe"; then
+ $echo
+ $echo "*** However, this would only work if libtool was able to extract symbol"
+ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ $echo "*** not find such a program. So, this module is probably useless."
+ $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+ if test "$build_old_libs" = no; then
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+ build_libtool_libs=no
+ fi
+ fi
+ else
+ convenience="$convenience $dir/$old_library"
+ old_convenience="$old_convenience $dir/$old_library"
+ deplibs="$dir/$old_library $deplibs"
+ link_static=yes
+ fi
+ fi # link shared/static library?
+
+ if test "$linkmode" = lib; then
+ if test -n "$dependency_libs" &&
+ { test "$hardcode_into_libs" != yes ||
+ test "$build_old_libs" = yes ||
+ test "$link_static" = yes; }; then
+ # Extract -R from dependency_libs
+ temp_deplibs=
+ for libdir in $dependency_libs; do
+ case $libdir in
+ -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+ case " $xrpath " in
+ *" $temp_xrpath "*) ;;
+ *) xrpath="$xrpath $temp_xrpath";;
+ esac;;
+ *) temp_deplibs="$temp_deplibs $libdir";;
+ esac
+ done
+ dependency_libs="$temp_deplibs"
+ fi
+
+ newlib_search_path="$newlib_search_path $absdir"
+ # Link against this library
+ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ # ... and its dependency_libs
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ newdependency_libs="$deplib $newdependency_libs"
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
+
+ if test "$link_all_deplibs" != no; then
+ # Add the search paths of all dependency libraries
+ for deplib in $dependency_libs; do
+ case $deplib in
+ -L*) path="$deplib" ;;
+ *.la)
+ dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$dir" = "X$deplib" && dir="."
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ *)
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+ $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+ absdir="$dir"
+ fi
+ ;;
+ esac
+ if grep "^installed=no" $deplib > /dev/null; then
+ path="$absdir/$objdir"
+ else
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ if test "$absdir" != "$libdir"; then
+ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ fi
+ path="$absdir"
+ fi
+ depdepl=
+ case $host in
+ *-*-darwin*)
+ # we do not want to link against static libs,
+ # but need to link against shared
+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names" ; then
+ for tmp in $deplibrary_names ; do
+ depdepl=$tmp
+ done
+ if test -f "$path/$depdepl" ; then
+ depdepl="$path/$depdepl"
+ fi
+ # do not add paths which are already there
+ case " $newlib_search_path " in
+ *" $path "*) ;;
+ *) newlib_search_path="$newlib_search_path $path";;
+ esac
+ fi
+ path=""
+ ;;
+ *)
+ path="-L$path"
+ ;;
+ esac
+ ;;
+ -l*)
+ case $host in
+ *-*-darwin*)
+ # Again, we only want to link against shared libraries
+ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+ for tmp in $newlib_search_path ; do
+ if test -f "$tmp/lib$tmp_libs.dylib" ; then
+ eval depdepl="$tmp/lib$tmp_libs.dylib"
+ break
+ fi
+ done
+ path=""
+ ;;
+ *) continue ;;
+ esac
+ ;;
+ *) continue ;;
+ esac
+ case " $deplibs " in
+ *" $depdepl "*) ;;
+ *) deplibs="$depdepl $deplibs" ;;
+ esac
+ case " $deplibs " in
+ *" $path "*) ;;
+ *) deplibs="$deplibs $path" ;;
+ esac
+ done
+ fi # link_all_deplibs != no
+ fi # linkmode = lib
+ done # for deplib in $libs
+ dependency_libs="$newdependency_libs"
+ if test "$pass" = dlpreopen; then
+ # Link the dlpreopened libraries before other libraries
+ for deplib in $save_deplibs; do
+ deplibs="$deplib $deplibs"
+ done
+ fi
+ if test "$pass" != dlopen; then
+ if test "$pass" != conv; then
+ # Make sure lib_search_path contains only unique directories.
+ lib_search_path=
+ for dir in $newlib_search_path; do
+ case "$lib_search_path " in
+ *" $dir "*) ;;
+ *) lib_search_path="$lib_search_path $dir" ;;
+ esac
+ done
+ newlib_search_path=
+ fi
+
+ if test "$linkmode,$pass" != "prog,link"; then
+ vars="deplibs"
+ else
+ vars="compile_deplibs finalize_deplibs"
+ fi
+ for var in $vars dependency_libs; do
+ # Add libraries to $var in reverse order
+ eval tmp_libs=\"\$$var\"
+ new_libs=
+ for deplib in $tmp_libs; do
+ # FIXME: Pedantically, this is the right thing to do, so
+ # that some nasty dependency loop isn't accidentally
+ # broken:
+ #new_libs="$deplib $new_libs"
+ # Pragmatically, this seems to cause very few problems in
+ # practice:
+ case $deplib in
+ -L*) new_libs="$deplib $new_libs" ;;
+ -R*) ;;
+ *)
+ # And here is the reason: when a library appears more
+ # than once as an explicit dependence of a library, or
+ # is implicitly linked in more than once by the
+ # compiler, it is considered special, and multiple
+ # occurrences thereof are not removed. Compare this
+ # with having the same library being listed as a
+ # dependency of multiple other libraries: in this case,
+ # we know (pedantically, we assume) the library does not
+ # need to be listed more than once, so we keep only the
+ # last copy. This is not always right, but it is rare
+ # enough that we require users that really mean to play
+ # such unportable linking tricks to link the library
+ # using -Wl,-lname, so that libtool does not consider it
+ # for duplicate removal.
+ case " $specialdeplibs " in
+ *" $deplib "*) new_libs="$deplib $new_libs" ;;
+ *)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+ *) new_libs="$deplib $new_libs" ;;
+ esac
+ ;;
+ esac
+ ;;
+ esac
+ done
+ tmp_libs=
+ for deplib in $new_libs; do
+ case $deplib in
+ -L*)
+ case " $tmp_libs " in
+ *" $deplib "*) ;;
+ *) tmp_libs="$tmp_libs $deplib" ;;
+ esac
+ ;;
+ *) tmp_libs="$tmp_libs $deplib" ;;
+ esac
+ done
+ eval $var=\"$tmp_libs\"
+ done # for var
+ fi
+ # Last step: remove runtime libs from dependency_libs
+ # (they stay in deplibs)
+ tmp_libs=
+ for i in $dependency_libs ; do
+ case " $predeps $postdeps $compiler_lib_search_path " in
+ *" $i "*)
+ i=""
+ ;;
+ esac
+ if test -n "$i" ; then
+ tmp_libs="$tmp_libs $i"
+ fi
+ done
+ dependency_libs=$tmp_libs
+ done # for pass
+ if test "$linkmode" = prog; then
+ dlfiles="$newdlfiles"
+ dlprefiles="$newdlprefiles"
+ fi
+
+ case $linkmode in
+ oldlib)
+ if test -n "$deplibs"; then
+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+ fi
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$rpath"; then
+ $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$xrpath"; then
+ $echo "$modename: warning: \`-R' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$release"; then
+ $echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
+ fi
+
+ # Now set the variables for building old libraries.
+ build_libtool_libs=no
+ oldlibs="$output"
+ objs="$objs$old_deplibs"
+ ;;
+
+ lib)
+ # Make sure we only generate libraries of the form `libNAME.la'.
+ case $outputname in
+ lib*)
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ ;;
+ *)
+ if test "$module" = no; then
+ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ if test "$need_lib_prefix" != no; then
+ # Add the "lib" prefix for modules if required
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ else
+ libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+ fi
+ ;;
+ esac
+
+ if test -n "$objs"; then
+ if test "$deplibs_check_method" != pass_all; then
+ $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+ exit $EXIT_FAILURE
+ else
+ $echo
+ $echo "*** Warning: Linking the shared library $output against the non-libtool"
+ $echo "*** objects $objs is not portable!"
+ libobjs="$libobjs $objs"
+ fi
+ fi
+
+ if test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
+ fi
+
+ set dummy $rpath
+ if test "$#" -gt 2; then
+ $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+ fi
+ install_libdir="$2"
+
+ oldlibs=
+ if test -z "$rpath"; then
+ if test "$build_libtool_libs" = yes; then
+ # Building a libtool convenience library.
+ # Some compilers have problems with a `.al' extension so
+ # convenience libraries should have the same extension an
+ # archive normally would.
+ oldlibs="$output_objdir/$libname.$libext $oldlibs"
+ build_libtool_libs=convenience
+ build_old_libs=yes
+ fi
+
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
+ fi
+
+ if test -n "$release"; then
+ $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+ fi
+ else
+
+ # Parse the version information argument.
+ save_ifs="$IFS"; IFS=':'
+ set dummy $vinfo 0 0 0
+ IFS="$save_ifs"
+
+ if test -n "$8"; then
+ $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # convert absolute version numbers to libtool ages
+ # this retains compatibility with .la files and attempts
+ # to make the code below a bit more comprehensible
+
+ case $vinfo_number in
+ yes)
+ number_major="$2"
+ number_minor="$3"
+ number_revision="$4"
+ #
+ # There are really only two kinds -- those that
+ # use the current revision as the major version
+ # and those that subtract age and use age as
+ # a minor version. But, then there is irix
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+ darwin|linux|osf|windows)
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
+ ;;
+ freebsd-aout|freebsd-elf|sunos)
+ current="$number_major"
+ revision="$number_minor"
+ age="0"
+ ;;
+ irix|nonstopux)
+ current=`expr $number_major + $number_minor - 1`
+ age="$number_minor"
+ revision="$number_minor"
+ ;;
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+ ;;
+ no)
+ current="$2"
+ revision="$3"
+ age="$4"
+ ;;
+ esac
+
+ # Check that each of the things are valid numbers.
+ case $current in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+ $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $revision in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+ $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $age in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+ $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test "$age" -gt "$current"; then
+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Calculate the version variables.
+ major=
+ versuffix=
+ verstring=
+ case $version_type in
+ none) ;;
+
+ darwin)
+ # Like Linux, but with the current version available in
+ # verstring for coding it into the library header
+ major=.`expr $current - $age`
+ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ minor_current=`expr $current + 1`
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+
+ freebsd-aout)
+ major=".$current"
+ versuffix=".$current.$revision";
+ ;;
+
+ freebsd-elf)
+ major=".$current"
+ versuffix=".$current";
+ ;;
+
+ irix | nonstopux)
+ major=`expr $current - $age + 1`
+
+ case $version_type in
+ nonstopux) verstring_prefix=nonstopux ;;
+ *) verstring_prefix=sgi ;;
+ esac
+ verstring="$verstring_prefix$major.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$revision
+ while test "$loop" -ne 0; do
+ iface=`expr $revision - $loop`
+ loop=`expr $loop - 1`
+ verstring="$verstring_prefix$major.$iface:$verstring"
+ done
+
+ # Before this point, $major must not contain `.'.
+ major=.$major
+ versuffix="$major.$revision"
+ ;;
+
+ linux)
+ major=.`expr $current - $age`
+ versuffix="$major.$age.$revision"
+ ;;
+
+ osf)
+ major=.`expr $current - $age`
+ versuffix=".$current.$age.$revision"
+ verstring="$current.$age.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$age
+ while test "$loop" -ne 0; do
+ iface=`expr $current - $loop`
+ loop=`expr $loop - 1`
+ verstring="$verstring:${iface}.0"
+ done
+
+ # Make executables depend on our current version.
+ verstring="$verstring:${current}.0"
+ ;;
+
+ sunos)
+ major=".$current"
+ versuffix=".$current.$revision"
+ ;;
+
+ windows)
+ # Use '-' rather than '.', since we only want one
+ # extension on DOS 8.3 filesystems.
+ major=`expr $current - $age`
+ versuffix="-$major"
+ ;;
+
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ # Clear the version info if we defaulted, and they specified a release.
+ if test -z "$vinfo" && test -n "$release"; then
+ major=
+ case $version_type in
+ darwin)
+ # we can't check for "0.0" in archive_cmds due to quoting
+ # problems, so we reset it completely
+ verstring=
+ ;;
+ *)
+ verstring="0.0"
+ ;;
+ esac
+ if test "$need_version" = no; then
+ versuffix=
+ else
+ versuffix=".0.0"
+ fi
+ fi
+
+ # Remove version info from name if versioning should be avoided
+ if test "$avoid_version" = yes && test "$need_version" = no; then
+ major=
+ versuffix=
+ verstring=""
+ fi
+
+ # Check to see if the archive will have undefined symbols.
+ if test "$allow_undefined" = yes; then
+ if test "$allow_undefined_flag" = unsupported; then
+ $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+ build_libtool_libs=no
+ build_old_libs=yes
+ fi
+ else
+ # Don't allow undefined symbols.
+ allow_undefined_flag="$no_undefined_flag"
+ fi
+ fi
+
+ if test "$mode" != relink; then
+ # Remove our outputs, but don't remove object files since they
+ # may have been created when compiling PIC objects.
+ removelist=
+ tempremovelist=`$echo "$output_objdir/*"`
+ for p in $tempremovelist; do
+ case $p in
+ *.$objext)
+ ;;
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+ if test "X$precious_files_regex" != "X"; then
+ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+ then
+ continue
+ fi
+ fi
+ removelist="$removelist $p"
+ ;;
+ *) ;;
+ esac
+ done
+ if test -n "$removelist"; then
+ $show "${rm}r $removelist"
+ $run ${rm}r $removelist
+ fi
+ fi
+
+ # Now set the variables for building old libraries.
+ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+ # Transform .lo files to .o files.
+ oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+ fi
+
+ # Eliminate all temporary directories.
+ for path in $notinst_path; do
+ lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+ deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+ dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+ done
+
+ if test -n "$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+ temp_xrpath=
+ for libdir in $xrpath; do
+ temp_xrpath="$temp_xrpath -R$libdir"
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
+ esac
+ done
+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ dependency_libs="$temp_xrpath $dependency_libs"
+ fi
+ fi
+
+ # Make sure dlfiles contains only unique files that won't be dlpreopened
+ old_dlfiles="$dlfiles"
+ dlfiles=
+ for lib in $old_dlfiles; do
+ case " $dlprefiles $dlfiles " in
+ *" $lib "*) ;;
+ *) dlfiles="$dlfiles $lib" ;;
+ esac
+ done
+
+ # Make sure dlprefiles contains only unique files
+ old_dlprefiles="$dlprefiles"
+ dlprefiles=
+ for lib in $old_dlprefiles; do
+ case "$dlprefiles " in
+ *" $lib "*) ;;
+ *) dlprefiles="$dlprefiles $lib" ;;
+ esac
+ done
+
+ if test "$build_libtool_libs" = yes; then
+ if test -n "$rpath"; then
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+ # these systems don't actually have a c library (as such)!
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C library is in the System framework
+ deplibs="$deplibs -framework System"
+ ;;
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+ ;;
+ *-*-openbsd* | *-*-freebsd*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+ if test "$build_libtool_need_lc" = "yes"; then
+ deplibs="$deplibs -lc"
+ fi
+ ;;
+ esac
+ fi
+
+ # Transform deplibs into only deplibs that can be linked in shared.
+ name_save=$name
+ libname_save=$libname
+ release_save=$release
+ versuffix_save=$versuffix
+ major_save=$major
+ # I'm not sure if I'm treating the release correctly. I think
+ # release should show up in the -l (ie -lgmp5) so we don't want to
+ # add it in twice. Is that correct?
+ release=""
+ versuffix=""
+ major=""
+ newdeplibs=
+ droppeddeps=no
+ case $deplibs_check_method in
+ pass_all)
+ # Don't check for shared/static. Everything works.
+ # This might be a little naive. We might want to check
+ # whether the library exists or not. But this is on
+ # osf3 & osf4 and I'm not really sure... Just
+ # implementing what was already the behavior.
+ newdeplibs=$deplibs
+ ;;
+ test_compile)
+ # This code stresses the "libraries are programs" paradigm to its
+ # limits. Maybe even breaks it. We compile a program, linking it
+ # against the deplibs as a proxy for the library. Then we can check
+ # whether they linked in statically or dynamically with ldd.
+ $rm conftest.c
+ cat > conftest.c <<EOF
+ int main() { return 0; }
+EOF
+ $rm conftest
+ $LTCC -o conftest conftest.c $deplibs
+ if test "$?" -eq 0 ; then
+ ldd_output=`ldd conftest`
+ for i in $deplibs; do
+ name="`expr $i : '-l\(.*\)'`"
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" -ne "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+ newdeplibs="$newdeplibs $i"
+ i=""
+ ;;
+ esac
+ fi
+ if test -n "$i" ; then
+ libname=`eval \\$echo \"$libname_spec\"`
+ deplib_matches=`eval \\$echo \"$library_names_spec\"`
+ set dummy $deplib_matches
+ deplib_match=$2
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ newdeplibs="$newdeplibs $i"
+ else
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning: dynamic linker does not accept needed library $i."
+ $echo "*** I have the capability to make that library automatically link in when"
+ $echo "*** you link to this library. But I can only do this if you have a"
+ $echo "*** shared version of the library, which I believe you do not have"
+ $echo "*** because a test_compile did reveal that the linker did not use it for"
+ $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+ fi
+ fi
+ else
+ newdeplibs="$newdeplibs $i"
+ fi
+ done
+ else
+ # Error occurred in the first compile. Let's try to salvage
+ # the situation: Compile a separate program for each library.
+ for i in $deplibs; do
+ name="`expr $i : '-l\(.*\)'`"
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ $rm conftest
+ $LTCC -o conftest conftest.c $i
+ # Did it work?
+ if test "$?" -eq 0 ; then
+ ldd_output=`ldd conftest`
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+ newdeplibs="$newdeplibs $i"
+ i=""
+ ;;
+ esac
+ fi
+ if test -n "$i" ; then
+ libname=`eval \\$echo \"$libname_spec\"`
+ deplib_matches=`eval \\$echo \"$library_names_spec\"`
+ set dummy $deplib_matches
+ deplib_match=$2
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ newdeplibs="$newdeplibs $i"
+ else
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning: dynamic linker does not accept needed library $i."
+ $echo "*** I have the capability to make that library automatically link in when"
+ $echo "*** you link to this library. But I can only do this if you have a"
+ $echo "*** shared version of the library, which you do not appear to have"
+ $echo "*** because a test_compile did reveal that the linker did not use this one"
+ $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+ fi
+ fi
+ else
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning! Library $i is needed by this library but I was not able to"
+ $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** library that it depends on before this library will be fully"
+ $echo "*** functional. Installing it before continuing would be even better."
+ fi
+ else
+ newdeplibs="$newdeplibs $i"
+ fi
+ done
+ fi
+ ;;
+ file_magic*)
+ set dummy $deplibs_check_method
+ file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+ name="`expr $a_deplib : '-l\(.*\)'`"
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $a_deplib "*)
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ ;;
+ esac
+ fi
+ if test -n "$a_deplib" ; then
+ libname=`eval \\$echo \"$libname_spec\"`
+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ for potent_lib in $potential_libs; do
+ # Follow soft links.
+ if ls -lLd "$potent_lib" 2>/dev/null \
+ | grep " -> " >/dev/null; then
+ continue
+ fi
+ # The statement above tries to avoid entering an
+ # endless loop below, in case of cyclic links.
+ # We might still enter an endless loop, since a link
+ # loop can be closed while we follow links,
+ # but so what?
+ potlib="$potent_lib"
+ while test -h "$potlib" 2>/dev/null; do
+ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ case $potliblink in
+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+ *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ esac
+ done
+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+ | ${SED} 10q \
+ | $EGREP "$file_magic_regex" > /dev/null; then
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ break 2
+ fi
+ done
+ done
+ fi
+ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning: linker path does not have real file for library $a_deplib."
+ $echo "*** I have the capability to make that library automatically link in when"
+ $echo "*** you link to this library. But I can only do this if you have a"
+ $echo "*** shared version of the library, which you do not appear to have"
+ $echo "*** because I did check the linker path looking for a file starting"
+ if test -z "$potlib" ; then
+ $echo "*** with $libname but no candidates were found. (...for file magic test)"
+ else
+ $echo "*** with $libname and none of the candidates passed a file format test"
+ $echo "*** using a file magic. Last file checked: $potlib"
+ fi
+ fi
+ else
+ # Add a -L argument.
+ newdeplibs="$newdeplibs $a_deplib"
+ fi
+ done # Gone through all deplibs.
+ ;;
+ match_pattern*)
+ set dummy $deplibs_check_method
+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+ name="`expr $a_deplib : '-l\(.*\)'`"
+ # If $name is empty we are operating on a -L argument.
+ if test -n "$name" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $a_deplib "*)
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ ;;
+ esac
+ fi
+ if test -n "$a_deplib" ; then
+ libname=`eval \\$echo \"$libname_spec\"`
+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ for potent_lib in $potential_libs; do
+ potlib="$potent_lib" # see symlink-check above in file_magic test
+ if eval $echo \"$potent_lib\" 2>/dev/null \
+ | ${SED} 10q \
+ | $EGREP "$match_pattern_regex" > /dev/null; then
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ break 2
+ fi
+ done
+ done
+ fi
+ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning: linker path does not have real file for library $a_deplib."
+ $echo "*** I have the capability to make that library automatically link in when"
+ $echo "*** you link to this library. But I can only do this if you have a"
+ $echo "*** shared version of the library, which you do not appear to have"
+ $echo "*** because I did check the linker path looking for a file starting"
+ if test -z "$potlib" ; then
+ $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+ else
+ $echo "*** with $libname and none of the candidates passed a file format test"
+ $echo "*** using a regex pattern. Last file checked: $potlib"
+ fi
+ fi
+ else
+ # Add a -L argument.
+ newdeplibs="$newdeplibs $a_deplib"
+ fi
+ done # Gone through all deplibs.
+ ;;
+ none | unknown | *)
+ newdeplibs=""
+ tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+ -e 's/ -[LR][^ ]*//g'`
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ for i in $predeps $postdeps ; do
+ # can't use Xsed below, because $i might contain '/'
+ tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+ done
+ fi
+ if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \
+ | grep . >/dev/null; then
+ $echo
+ if test "X$deplibs_check_method" = "Xnone"; then
+ $echo "*** Warning: inter-library dependencies are not supported in this platform."
+ else
+ $echo "*** Warning: inter-library dependencies are not known to be supported."
+ fi
+ $echo "*** All declared inter-library dependencies are being dropped."
+ droppeddeps=yes
+ fi
+ ;;
+ esac
+ versuffix=$versuffix_save
+ major=$major_save
+ release=$release_save
+ libname=$libname_save
+ name=$name_save
+
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ ;;
+ esac
+
+ if test "$droppeddeps" = yes; then
+ if test "$module" = yes; then
+ $echo
+ $echo "*** Warning: libtool could not satisfy all declared inter-library"
+ $echo "*** dependencies of module $libname. Therefore, libtool will create"
+ $echo "*** a static module, that should work as long as the dlopening"
+ $echo "*** application is linked with the -dlopen flag."
+ if test -z "$global_symbol_pipe"; then
+ $echo
+ $echo "*** However, this would only work if libtool was able to extract symbol"
+ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ $echo "*** not find such a program. So, this module is probably useless."
+ $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+ if test "$build_old_libs" = no; then
+ oldlibs="$output_objdir/$libname.$libext"
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+ build_libtool_libs=no
+ fi
+ else
+ $echo "*** The inter-library dependencies that have been dropped here will be"
+ $echo "*** automatically added whenever a program is linked with this library"
+ $echo "*** or is declared to -dlopen it."
+
+ if test "$allow_undefined" = no; then
+ $echo
+ $echo "*** Since this library must not contain undefined symbols,"
+ $echo "*** because either the platform does not support them or"
+ $echo "*** it was explicitly requested with -no-undefined,"
+ $echo "*** libtool will only create a static version of it."
+ if test "$build_old_libs" = no; then
+ oldlibs="$output_objdir/$libname.$libext"
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+ build_libtool_libs=no
+ fi
+ fi
+ fi
+ fi
+ # Done checking deplibs!
+ deplibs=$newdeplibs
+ fi
+
+ # All the library-specific variables (install_libdir is set above).
+ library_names=
+ old_library=
+ dlname=
+
+ # Test again, we may have decided not to build it any more
+ if test "$build_libtool_libs" = yes; then
+ if test "$hardcode_into_libs" = yes; then
+ # Hardcode the library paths
+ hardcode_libdirs=
+ dep_rpath=
+ rpath="$finalize_rpath"
+ test "$mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ dep_rpath="$dep_rpath $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+ *" $libdir "*) ;;
+ *) perm_rpath="$perm_rpath $libdir" ;;
+ esac
+ fi
+ done
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ if test -n "$hardcode_libdir_flag_spec_ld"; then
+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+ else
+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ fi
+ fi
+ if test -n "$runpath_var" && test -n "$perm_rpath"; then
+ # We should set the runpath_var.
+ rpath=
+ for dir in $perm_rpath; do
+ rpath="$rpath$dir:"
+ done
+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+ fi
+ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+ fi
+
+ shlibpath="$finalize_shlibpath"
+ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ if test -n "$shlibpath"; then
+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+ fi
+
+ # Get the real and link names of the library.
+ eval shared_ext=\"$shrext_cmds\"
+ eval library_names=\"$library_names_spec\"
+ set dummy $library_names
+ realname="$2"
+ shift; shift
+
+ if test -n "$soname_spec"; then
+ eval soname=\"$soname_spec\"
+ else
+ soname="$realname"
+ fi
+ if test -z "$dlname"; then
+ dlname=$soname
+ fi
+
+ lib="$output_objdir/$realname"
+ for link
+ do
+ linknames="$linknames $link"
+ done
+
+ # Use standard objects if they are pic
+ test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+ $show "generating symbol list for \`$libname.la'"
+ export_symbols="$output_objdir/$libname.exp"
+ $run $rm $export_symbols
+ cmds=$export_symbols_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ if len=`expr "X$cmd" : ".*"` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ skipped_export=false
+ else
+ # The command line is too long to execute in one step.
+ $show "using reloadable object file for export list..."
+ skipped_export=:
+ fi
+ done
+ IFS="$save_ifs"
+ if test -n "$export_symbols_regex"; then
+ $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+ $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+ $show "$mv \"${export_symbols}T\" \"$export_symbols\""
+ $run eval '$mv "${export_symbols}T" "$export_symbols"'
+ fi
+ fi
+ fi
+
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+ fi
+
+ tmp_deplibs=
+ for test_deplib in $deplibs; do
+ case " $convenience " in
+ *" $test_deplib "*) ;;
+ *)
+ tmp_deplibs="$tmp_deplibs $test_deplib"
+ ;;
+ esac
+ done
+ deplibs="$tmp_deplibs"
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+ save_libobjs=$libobjs
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${outputname}x"
+ $show "${rm}r $gentop"
+ $run ${rm}r "$gentop"
+ $show "$mkdir $gentop"
+ $run $mkdir "$gentop"
+ status=$?
+ if test "$status" -ne 0 && test ! -d "$gentop"; then
+ exit $status
+ fi
+ generated="$generated $gentop"
+
+ for xlib in $convenience; do
+ # Extract the objects.
+ case $xlib in
+ [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ *) xabs=`pwd`"/$xlib" ;;
+ esac
+ xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ xdir="$gentop/$xlib"
+
+ $show "${rm}r $xdir"
+ $run ${rm}r "$xdir"
+ $show "$mkdir $xdir"
+ $run $mkdir "$xdir"
+ status=$?
+ if test "$status" -ne 0 && test ! -d "$xdir"; then
+ exit $status
+ fi
+ # We will extract separately just the conflicting names and we will no
+ # longer touch any unique names. It is faster to leave these extract
+ # automatically by $AR in one run.
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ $AR t "$xabs" | sort | uniq -cd | while read -r count name
+ do
+ i=1
+ while test "$i" -le "$count"
+ do
+ # Put our $i before any first dot (extension)
+ # Never overwrite any file
+ name_to="$name"
+ while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ do
+ name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ done
+ $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ i=`expr $i + 1`
+ done
+ done
+ fi
+
+ libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ done
+ fi
+ fi
+
+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ eval flag=\"$thread_safe_flag_spec\"
+ linker_flags="$linker_flags $flag"
+ fi
+
+ # Make a backup of the uninstalled library when relinking
+ if test "$mode" = relink; then
+ $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+ fi
+
+ # Do each of the archive commands.
+ if test "$module" = yes && test -n "$module_cmds" ; then
+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+ eval test_cmds=\"$module_expsym_cmds\"
+ cmds=$module_expsym_cmds
+ else
+ eval test_cmds=\"$module_cmds\"
+ cmds=$module_cmds
+ fi
+ else
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ eval test_cmds=\"$archive_expsym_cmds\"
+ cmds=$archive_expsym_cmds
+ else
+ eval test_cmds=\"$archive_cmds\"
+ cmds=$archive_cmds
+ fi
+ fi
+
+ if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ :
+ else
+ # The command line is too long to link in one step, link piecewise.
+ $echo "creating reloadable object files..."
+
+ # Save the value of $output and $libobjs because we want to
+ # use them later. If we have whole_archive_flag_spec, we
+ # want to use save_libobjs as it was before
+ # whole_archive_flag_spec was expanded, because we can't
+ # assume the linker understands whole_archive_flag_spec.
+ # This may have to be revisited, in case too many
+ # convenience libraries get linked in and end up exceeding
+ # the spec.
+ if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+ save_libobjs=$libobjs
+ fi
+ save_output=$output
+
+ # Clear the reloadable object creation command queue and
+ # initialize k to one.
+ test_cmds=
+ concat_cmds=
+ objlist=
+ delfiles=
+ last_robj=
+ k=1
+ output=$output_objdir/$save_output-${k}.$objext
+ # Loop over the list of objects to be linked.
+ for obj in $save_libobjs
+ do
+ eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ if test "X$objlist" = X ||
+ { len=`expr "X$test_cmds" : ".*"` &&
+ test "$len" -le "$max_cmd_len"; }; then
+ objlist="$objlist $obj"
+ else
+ # The command $test_cmds is almost too long, add a
+ # command to the queue.
+ if test "$k" -eq 1 ; then
+ # The first file doesn't have a previous command to add.
+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+ else
+ # All subsequent reloadable object files will link in
+ # the last one created.
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ fi
+ last_robj=$output_objdir/$save_output-${k}.$objext
+ k=`expr $k + 1`
+ output=$output_objdir/$save_output-${k}.$objext
+ objlist=$obj
+ len=1
+ fi
+ done
+ # Handle the remaining objects by creating one last
+ # reloadable object file. All subsequent reloadable object
+ # files will link in the last one created.
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+
+ if ${skipped_export-false}; then
+ $show "generating symbol list for \`$libname.la'"
+ export_symbols="$output_objdir/$libname.exp"
+ $run $rm $export_symbols
+ libobjs=$output
+ # Append the command to create the export file.
+ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+ fi
+
+ # Set up a command to remove the reloadale object files
+ # after they are used.
+ i=0
+ while test "$i" -lt "$k"
+ do
+ i=`expr $i + 1`
+ delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+ done
+
+ $echo "creating a temporary reloadable object file: $output"
+
+ # Loop through the commands generated above and execute them.
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $concat_cmds; do
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+
+ libobjs=$output
+ # Restore the value of output.
+ output=$save_output
+
+ if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ fi
+ # Expand the library linking commands again to reset the
+ # value of $libobjs for piecewise linking.
+
+ # Do each of the archive commands.
+ if test "$module" = yes && test -n "$module_cmds" ; then
+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+ cmds=$module_expsym_cmds
+ else
+ cmds=$module_cmds
+ fi
+ else
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ cmds=$archive_expsym_cmds
+ else
+ cmds=$archive_cmds
+ fi
+ fi
+
+ # Append the command to remove the reloadable object files
+ # to the just-reset $cmds.
+ eval cmds=\"\$cmds~\$rm $delfiles\"
+ fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+ exit $EXIT_SUCCESS
+ fi
+
+ # Create links to the real library.
+ for linkname in $linknames; do
+ if test "$realname" != "$linkname"; then
+ $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
+ $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+ fi
+ done
+
+ # If -module or -export-dynamic was specified, set the dlname.
+ if test "$module" = yes || test "$export_dynamic" = yes; then
+ # On all known operating systems, these are identical.
+ dlname="$soname"
+ fi
+ fi
+ ;;
+
+ obj)
+ if test -n "$deplibs"; then
+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+ fi
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+ fi
+
+ if test -n "$rpath"; then
+ $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
+ fi
+
+ if test -n "$xrpath"; then
+ $echo "$modename: warning: \`-R' is ignored for objects" 1>&2
+ fi
+
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+ fi
+
+ if test -n "$release"; then
+ $echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+ fi
+
+ case $output in
+ *.lo)
+ if test -n "$objs$old_deplibs"; then
+ $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ libobj="$output"
+ obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+ ;;
+ *)
+ libobj=
+ obj="$output"
+ ;;
+ esac
+
+ # Delete the old objects.
+ $run $rm $obj $libobj
+
+ # Objects from convenience libraries. This assumes
+ # single-version convenience libraries. Whenever we create
+ # different ones for PIC/non-PIC, this we'll have to duplicate
+ # the extraction.
+ reload_conv_objs=
+ gentop=
+ # reload_cmds runs $LD directly, so let us get rid of
+ # -Wl from whole_archive_flag_spec
+ wl=
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${obj}x"
+ $show "${rm}r $gentop"
+ $run ${rm}r "$gentop"
+ $show "$mkdir $gentop"
+ $run $mkdir "$gentop"
+ status=$?
+ if test "$status" -ne 0 && test ! -d "$gentop"; then
+ exit $status
+ fi
+ generated="$generated $gentop"
+
+ for xlib in $convenience; do
+ # Extract the objects.
+ case $xlib in
+ [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ *) xabs=`pwd`"/$xlib" ;;
+ esac
+ xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ xdir="$gentop/$xlib"
+
+ $show "${rm}r $xdir"
+ $run ${rm}r "$xdir"
+ $show "$mkdir $xdir"
+ $run $mkdir "$xdir"
+ status=$?
+ if test "$status" -ne 0 && test ! -d "$xdir"; then
+ exit $status
+ fi
+ # We will extract separately just the conflicting names and we will no
+ # longer touch any unique names. It is faster to leave these extract
+ # automatically by $AR in one run.
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ $AR t "$xabs" | sort | uniq -cd | while read -r count name
+ do
+ i=1
+ while test "$i" -le "$count"
+ do
+ # Put our $i before any first dot (extension)
+ # Never overwrite any file
+ name_to="$name"
+ while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ do
+ name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ done
+ $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ i=`expr $i + 1`
+ done
+ done
+ fi
+
+ reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ done
+ fi
+ fi
+
+ # Create the old-style object.
+ reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+ output="$obj"
+ cmds=$reload_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+
+ # Exit if we aren't doing a library object file.
+ if test -z "$libobj"; then
+ if test -n "$gentop"; then
+ $show "${rm}r $gentop"
+ $run ${rm}r $gentop
+ fi
+
+ exit $EXIT_SUCCESS
+ fi
+
+ if test "$build_libtool_libs" != yes; then
+ if test -n "$gentop"; then
+ $show "${rm}r $gentop"
+ $run ${rm}r $gentop
+ fi
+
+ # Create an invalid libtool object if no PIC, so that we don't
+ # accidentally link it into a program.
+ # $show "echo timestamp > $libobj"
+ # $run eval "echo timestamp > $libobj" || exit $?
+ exit $EXIT_SUCCESS
+ fi
+
+ if test -n "$pic_flag" || test "$pic_mode" != default; then
+ # Only do commands if we really have different PIC objects.
+ reload_objs="$libobjs $reload_conv_objs"
+ output="$libobj"
+ cmds=$reload_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ fi
+
+ if test -n "$gentop"; then
+ $show "${rm}r $gentop"
+ $run ${rm}r $gentop
+ fi
+
+ exit $EXIT_SUCCESS
+ ;;
+
+ prog)
+ case $host in
+ *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+ esac
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+ fi
+
+ if test -n "$release"; then
+ $echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+ fi
+
+ if test "$preload" = yes; then
+ if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
+ test "$dlopen_self_static" = unknown; then
+ $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
+ fi
+ fi
+
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ ;;
+ esac
+
+ case $host in
+ *darwin*)
+ # Don't allow lazy linking, it breaks C++ global constructors
+ if test "$tagname" = CXX ; then
+ compile_command="$compile_command ${wl}-bind_at_load"
+ finalize_command="$finalize_command ${wl}-bind_at_load"
+ fi
+ ;;
+ esac
+
+ compile_command="$compile_command $compile_deplibs"
+ finalize_command="$finalize_command $finalize_deplibs"
+
+ if test -n "$rpath$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+ for libdir in $rpath $xrpath; do
+ # This is the magic to use -rpath.
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
+ esac
+ done
+ fi
+
+ # Now hardcode the library paths
+ rpath=
+ hardcode_libdirs=
+ for libdir in $compile_rpath $finalize_rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ rpath="$rpath $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+ *" $libdir "*) ;;
+ *) perm_rpath="$perm_rpath $libdir" ;;
+ esac
+ fi
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ case :$dllsearchpath: in
+ *":$libdir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$libdir";;
+ esac
+ ;;
+ esac
+ done
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ eval rpath=\" $hardcode_libdir_flag_spec\"
+ fi
+ compile_rpath="$rpath"
+
+ rpath=
+ hardcode_libdirs=
+ for libdir in $finalize_rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ rpath="$rpath $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$finalize_perm_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+ esac
+ fi
+ done
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ eval rpath=\" $hardcode_libdir_flag_spec\"
+ fi
+ finalize_rpath="$rpath"
+
+ if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ # Transform all the library objects into standard objects.
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ fi
+
+ dlsyms=
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$NM" && test -n "$global_symbol_pipe"; then
+ dlsyms="${outputname}S.c"
+ else
+ $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+ fi
+ fi
+
+ if test -n "$dlsyms"; then
+ case $dlsyms in
+ "") ;;
+ *.c)
+ # Discover the nlist of each of the dlfiles.
+ nlist="$output_objdir/${outputname}.nm"
+
+ $show "$rm $nlist ${nlist}S ${nlist}T"
+ $run $rm "$nlist" "${nlist}S" "${nlist}T"
+
+ # Parse the name list into a source file.
+ $show "creating $output_objdir/$dlsyms"
+
+ test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* Prevent the only kind of declaration conflicts we can make. */
+#define lt_preloaded_symbols some_other_symbol
+
+/* External symbol declarations for the compiler. */\
+"
+
+ if test "$dlself" = yes; then
+ $show "generating symbol list for \`$output'"
+
+ test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+
+ # Add our own program objects to the symbol list.
+ progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ for arg in $progfiles; do
+ $show "extracting global C symbols from \`$arg'"
+ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+ done
+
+ if test -n "$exclude_expsyms"; then
+ $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+ $run eval '$mv "$nlist"T "$nlist"'
+ fi
+
+ if test -n "$export_symbols_regex"; then
+ $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+ $run eval '$mv "$nlist"T "$nlist"'
+ fi
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+ export_symbols="$output_objdir/$output.exp"
+ $run $rm $export_symbols
+ $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ else
+ $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+ $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+ $run eval 'mv "$nlist"T "$nlist"'
+ fi
+ fi
+
+ for arg in $dlprefiles; do
+ $show "extracting global C symbols from \`$arg'"
+ name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
+ $run eval '$echo ": $name " >> "$nlist"'
+ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+ done
+
+ if test -z "$run"; then
+ # Make sure we have at least an empty file.
+ test -f "$nlist" || : > "$nlist"
+
+ if test -n "$exclude_expsyms"; then
+ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+ $mv "$nlist"T "$nlist"
+ fi
+
+ # Try sorting and uniquifying the output.
+ if grep -v "^: " < "$nlist" |
+ if sort -k 3 </dev/null >/dev/null 2>&1; then
+ sort -k 3
+ else
+ sort +2
+ fi |
+ uniq > "$nlist"S; then
+ :
+ else
+ grep -v "^: " < "$nlist" > "$nlist"S
+ fi
+
+ if test -f "$nlist"S; then
+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
+ else
+ $echo '/* NONE */' >> "$output_objdir/$dlsyms"
+ fi
+
+ $echo >> "$output_objdir/$dlsyms" "\
+
+#undef lt_preloaded_symbols
+
+#if defined (__STDC__) && __STDC__
+# define lt_ptr void *
+#else
+# define lt_ptr char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+ const char *name;
+ lt_ptr address;
+}
+lt_preloaded_symbols[] =
+{\
+"
+
+ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
+
+ $echo >> "$output_objdir/$dlsyms" "\
+ {0, (lt_ptr) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+ return lt_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+ fi
+
+ pic_flag_for_symtable=
+ case $host in
+ # compiling the symbol table file with pic_flag works around
+ # a FreeBSD bug that causes programs to crash when -lm is
+ # linked before any other PIC object. But we must not use
+ # pic_flag when linking with -static. The problem exists in
+ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ case "$compile_command " in
+ *" -static "*) ;;
+ *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
+ esac;;
+ *-*-hpux*)
+ case "$compile_command " in
+ *" -static "*) ;;
+ *) pic_flag_for_symtable=" $pic_flag";;
+ esac
+ esac
+
+ # Now compile the dynamic symbol file.
+ $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+ $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+ # Clean up the generated files.
+ $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+ $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+
+ # Transform the symbol file into the correct name.
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ ;;
+ *)
+ $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+ else
+ # We keep going just in case the user didn't refer to
+ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe
+ # really was required.
+
+ # Nullify the symbol file.
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ fi
+
+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ # Replace the output file specification.
+ compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ link_command="$compile_command$compile_rpath"
+
+ # We have no uninstalled library dependencies, so finalize right now.
+ $show "$link_command"
+ $run eval "$link_command"
+ status=$?
+
+ # Delete the generated files.
+ if test -n "$dlsyms"; then
+ $show "$rm $output_objdir/${outputname}S.${objext}"
+ $run $rm "$output_objdir/${outputname}S.${objext}"
+ fi
+
+ exit $status
+ fi
+
+ if test -n "$shlibpath_var"; then
+ # We should set the shlibpath_var
+ rpath=
+ for dir in $temp_rpath; do
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*)
+ # Absolute path.
+ rpath="$rpath$dir:"
+ ;;
+ *)
+ # Relative path: add a thisdir entry.
+ rpath="$rpath\$thisdir/$dir:"
+ ;;
+ esac
+ done
+ temp_rpath="$rpath"
+ fi
+
+ if test -n "$compile_shlibpath$finalize_shlibpath"; then
+ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+ fi
+ if test -n "$finalize_shlibpath"; then
+ finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+ fi
+
+ compile_var=
+ finalize_var=
+ if test -n "$runpath_var"; then
+ if test -n "$perm_rpath"; then
+ # We should set the runpath_var.
+ rpath=
+ for dir in $perm_rpath; do
+ rpath="$rpath$dir:"
+ done
+ compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ fi
+ if test -n "$finalize_perm_rpath"; then
+ # We should set the runpath_var.
+ rpath=
+ for dir in $finalize_perm_rpath; do
+ rpath="$rpath$dir:"
+ done
+ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ fi
+ fi
+
+ if test "$no_install" = yes; then
+ # We don't need to create a wrapper script.
+ link_command="$compile_var$compile_command$compile_rpath"
+ # Replace the output file specification.
+ link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ # Delete the old output file.
+ $run $rm $output
+ # Link the executable and exit
+ $show "$link_command"
+ $run eval "$link_command" || exit $?
+ exit $EXIT_SUCCESS
+ fi
+
+ if test "$hardcode_action" = relink; then
+ # Fast installation is not supported
+ link_command="$compile_var$compile_command$compile_rpath"
+ relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+ $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
+ $echo "$modename: \`$output' will be relinked during installation" 1>&2
+ else
+ if test "$fast_install" != no; then
+ link_command="$finalize_var$compile_command$finalize_rpath"
+ if test "$fast_install" = yes; then
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ else
+ # fast_install is set to needless
+ relink_command=
+ fi
+ else
+ link_command="$compile_var$compile_command$compile_rpath"
+ relink_command="$finalize_var$finalize_command$finalize_rpath"
+ fi
+ fi
+
+ # Replace the output file specification.
+ link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+ # Delete the old output files.
+ $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+ $show "$link_command"
+ $run eval "$link_command" || exit $?
+
+ # Now create the wrapper script.
+ $show "creating $output"
+
+ # Quote the relink command for shipping.
+ if test -n "$relink_command"; then
+ # Preserve any variables that may affect compiler behavior
+ for var in $variables_saved_for_relink; do
+ if eval test -z \"\${$var+set}\"; then
+ relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+ elif eval var_value=\$$var; test -z "$var_value"; then
+ relink_command="$var=; export $var; $relink_command"
+ else
+ var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+ relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ fi
+ done
+ relink_command="(cd `pwd`; $relink_command)"
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ fi
+
+ # Quote $echo for shipping.
+ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+ case $progpath in
+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ esac
+ qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+ else
+ qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+ fi
+
+ # Only actually do things if our run command is non-null.
+ if test -z "$run"; then
+ # win32 will think the script is a binary if it has
+ # a .exe suffix, so we strip it off here.
+ case $output in
+ *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+ esac
+ # test for cygwin because mv fails w/o .exe extensions
+ case $host in
+ *cygwin*)
+ exeext=.exe
+ outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+ *) exeext= ;;
+ esac
+ case $host in
+ *cygwin* | *mingw* )
+ cwrappersource=`$echo ${objdir}/lt-${output}.c`
+ cwrapper=`$echo ${output}.exe`
+ $rm $cwrappersource $cwrapper
+ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+ cat > $cwrappersource <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+ Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+
+ The $output program cannot be directly executed until all the libtool
+ libraries that it depends on are installed.
+
+ This wrapper executable should never be moved out of the build directory.
+ If it is, it will not operate correctly.
+
+ Currently, it simply execs the wrapper *script* "/bin/sh $output",
+ but could eventually absorb all of the scripts functionality and
+ exec $objdir/$outputname directly.
+*/
+EOF
+ cat >> $cwrappersource<<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef DIR_SEPARATOR
+#define DIR_SEPARATOR '/'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+ defined (__OS2__)
+#define HAVE_DOS_BASED_FILE_SYSTEM
+#ifndef DIR_SEPARATOR_2
+#define DIR_SEPARATOR_2 '\\'
+#endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+ if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+const char *program_name = NULL;
+
+void * xmalloc (size_t num);
+char * xstrdup (const char *string);
+char * basename (const char *name);
+char * fnqualify(const char *path);
+char * strendzap(char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+
+int
+main (int argc, char *argv[])
+{
+ char **newargz;
+ int i;
+
+ program_name = (char *) xstrdup ((char *) basename (argv[0]));
+ newargz = XMALLOC(char *, argc+2);
+EOF
+
+ cat >> $cwrappersource <<EOF
+ newargz[0] = "$SHELL";
+EOF
+
+ cat >> $cwrappersource <<"EOF"
+ newargz[1] = fnqualify(argv[0]);
+ /* we know the script has the same name, without the .exe */
+ /* so make sure newargz[1] doesn't end in .exe */
+ strendzap(newargz[1],".exe");
+ for (i = 1; i < argc; i++)
+ newargz[i+1] = xstrdup(argv[i]);
+ newargz[argc+1] = NULL;
+EOF
+
+ cat >> $cwrappersource <<EOF
+ execv("$SHELL",newargz);
+EOF
+
+ cat >> $cwrappersource <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+ void * p = (void *) malloc (num);
+ if (!p)
+ lt_fatal ("Memory exhausted");
+
+ return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+;
+}
+
+char *
+basename (const char *name)
+{
+ const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ /* Skip over the disk name in MSDOS pathnames. */
+ if (isalpha (name[0]) && name[1] == ':')
+ name += 2;
+#endif
+
+ for (base = name; *name; name++)
+ if (IS_DIR_SEPARATOR (*name))
+ base = name + 1;
+ return (char *) base;
+}
+
+char *
+fnqualify(const char *path)
+{
+ size_t size;
+ char *p;
+ char tmp[LT_PATHMAX + 1];
+
+ assert(path != NULL);
+
+ /* Is it qualified already? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ if (isalpha (path[0]) && path[1] == ':')
+ return xstrdup (path);
+#endif
+ if (IS_DIR_SEPARATOR (path[0]))
+ return xstrdup (path);
+
+ /* prepend the current directory */
+ /* doesn't handle '~' */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+ lt_fatal ("getcwd failed");
+ size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+ p = XMALLOC(char, size);
+ sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+ return p;
+}
+
+char *
+strendzap(char *str, const char *pat)
+{
+ size_t len, patlen;
+
+ assert(str != NULL);
+ assert(pat != NULL);
+
+ len = strlen(str);
+ patlen = strlen(pat);
+
+ if (patlen <= len)
+ {
+ str += len - patlen;
+ if (strcmp(str, pat) == 0)
+ *str = '\0';
+ }
+ return str;
+}
+
+static void
+lt_error_core (int exit_status, const char * mode,
+ const char * message, va_list ap)
+{
+ fprintf (stderr, "%s: %s: ", program_name, mode);
+ vfprintf (stderr, message, ap);
+ fprintf (stderr, ".\n");
+
+ if (exit_status >= 0)
+ exit (exit_status);
+}
+
+void
+lt_fatal (const char *message, ...)
+{
+ va_list ap;
+ va_start (ap, message);
+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+ va_end (ap);
+}
+EOF
+ # we should really use a build-platform specific compiler
+ # here, but OTOH, the wrappers (shell script and this C one)
+ # are only useful if you want to execute the "real" binary.
+ # Since the "real" binary is built for $host, then this
+ # wrapper might as well be built for $host, too.
+ $run $LTCC -s -o $cwrapper $cwrappersource
+ ;;
+ esac
+ $rm $output
+ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+
+ $echo > $output "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+ # install mode needs the following variable:
+ notinst_deplibs='$notinst_deplibs'
+else
+ # When we are sourced in execute mode, \$file and \$echo are already set.
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+ echo=\"$qecho\"
+ file=\"\$0\"
+ # Make sure echo works.
+ if test \"X\$1\" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+ elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+ # Yippee, \$echo works!
+ :
+ else
+ # Restart under the correct shell, and then maybe \$echo will work.
+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+ fi
+ fi\
+"
+ $echo >> $output "\
+
+ # Find the directory that this script lives in.
+ thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+ test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+ # Follow symbolic links until we get to the real thisdir.
+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+ while test -n \"\$file\"; do
+ destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+ # If there was a directory component, then change thisdir.
+ if test \"x\$destdir\" != \"x\$file\"; then
+ case \"\$destdir\" in
+ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+ *) thisdir=\"\$thisdir/\$destdir\" ;;
+ esac
+ fi
+
+ file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+ done
+
+ # Try to get the absolute directory name.
+ absdir=\`cd \"\$thisdir\" && pwd\`
+ test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+ if test "$fast_install" = yes; then
+ $echo >> $output "\
+ program=lt-'$outputname'$exeext
+ progdir=\"\$thisdir/$objdir\"
+
+ if test ! -f \"\$progdir/\$program\" || \\
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+ file=\"\$\$-\$program\"
+
+ if test ! -d \"\$progdir\"; then
+ $mkdir \"\$progdir\"
+ else
+ $rm \"\$progdir/\$file\"
+ fi"
+
+ $echo >> $output "\
+
+ # relink executable if necessary
+ if test -n \"\$relink_command\"; then
+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+ else
+ $echo \"\$relink_command_output\" >&2
+ $rm \"\$progdir/\$file\"
+ exit $EXIT_FAILURE
+ fi
+ fi
+
+ $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+ { $rm \"\$progdir/\$program\";
+ $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+ $rm \"\$progdir/\$file\"
+ fi"
+ else
+ $echo >> $output "\
+ program='$outputname'
+ progdir=\"\$thisdir/$objdir\"
+"
+ fi
+
+ $echo >> $output "\
+
+ if test -f \"\$progdir/\$program\"; then"
+
+ # Export our shlibpath_var if we have one.
+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ $echo >> $output "\
+ # Add our own library path to $shlibpath_var
+ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+ # Some systems cannot cope with colon-terminated $shlibpath_var
+ # The second colon is a workaround for a bug in BeOS R4 sed
+ $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+ export $shlibpath_var
+"
+ fi
+
+ # fixup the dll searchpath if we need to.
+ if test -n "$dllsearchpath"; then
+ $echo >> $output "\
+ # Add the dll search path components to the executable PATH
+ PATH=$dllsearchpath:\$PATH
+"
+ fi
+
+ $echo >> $output "\
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+ # Run the actual program with our arguments.
+"
+ case $host in
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2*)
+ $echo >> $output "\
+ exec \$progdir\\\\\$program \${1+\"\$@\"}
+"
+ ;;
+
+ *)
+ $echo >> $output "\
+ exec \$progdir/\$program \${1+\"\$@\"}
+"
+ ;;
+ esac
+ $echo >> $output "\
+ \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+ exit $EXIT_FAILURE
+ fi
+ else
+ # The program doesn't exist.
+ \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+ \$echo \"This script is just a wrapper for \$program.\" 1>&2
+ $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+ exit $EXIT_FAILURE
+ fi
+fi\
+"
+ chmod +x $output
+ fi
+ exit $EXIT_SUCCESS
+ ;;
+ esac
+
+ # See if we need to build an old-fashioned archive.
+ for oldlib in $oldlibs; do
+
+ if test "$build_libtool_libs" = convenience; then
+ oldobjs="$libobjs_save"
+ addlibs="$convenience"
+ build_libtool_libs=no
+ else
+ if test "$build_libtool_libs" = module; then
+ oldobjs="$libobjs_save"
+ build_libtool_libs=no
+ else
+ oldobjs="$old_deplibs $non_pic_objects"
+ fi
+ addlibs="$old_convenience"
+ fi
+
+ if test -n "$addlibs"; then
+ gentop="$output_objdir/${outputname}x"
+ $show "${rm}r $gentop"
+ $run ${rm}r "$gentop"
+ $show "$mkdir $gentop"
+ $run $mkdir "$gentop"
+ status=$?
+ if test "$status" -ne 0 && test ! -d "$gentop"; then
+ exit $status
+ fi
+ generated="$generated $gentop"
+
+ # Add in members from convenience archives.
+ for xlib in $addlibs; do
+ # Extract the objects.
+ case $xlib in
+ [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ *) xabs=`pwd`"/$xlib" ;;
+ esac
+ xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ xdir="$gentop/$xlib"
+
+ $show "${rm}r $xdir"
+ $run ${rm}r "$xdir"
+ $show "$mkdir $xdir"
+ $run $mkdir "$xdir"
+ status=$?
+ if test "$status" -ne 0 && test ! -d "$xdir"; then
+ exit $status
+ fi
+ # We will extract separately just the conflicting names and we will no
+ # longer touch any unique names. It is faster to leave these extract
+ # automatically by $AR in one run.
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ $AR t "$xabs" | sort | uniq -cd | while read -r count name
+ do
+ i=1
+ while test "$i" -le "$count"
+ do
+ # Put our $i before any first dot (extension)
+ # Never overwrite any file
+ name_to="$name"
+ while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ do
+ name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ done
+ $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ i=`expr $i + 1`
+ done
+ done
+ fi
+
+ oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+ done
+ fi
+
+ # Do each command in the archive commands.
+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ cmds=$old_archive_from_new_cmds
+ else
+ eval cmds=\"$old_archive_cmds\"
+
+ if len=`expr "X$cmds" : ".*"` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ cmds=$old_archive_cmds
+ else
+ # the command line is too long to link in one step, link in parts
+ $echo "using piecewise archive linking..."
+ save_RANLIB=$RANLIB
+ RANLIB=:
+ objlist=
+ concat_cmds=
+ save_oldobjs=$oldobjs
+ # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+ # encoded into archives. This makes 'ar r' malfunction in
+ # this piecewise linking case whenever conflicting object
+ # names appear in distinct ar calls; check, warn and compensate.
+ if (for obj in $save_oldobjs
+ do
+ $echo "X$obj" | $Xsed -e 's%^.*/%%'
+ done | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+ $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+ AR_FLAGS=cq
+ fi
+ # Is there a better way of finding the last object in the list?
+ for obj in $save_oldobjs
+ do
+ last_oldobj=$obj
+ done
+ for obj in $save_oldobjs
+ do
+ oldobjs="$objlist $obj"
+ objlist="$objlist $obj"
+ eval test_cmds=\"$old_archive_cmds\"
+ if len=`expr "X$test_cmds" : ".*"` &&
+ test "$len" -le "$max_cmd_len"; then
+ :
+ else
+ # the above command should be used before it gets too long
+ oldobjs=$objlist
+ if test "$obj" = "$last_oldobj" ; then
+ RANLIB=$save_RANLIB
+ fi
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ objlist=
+ fi
+ done
+ RANLIB=$save_RANLIB
+ oldobjs=$objlist
+ if test "X$oldobjs" = "X" ; then
+ eval cmds=\"\$concat_cmds\"
+ else
+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ fi
+ fi
+ fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ eval cmd=\"$cmd\"
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ done
+
+ if test -n "$generated"; then
+ $show "${rm}r$generated"
+ $run ${rm}r$generated
+ fi
+
+ # Now create the libtool archive.
+ case $output in
+ *.la)
+ old_library=
+ test "$build_old_libs" = yes && old_library="$libname.$libext"
+ $show "creating $output"
+
+ # Preserve any variables that may affect compiler behavior
+ for var in $variables_saved_for_relink; do
+ if eval test -z \"\${$var+set}\"; then
+ relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+ elif eval var_value=\$$var; test -z "$var_value"; then
+ relink_command="$var=; export $var; $relink_command"
+ else
+ var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+ relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ fi
+ done
+ # Quote the link command for shipping.
+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ if test "$hardcode_automatic" = yes ; then
+ relink_command=
+ fi
+
+
+ # Only create the output if not a dry run.
+ if test -z "$run"; then
+ for installed in no yes; do
+ if test "$installed" = yes; then
+ if test -z "$install_libdir"; then
+ break
+ fi
+ output="$output_objdir/$outputname"i
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
+ case $deplib in
+ *.la)
+ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ newdependency_libs="$newdependency_libs $libdir/$name"
+ ;;
+ *) newdependency_libs="$newdependency_libs $deplib" ;;
+ esac
+ done
+ dependency_libs="$newdependency_libs"
+ newdlfiles=
+ for lib in $dlfiles; do
+ name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ newdlfiles="$newdlfiles $libdir/$name"
+ done
+ dlfiles="$newdlfiles"
+ newdlprefiles=
+ for lib in $dlprefiles; do
+ name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ newdlprefiles="$newdlprefiles $libdir/$name"
+ done
+ dlprefiles="$newdlprefiles"
+ else
+ newdlfiles=
+ for lib in $dlfiles; do
+ case $lib in
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+ newdlfiles="$newdlfiles $abs"
+ done
+ dlfiles="$newdlfiles"
+ newdlprefiles=
+ for lib in $dlprefiles; do
+ case $lib in
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+ newdlprefiles="$newdlprefiles $abs"
+ done
+ dlprefiles="$newdlprefiles"
+ fi
+ $rm $output
+ # place dlname in correct position for cygwin
+ tdlname=$dlname
+ case $host,$output,$installed,$module,$dlname in
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ esac
+ $echo > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+ if test "$installed" = no && test "$need_relink" = yes; then
+ $echo >> $output "\
+relink_command=\"$relink_command\""
+ fi
+ done
+ fi
+
+ # Do a symbolic link so that the libtool archive can be found in
+ # LD_LIBRARY_PATH before the program is installed.
+ $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
+ $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+ ;;
+ esac
+ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool install mode
+ install)
+ modename="$modename: install"
+
+ # There may be an optional sh(1) argument at the beginning of
+ # install_prog (especially on Windows NT).
+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+ $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+ # Aesthetically quote it.
+ arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ arg="\"$arg\""
+ ;;
+ esac
+ install_prog="$arg "
+ arg="$1"
+ shift
+ else
+ install_prog=
+ arg="$nonopt"
+ fi
+
+ # The real first argument should be the name of the installation program.
+ # Aesthetically quote it.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ arg="\"$arg\""
+ ;;
+ esac
+ install_prog="$install_prog$arg"
+
+ # We need to accept at least all the BSD install flags.
+ dest=
+ files=
+ opts=
+ prev=
+ install_type=
+ isdir=no
+ stripme=
+ for arg
+ do
+ if test -n "$dest"; then
+ files="$files $dest"
+ dest="$arg"
+ continue
+ fi
+
+ case $arg in
+ -d) isdir=yes ;;
+ -f) prev="-f" ;;
+ -g) prev="-g" ;;
+ -m) prev="-m" ;;
+ -o) prev="-o" ;;
+ -s)
+ stripme=" -s"
+ continue
+ ;;
+ -*) ;;
+
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+ prev=
+ else
+ dest="$arg"
+ continue
+ fi
+ ;;
+ esac
+
+ # Aesthetically quote the argument.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ arg="\"$arg\""
+ ;;
+ esac
+ install_prog="$install_prog $arg"
+ done
+
+ if test -z "$install_prog"; then
+ $echo "$modename: you must specify an install program" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prev' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ if test -z "$files"; then
+ if test -z "$dest"; then
+ $echo "$modename: no file or destination specified" 1>&2
+ else
+ $echo "$modename: you must specify a destination" 1>&2
+ fi
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Strip any trailing slash from the destination.
+ dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
+
+ # Check to see that the destination is a directory.
+ test -d "$dest" && isdir=yes
+ if test "$isdir" = yes; then
+ destdir="$dest"
+ destname=
+ else
+ destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$destdir" = "X$dest" && destdir=.
+ destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
+
+ # Not a directory, so check to see that there is only one file specified.
+ set dummy $files
+ if test "$#" -gt 2; then
+ $echo "$modename: \`$dest' is not a directory" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ fi
+ case $destdir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ for file in $files; do
+ case $file in
+ *.lo) ;;
+ *)
+ $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+ ;;
+ esac
+
+ # This variable tells wrapper scripts just to set variables rather
+ # than running their programs.
+ libtool_install_magic="$magic"
+
+ staticlibs=
+ future_libdirs=
+ current_libdirs=
+ for file in $files; do
+
+ # Do each installation.
+ case $file in
+ *.$libext)
+ # Do the static libraries later.
+ staticlibs="$staticlibs $file"
+ ;;
+
+ *.la)
+ # Check to see that this really is a libtool archive.
+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ library_names=
+ old_library=
+ relink_command=
+ # If there is no directory component, then add one.
+ case $file in
+ */* | *\\*) . $file ;;
+ *) . ./$file ;;
+ esac
+
+ # Add the libdir to current_libdirs if it is the destination.
+ if test "X$destdir" = "X$libdir"; then
+ case "$current_libdirs " in
+ *" $libdir "*) ;;
+ *) current_libdirs="$current_libdirs $libdir" ;;
+ esac
+ else
+ # Note the libdir as a future libdir.
+ case "$future_libdirs " in
+ *" $libdir "*) ;;
+ *) future_libdirs="$future_libdirs $libdir" ;;
+ esac
+ fi
+
+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
+ test "X$dir" = "X$file/" && dir=
+ dir="$dir$objdir"
+
+ if test -n "$relink_command"; then
+ # Determine the prefix the user has applied to our future dir.
+ inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
+
+ # Don't allow the user to place us outside of our expected
+ # location b/c this prevents finding dependent libraries that
+ # are installed to the same prefix.
+ # At present, this check doesn't affect windows .dll's that
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+ if test "$inst_prefix_dir" = "$destdir"; then
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ else
+ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ fi
+
+ $echo "$modename: warning: relinking \`$file'" 1>&2
+ $show "$relink_command"
+ if $run eval "$relink_command"; then :
+ else
+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ fi
+
+ # See the names of the shared library.
+ set dummy $library_names
+ if test -n "$2"; then
+ realname="$2"
+ shift
+ shift
+
+ srcname="$realname"
+ test -n "$relink_command" && srcname="$realname"T
+
+ # Install the shared library and build the symlinks.
+ $show "$install_prog $dir/$srcname $destdir/$realname"
+ $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+ if test -n "$stripme" && test -n "$striplib"; then
+ $show "$striplib $destdir/$realname"
+ $run eval "$striplib $destdir/$realname" || exit $?
+ fi
+
+ if test "$#" -gt 0; then
+ # Delete the old symlinks, and create new ones.
+ for linkname
+ do
+ if test "$linkname" != "$realname"; then
+ $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+ $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+ fi
+ done
+ fi
+
+ # Do each command in the postinstall commands.
+ lib="$destdir/$realname"
+ cmds=$postinstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ fi
+
+ # Install the pseudo-library for information purposes.
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ ;;
+
+ *.lo)
+ # Install (i.e. copy) a libtool object.
+
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+ destfile="$destdir/$destname"
+ else
+ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ destfile="$destdir/$destfile"
+ fi
+
+ # Deduce the name of the destination old-style object file.
+ case $destfile in
+ *.lo)
+ staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
+ ;;
+ *.$objext)
+ staticdest="$destfile"
+ destfile=
+ ;;
+ *)
+ $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ # Install the libtool object if requested.
+ if test -n "$destfile"; then
+ $show "$install_prog $file $destfile"
+ $run eval "$install_prog $file $destfile" || exit $?
+ fi
+
+ # Install the old object if enabled.
+ if test "$build_old_libs" = yes; then
+ # Deduce the name of the old-style object file.
+ staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+
+ $show "$install_prog $staticobj $staticdest"
+ $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ fi
+ exit $EXIT_SUCCESS
+ ;;
+
+ *)
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+ destfile="$destdir/$destname"
+ else
+ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ destfile="$destdir/$destfile"
+ fi
+
+ # If the file is missing, and there is a .exe on the end, strip it
+ # because it is most likely a libtool script we actually want to
+ # install
+ stripped_ext=""
+ case $file in
+ *.exe)
+ if test ! -f "$file"; then
+ file=`$echo $file|${SED} 's,.exe$,,'`
+ stripped_ext=".exe"
+ fi
+ ;;
+ esac
+
+ # Do a test to see if this is really a libtool program.
+ case $host in
+ *cygwin*|*mingw*)
+ wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
+ ;;
+ *)
+ wrapper=$file
+ ;;
+ esac
+ if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
+ notinst_deplibs=
+ relink_command=
+
+ # To insure that "foo" is sourced, and not "foo.exe",
+ # finese the cygwin/MSYS system by explicitly sourcing "foo."
+ # which disallows the automatic-append-.exe behavior.
+ case $build in
+ *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+ *) wrapperdot=${wrapper} ;;
+ esac
+ # If there is no directory component, then add one.
+ case $file in
+ */* | *\\*) . ${wrapperdot} ;;
+ *) . ./${wrapperdot} ;;
+ esac
+
+ # Check the variables that should have been set.
+ if test -z "$notinst_deplibs"; then
+ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ finalize=yes
+ for lib in $notinst_deplibs; do
+ # Check to see that each library is installed.
+ libdir=
+ if test -f "$lib"; then
+ # If there is no directory component, then add one.
+ case $lib in
+ */* | *\\*) . $lib ;;
+ *) . ./$lib ;;
+ esac
+ fi
+ libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ if test -n "$libdir" && test ! -f "$libfile"; then
+ $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+ finalize=no
+ fi
+ done
+
+ relink_command=
+ # To insure that "foo" is sourced, and not "foo.exe",
+ # finese the cygwin/MSYS system by explicitly sourcing "foo."
+ # which disallows the automatic-append-.exe behavior.
+ case $build in
+ *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+ *) wrapperdot=${wrapper} ;;
+ esac
+ # If there is no directory component, then add one.
+ case $file in
+ */* | *\\*) . ${wrapperdot} ;;
+ *) . ./${wrapperdot} ;;
+ esac
+
+ outputname=
+ if test "$fast_install" = no && test -n "$relink_command"; then
+ if test "$finalize" = yes && test -z "$run"; then
+ tmpdir="/tmp"
+ test -n "$TMPDIR" && tmpdir="$TMPDIR"
+ tmpdir="$tmpdir/libtool-$$"
+ save_umask=`umask`
+ umask 0077
+ if $mkdir "$tmpdir"; then
+ umask $save_umask
+ else
+ umask $save_umask
+ $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+ continue
+ fi
+ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+ relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+ $show "$relink_command"
+ if $run eval "$relink_command"; then :
+ else
+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+ ${rm}r "$tmpdir"
+ continue
+ fi
+ file="$outputname"
+ else
+ $echo "$modename: warning: cannot relink \`$file'" 1>&2
+ fi
+ else
+ # Install the binary that we compiled earlier.
+ file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ fi
+ fi
+
+ # remove .exe since cygwin /usr/bin/install will append another
+ # one anyways
+ case $install_prog,$host in
+ */usr/bin/install*,*cygwin*)
+ case $file:$destfile in
+ *.exe:*.exe)
+ # this is ok
+ ;;
+ *.exe:*)
+ destfile=$destfile.exe
+ ;;
+ *:*.exe)
+ destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
+ ;;
+ esac
+ ;;
+ esac
+ $show "$install_prog$stripme $file $destfile"
+ $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+ test -n "$outputname" && ${rm}r "$tmpdir"
+ ;;
+ esac
+ done
+
+ for file in $staticlibs; do
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+
+ # Set up the ranlib parameters.
+ oldlib="$destdir/$name"
+
+ $show "$install_prog $file $oldlib"
+ $run eval "$install_prog \$file \$oldlib" || exit $?
+
+ if test -n "$stripme" && test -n "$old_striplib"; then
+ $show "$old_striplib $oldlib"
+ $run eval "$old_striplib $oldlib" || exit $?
+ fi
+
+ # Do each command in the postinstall commands.
+ cmds=$old_postinstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ done
+
+ if test -n "$future_libdirs"; then
+ $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+ fi
+
+ if test -n "$current_libdirs"; then
+ # Maybe just do a dry run.
+ test -n "$run" && current_libdirs=" -n$current_libdirs"
+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ else
+ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+ # libtool finish mode
+ finish)
+ modename="$modename: finish"
+ libdirs="$nonopt"
+ admincmds=
+
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ for dir
+ do
+ libdirs="$libdirs $dir"
+ done
+
+ for libdir in $libdirs; do
+ if test -n "$finish_cmds"; then
+ # Do each command in the finish commands.
+ cmds=$finish_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || admincmds="$admincmds
+ $cmd"
+ done
+ IFS="$save_ifs"
+ fi
+ if test -n "$finish_eval"; then
+ # Do the single finish_eval.
+ eval cmds=\"$finish_eval\"
+ $run eval "$cmds" || admincmds="$admincmds
+ $cmds"
+ fi
+ done
+ fi
+
+ # Exit here if they wanted silent mode.
+ test "$show" = : && exit $EXIT_SUCCESS
+
+ $echo "----------------------------------------------------------------------"
+ $echo "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ $echo " $libdir"
+ done
+ $echo
+ $echo "If you ever happen to want to link against installed libraries"
+ $echo "in a given directory, LIBDIR, you must either use libtool, and"
+ $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ $echo "flag during linking and do at least one of the following:"
+ if test -n "$shlibpath_var"; then
+ $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ $echo " during execution"
+ fi
+ if test -n "$runpath_var"; then
+ $echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ $echo " during linking"
+ fi
+ if test -n "$hardcode_libdir_flag_spec"; then
+ libdir=LIBDIR
+ eval flag=\"$hardcode_libdir_flag_spec\"
+
+ $echo " - use the \`$flag' linker flag"
+ fi
+ if test -n "$admincmds"; then
+ $echo " - have your system administrator run these commands:$admincmds"
+ fi
+ if test -f /etc/ld.so.conf; then
+ $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ fi
+ $echo
+ $echo "See any operating system documentation about shared libraries for"
+ $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+ $echo "----------------------------------------------------------------------"
+ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool execute mode
+ execute)
+ modename="$modename: execute"
+
+ # The first argument is the command name.
+ cmd="$nonopt"
+ if test -z "$cmd"; then
+ $echo "$modename: you must specify a COMMAND" 1>&2
+ $echo "$help"
+ exit $EXIT_FAILURE
+ fi
+
+ # Handle -dlopen flags immediately.
+ for file in $execute_dlfiles; do
+ if test ! -f "$file"; then
+ $echo "$modename: \`$file' is not a file" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ dir=
+ case $file in
+ *.la)
+ # Check to see that this really is a libtool archive.
+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Read the libtool library.
+ dlname=
+ library_names=
+
+ # If there is no directory component, then add one.
+ case $file in
+ */* | *\\*) . $file ;;
+ *) . ./$file ;;
+ esac
+
+ # Skip this library if it cannot be dlopened.
+ if test -z "$dlname"; then
+ # Warn if it was a shared library.
+ test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+ continue
+ fi
+
+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$dir" = "X$file" && dir=.
+
+ if test -f "$dir/$objdir/$dlname"; then
+ dir="$dir/$objdir"
+ else
+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ ;;
+
+ *.lo)
+ # Just add the directory containing the .lo file.
+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$dir" = "X$file" && dir=.
+ ;;
+
+ *)
+ $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+ continue
+ ;;
+ esac
+
+ # Get the absolute pathname.
+ absdir=`cd "$dir" && pwd`
+ test -n "$absdir" && dir="$absdir"
+
+ # Now add the directory to shlibpath_var.
+ if eval "test -z \"\$$shlibpath_var\""; then
+ eval "$shlibpath_var=\"\$dir\""
+ else
+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+ fi
+ done
+
+ # This variable tells wrapper scripts just to set shlibpath_var
+ # rather than running their programs.
+ libtool_execute_magic="$magic"
+
+ # Check if any of the arguments is a wrapper script.
+ args=
+ for file
+ do
+ case $file in
+ -*) ;;
+ *)
+ # Do a test to see if this is really a libtool program.
+ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ # If there is no directory component, then add one.
+ case $file in
+ */* | *\\*) . $file ;;
+ *) . ./$file ;;
+ esac
+
+ # Transform arg to wrapped name.
+ file="$progdir/$program"
+ fi
+ ;;
+ esac
+ # Quote arguments (to preserve shell metacharacters).
+ file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+ args="$args \"$file\""
+ done
+
+ if test -z "$run"; then
+ if test -n "$shlibpath_var"; then
+ # Export the shlibpath_var.
+ eval "export $shlibpath_var"
+ fi
+
+ # Restore saved environment variables
+ if test "${save_LC_ALL+set}" = set; then
+ LC_ALL="$save_LC_ALL"; export LC_ALL
+ fi
+ if test "${save_LANG+set}" = set; then
+ LANG="$save_LANG"; export LANG
+ fi
+
+ # Now prepare to actually exec the command.
+ exec_cmd="\$cmd$args"
+ else
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+ $echo "export $shlibpath_var"
+ fi
+ $echo "$cmd$args"
+ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+ # libtool clean and uninstall mode
+ clean | uninstall)
+ modename="$modename: $mode"
+ rm="$nonopt"
+ files=
+ rmforce=
+ exit_status=0
+
+ # This variable tells wrapper scripts just to set variables rather
+ # than running their programs.
+ libtool_install_magic="$magic"
+
+ for arg
+ do
+ case $arg in
+ -f) rm="$rm $arg"; rmforce=yes ;;
+ -*) rm="$rm $arg" ;;
+ *) files="$files $arg" ;;
+ esac
+ done
+
+ if test -z "$rm"; then
+ $echo "$modename: you must specify an RM program" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ rmdirs=
+
+ origobjdir="$objdir"
+ for file in $files; do
+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$dir" = "X$file"; then
+ dir=.
+ objdir="$origobjdir"
+ else
+ objdir="$dir/$origobjdir"
+ fi
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ test "$mode" = uninstall && objdir="$dir"
+
+ # Remember objdir for removal later, being careful to avoid duplicates
+ if test "$mode" = clean; then
+ case " $rmdirs " in
+ *" $objdir "*) ;;
+ *) rmdirs="$rmdirs $objdir" ;;
+ esac
+ fi
+
+ # Don't error if the file doesn't exist and rm -f was used.
+ if (test -L "$file") >/dev/null 2>&1 \
+ || (test -h "$file") >/dev/null 2>&1 \
+ || test -f "$file"; then
+ :
+ elif test -d "$file"; then
+ exit_status=1
+ continue
+ elif test "$rmforce" = yes; then
+ continue
+ fi
+
+ rmfiles="$file"
+
+ case $name in
+ *.la)
+ # Possibly a libtool archive, so verify it.
+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ . $dir/$name
+
+ # Delete the libtool libraries and symlinks.
+ for n in $library_names; do
+ rmfiles="$rmfiles $objdir/$n"
+ done
+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+ test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+
+ if test "$mode" = uninstall; then
+ if test -n "$library_names"; then
+ # Do each command in the postuninstall commands.
+ cmds=$postuninstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd"
+ if test "$?" -ne 0 && test "$rmforce" != yes; then
+ exit_status=1
+ fi
+ done
+ IFS="$save_ifs"
+ fi
+
+ if test -n "$old_library"; then
+ # Do each command in the old_postuninstall commands.
+ cmds=$old_postuninstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd"
+ if test "$?" -ne 0 && test "$rmforce" != yes; then
+ exit_status=1
+ fi
+ done
+ IFS="$save_ifs"
+ fi
+ # FIXME: should reinstall the best remaining shared library.
+ fi
+ fi
+ ;;
+
+ *.lo)
+ # Possibly a libtool object, so verify it.
+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+
+ # Read the .lo file
+ . $dir/$name
+
+ # Add PIC object to the list of files to remove.
+ if test -n "$pic_object" \
+ && test "$pic_object" != none; then
+ rmfiles="$rmfiles $dir/$pic_object"
+ fi
+
+ # Add non-PIC object to the list of files to remove.
+ if test -n "$non_pic_object" \
+ && test "$non_pic_object" != none; then
+ rmfiles="$rmfiles $dir/$non_pic_object"
+ fi
+ fi
+ ;;
+
+ *)
+ if test "$mode" = clean ; then
+ noexename=$name
+ case $file in
+ *.exe)
+ file=`$echo $file|${SED} 's,.exe$,,'`
+ noexename=`$echo $name|${SED} 's,.exe$,,'`
+ # $file with .exe has already been added to rmfiles,
+ # add $file without .exe
+ rmfiles="$rmfiles $file"
+ ;;
+ esac
+ # Do a test to see if this is a libtool program.
+ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ relink_command=
+ . $dir/$noexename
+
+ # note $name still contains .exe if it was in $file originally
+ # as does the version of $file that was added into $rmfiles
+ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+ if test "$fast_install" = yes && test -n "$relink_command"; then
+ rmfiles="$rmfiles $objdir/lt-$name"
+ fi
+ if test "X$noexename" != "X$name" ; then
+ rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+ fi
+ fi
+ fi
+ ;;
+ esac
+ $show "$rm $rmfiles"
+ $run $rm $rmfiles || exit_status=1
+ done
+ objdir="$origobjdir"
+
+ # Try to remove the ${objdir}s in the directories where we deleted files
+ for dir in $rmdirs; do
+ if test -d "$dir"; then
+ $show "rmdir $dir"
+ $run rmdir $dir >/dev/null 2>&1
+ fi
+ done
+
+ exit $exit_status
+ ;;
+
+ "")
+ $echo "$modename: you must specify a MODE" 1>&2
+ $echo "$generic_help" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test -z "$exec_cmd"; then
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$generic_help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+fi # test -z "$show_help"
+
+if test -n "$exec_cmd"; then
+ eval exec $exec_cmd
+ exit $EXIT_FAILURE
+fi
+
+# We need to display help for each of the modes.
+case $mode in
+"") $echo \
+"Usage: $modename [OPTION]... [MODE-ARG]...
+
+Provide generalized library-building support services.
+
+ --config show all configuration variables
+ --debug enable verbose shell tracing
+-n, --dry-run display commands without modifying any files
+ --features display basic configuration information and exit
+ --finish same as \`--mode=finish'
+ --help display this help message and exit
+ --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS]
+ --quiet same as \`--silent'
+ --silent don't print informational messages
+ --tag=TAG use configuration variables from tag TAG
+ --version print version information
+
+MODE must be one of the following:
+
+ clean remove files from the build directory
+ compile compile a source file into a libtool object
+ execute automatically set library path, then run a program
+ finish complete the installation of libtool libraries
+ install install libraries or executables
+ link create a library or an executable
+ uninstall remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for
+a more detailed description of MODE.
+
+Report bugs to <bug-libtool(a)gnu.org>."
+ exit $EXIT_SUCCESS
+ ;;
+
+clean)
+ $echo \
+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+ ;;
+
+compile)
+ $echo \
+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+ -o OUTPUT-FILE set the output file name to OUTPUT-FILE
+ -prefer-pic try to building PIC objects only
+ -prefer-non-pic try to building non-PIC objects only
+ -static always build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+ ;;
+
+execute)
+ $echo \
+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+ -dlopen FILE add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+ ;;
+
+finish)
+ $echo \
+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges. Use
+the \`--dry-run' option if you just want to see what would be executed."
+ ;;
+
+install)
+ $echo \
+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command. The first component should be
+either the \`install' or \`cp' program.
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+ ;;
+
+link)
+ $echo \
+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+ -all-static do not do any dynamic linking at all
+ -avoid-version do not add a version suffix if possible
+ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+ -export-symbols SYMFILE
+ try to export only the symbols listed in SYMFILE
+ -export-symbols-regex REGEX
+ try to export only the symbols matching REGEX
+ -LLIBDIR search LIBDIR for required installed libraries
+ -lNAME OUTPUT-FILE requires the installed library libNAME
+ -module build a library that can dlopened
+ -no-fast-install disable the fast-install mode
+ -no-install link a not-installable executable
+ -no-undefined declare that a library does not refer to external symbols
+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
+ -objectlist FILE Use a list of object files found in FILE to specify objects
+ -precious-files-regex REGEX
+ don't remove output files matching REGEX
+ -release RELEASE specify package release information
+ -rpath LIBDIR the created library will eventually be installed in LIBDIR
+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
+ -static do not do any dynamic linking of libtool libraries
+ -version-info CURRENT[:REVISION[:AGE]]
+ specify library version info [each variable defaults to 0]
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename. Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+ ;;
+
+uninstall)
+ $echo \
+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+ ;;
+
+*)
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+esac
+
+$echo
+$echo "Try \`$modename --help' for more information about other modes."
+
+exit $EXIT_SUCCESS
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries. Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them. This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration. But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
+# ### BEGIN LIBTOOL TAG CONFIG: CXX
+
+# Libtool was configured on host tegucigalpa:
+
+# Shell to use when invoking shell scripts.
+SHELL="/bin/sh"
+
+# Whether or not to build shared libraries.
+build_libtool_libs=yes
+
+# Whether or not to build static libraries.
+build_old_libs=yes
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=no
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=no
+
+# Whether or not to optimize for fast installation.
+fast_install=yes
+
+# The host system.
+host_alias=
+host=i686-pc-linux-gnu
+
+# An echo program that does not interpret backslashes.
+echo="echo"
+
+# The archiver.
+AR="ar"
+AR_FLAGS="cru"
+
+# A C compiler.
+LTCC="gcc"
+
+# A language-specific compiler.
+CC="g++"
+
+# Is the compiler the GNU C compiler?
+with_gcc=yes
+
+# An ERE matcher.
+EGREP="grep -E"
+
+# The linker used to build libraries.
+LD="/usr/bin/ld"
+
+# Whether we need hard or soft links.
+LN_S="ln -s"
+
+# A BSD-compatible nm program.
+NM="/usr/bin/nm -B"
+
+# A symbol stripping program
+STRIP="strip"
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=file
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="dlltool"
+
+# Used on cygwin: object dumper.
+OBJDUMP="objdump"
+
+# Used on cygwin: assembler.
+AS="as"
+
+# The name of the directory that contains temporary libtool files.
+objdir=.libs
+
+# How to create reloadable object files.
+reload_flag=" -r"
+reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
+
+# How to pass a linker flag through the compiler.
+wl="-Wl,"
+
+# Object file suffix (normally "o").
+objext="o"
+
+# Old archive suffix (normally "a").
+libext="a"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='.so'
+
+# Executable file suffix (normally "").
+exeext=""
+
+# Additional compiler flags for building library objects.
+pic_flag=" -fPIC -DPIC"
+pic_mode=default
+
+# What is the maximum length of a command?
+max_cmd_len=32768
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o="yes"
+
+# Must we lock files when doing compilation ?
+need_locks="no"
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=no
+
+# Do we need a version for libraries?
+need_version=no
+
+# Whether dlopen is supported.
+dlopen_support=unknown
+
+# Whether dlopen of programs is supported.
+dlopen_self=unknown
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=unknown
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag="-static"
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=" -fno-builtin"
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec="\${wl}--export-dynamic"
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=""
+
+# Library versioning type.
+version_type=linux
+
+# Format of library name prefix.
+libname_spec="lib\$name"
+
+# List of archive names. First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
+
+# The coded name of the library, if different from the real name.
+soname_spec="\${libname}\${release}\${shared_ext}\$major"
+
+# Commands used to build and install an old-style archive.
+RANLIB="ranlib"
+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
+old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
+old_postuninstall_cmds=""
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=""
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=""
+
+# Commands used to build and install a shared archive.
+archive_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
+archive_expsym_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib"
+postinstall_cmds=""
+postuninstall_cmds=""
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=""
+module_expsym_cmds=""
+
+# Commands to strip libraries.
+old_striplib="strip --strip-debug"
+striplib="strip --strip-unneeded"
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects="/usr/lib/gcc-lib/i486-linux/3.3.5/../../../crti.o /usr/lib/gcc-lib/i486-linux/3.3.5/crtbeginS.o"
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects="/usr/lib/gcc-lib/i486-linux/3.3.5/crtendS.o /usr/lib/gcc-lib/i486-linux/3.3.5/../../../crtn.o"
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=""
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path="-L/usr/lib/gcc-lib/i486-linux/3.3.5 -L/usr/lib/gcc-lib/i486-linux/3.3.5/../../.."
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method="pass_all"
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd="\$MAGIC_CMD"
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=""
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=""
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=""
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'"
+
+# This is the shared library runtime path variable.
+runpath_var=LD_RUN_PATH
+
+# This is the shared library path variable.
+shlibpath_var=LD_LIBRARY_PATH
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=no
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=immediate
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=yes
+
+# Flag to hardcode $libdir into a binary during linking.
+# This must work even if $libdir does not exist.
+hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
+
+# If ld is used when linking, flag to hardcode $libdir into
+# a binary during linking. This must work even if $libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=""
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=""
+
+# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=no
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=no
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=no
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=no
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux/3.3.5/ /usr/lib/gcc/i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../ /lib/i486-linux/3.3.5/ /lib/ /usr/lib/i486-linux/3.3.5/ /usr/lib/"
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/lib/libc5-compat /lib/libc5-compat /usr/i486-linuxlibc1/lib /usr/lib/sse/atlas /usr/lib/atlas/sse /usr/lib/sse /usr/lib/sse2/atlas /usr/lib/atlas/sse2 /usr/lib/sse2 /usr/lib/atlas "
+
+# Fix the shell variable $srcfile for the compiler.
+fix_srcfile_path=""
+
+# Set to yes if exported symbols are required.
+always_export_symbols=no
+
+# The commands to list exported symbols.
+export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=""
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms=""
+
+# Symbols that must always be exported.
+include_expsyms=""
+
+# ### END LIBTOOL TAG CONFIG: CXX
+
+# ### BEGIN LIBTOOL TAG CONFIG: F77
+
+# Libtool was configured on host tegucigalpa:
+
+# Shell to use when invoking shell scripts.
+SHELL="/bin/sh"
+
+# Whether or not to build shared libraries.
+build_libtool_libs=yes
+
+# Whether or not to build static libraries.
+build_old_libs=yes
+
+# Whether or not to add -lc for building shared libraries.
+build_libtool_need_lc=no
+
+# Whether or not to disallow shared libs when runtime libs are static
+allow_libtool_libs_with_static_runtimes=no
+
+# Whether or not to optimize for fast installation.
+fast_install=yes
+
+# The host system.
+host_alias=
+host=i686-pc-linux-gnu
+
+# An echo program that does not interpret backslashes.
+echo="echo"
+
+# The archiver.
+AR="ar"
+AR_FLAGS="cru"
+
+# A C compiler.
+LTCC="gcc"
+
+# A language-specific compiler.
+CC="g77"
+
+# Is the compiler the GNU C compiler?
+with_gcc=yes
+
+# An ERE matcher.
+EGREP="grep -E"
+
+# The linker used to build libraries.
+LD="/usr/bin/ld"
+
+# Whether we need hard or soft links.
+LN_S="ln -s"
+
+# A BSD-compatible nm program.
+NM="/usr/bin/nm -B"
+
+# A symbol stripping program
+STRIP="strip"
+
+# Used to examine libraries when file_magic_cmd begins "file"
+MAGIC_CMD=file
+
+# Used on cygwin: DLL creation program.
+DLLTOOL="dlltool"
+
+# Used on cygwin: object dumper.
+OBJDUMP="objdump"
+
+# Used on cygwin: assembler.
+AS="as"
+
+# The name of the directory that contains temporary libtool files.
+objdir=.libs
+
+# How to create reloadable object files.
+reload_flag=" -r"
+reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
+
+# How to pass a linker flag through the compiler.
+wl="-Wl,"
+
+# Object file suffix (normally "o").
+objext="o"
+
+# Old archive suffix (normally "a").
+libext="a"
+
+# Shared library suffix (normally ".so").
+shrext_cmds='.so'
+
+# Executable file suffix (normally "").
+exeext=""
+
+# Additional compiler flags for building library objects.
+pic_flag=" -fPIC"
+pic_mode=default
+
+# What is the maximum length of a command?
+max_cmd_len=32768
+
+# Does compiler simultaneously support -c and -o options?
+compiler_c_o="yes"
+
+# Must we lock files when doing compilation ?
+need_locks="no"
+
+# Do we need the lib prefix for modules?
+need_lib_prefix=no
+
+# Do we need a version for libraries?
+need_version=no
+
+# Whether dlopen is supported.
+dlopen_support=unknown
+
+# Whether dlopen of programs is supported.
+dlopen_self=unknown
+
+# Whether dlopen of statically linked programs is supported.
+dlopen_self_static=unknown
+
+# Compiler flag to prevent dynamic linking.
+link_static_flag="-static"
+
+# Compiler flag to turn off builtin functions.
+no_builtin_flag=""
+
+# Compiler flag to allow reflexive dlopens.
+export_dynamic_flag_spec="\${wl}--export-dynamic"
+
+# Compiler flag to generate shared objects directly from archives.
+whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
+
+# Compiler flag to generate thread-safe objects.
+thread_safe_flag_spec=""
+
+# Library versioning type.
+version_type=linux
+
+# Format of library name prefix.
+libname_spec="lib\$name"
+
+# List of archive names. First name is the real one, the rest are links.
+# The last name is the one that the linker finds with -lNAME.
+library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
+
+# The coded name of the library, if different from the real name.
+soname_spec="\${libname}\${release}\${shared_ext}\$major"
+
+# Commands used to build and install an old-style archive.
+RANLIB="ranlib"
+old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
+old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
+old_postuninstall_cmds=""
+
+# Create an old-style archive from a shared archive.
+old_archive_from_new_cmds=""
+
+# Create a temporary old-style archive to link instead of a shared archive.
+old_archive_from_expsyms_cmds=""
+
+# Commands used to build and install a shared archive.
+archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
+archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
+cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
+\$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
+ \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
+postinstall_cmds=""
+postuninstall_cmds=""
+
+# Commands used to build a loadable module (assumed same as above if empty)
+module_cmds=""
+module_expsym_cmds=""
+
+# Commands to strip libraries.
+old_striplib="strip --strip-debug"
+striplib="strip --strip-unneeded"
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predep_objects=""
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdep_objects=""
+
+# Dependencies to place before the objects being linked to create a
+# shared library.
+predeps=""
+
+# Dependencies to place after the objects being linked to create a
+# shared library.
+postdeps=""
+
+# The library search path used internally by the compiler when linking
+# a shared library.
+compiler_lib_search_path=""
+
+# Method to check whether dependent libraries are shared objects.
+deplibs_check_method="pass_all"
+
+# Command to use when deplibs_check_method == file_magic.
+file_magic_cmd="\$MAGIC_CMD"
+
+# Flag that allows shared libraries with undefined symbols to be built.
+allow_undefined_flag=""
+
+# Flag that forces no undefined symbols.
+no_undefined_flag=""
+
+# Commands used to finish a libtool library installation in a directory.
+finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
+
+# Same as above, but a single script fragment to be evaled but not shown.
+finish_eval=""
+
+# Take the output of nm and produce a listing of raw symbols and C names.
+global_symbol_pipe="sed -n -e 's/^.*[ ]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ ][ ]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
+
+# Transform the output of nm in a proper C declaration
+global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
+
+# Transform the output of nm in a C name address pair
+global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/ {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/ {\"\\2\", (lt_ptr) \\&\\2},/p'"
+
+# This is the shared library runtime path variable.
+runpath_var=LD_RUN_PATH
+
+# This is the shared library path variable.
+shlibpath_var=LD_LIBRARY_PATH
+
+# Is shlibpath searched before the hard-coded library search path?
+shlibpath_overrides_runpath=no
+
+# How to hardcode a shared library path into an executable.
+hardcode_action=immediate
+
+# Whether we should hardcode library paths into libraries.
+hardcode_into_libs=yes
+
+# Flag to hardcode $libdir into a binary during linking.
+# This must work even if $libdir does not exist.
+hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
+
+# If ld is used when linking, flag to hardcode $libdir into
+# a binary during linking. This must work even if $libdir does
+# not exist.
+hardcode_libdir_flag_spec_ld=""
+
+# Whether we need a single -rpath flag with a separated argument.
+hardcode_libdir_separator=""
+
+# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
+# resulting binary.
+hardcode_direct=no
+
+# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
+# resulting binary.
+hardcode_minus_L=no
+
+# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
+# the resulting binary.
+hardcode_shlibpath_var=unsupported
+
+# Set to yes if building a shared library automatically hardcodes DIR into the library
+# and all subsequent libraries and executables linked against it.
+hardcode_automatic=no
+
+# Variables whose values should be saved in libtool wrapper scripts and
+# restored at relink time.
+variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+
+# Whether libtool must link a program against all its dependency libraries.
+link_all_deplibs=no
+
+# Compile-time system search path for libraries
+sys_lib_search_path_spec=" /usr/lib/gcc-lib/i486-linux/3.3.5/ /usr/lib/gcc/i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../../i486-linux/lib/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../i486-linux/3.3.5/ /usr/lib/gcc-lib/i486-linux/3.3.5/../../../ /lib/i486-linux/3.3.5/ /lib/ /usr/lib/i486-linux/3.3.5/ /usr/lib/"
+
+# Run-time system search path for libraries
+sys_lib_dlsearch_path_spec="/lib /usr/lib /usr/X11R6/lib /usr/lib/libc5-compat /lib/libc5-compat /usr/i486-linuxlibc1/lib /usr/lib/sse/atlas /usr/lib/atlas/sse /usr/lib/sse /usr/lib/sse2/atlas /usr/lib/atlas/sse2 /usr/lib/sse2 /usr/lib/atlas "
+
+# Fix the shell variable $srcfile for the compiler.
+fix_srcfile_path=""
+
+# Set to yes if exported symbols are required.
+always_export_symbols=no
+
+# The commands to list exported symbols.
+export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
+
+# The commands to extract the exported symbol list from a shared archive.
+extract_expsyms_cmds=""
+
+# Symbols that should not be listed in the preloaded symbols.
+exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
+
+# Symbols that must always be exported.
+include_expsyms=""
+
+# ### END LIBTOOL TAG CONFIG: F77
+
Index: 10.244/config/ltmain.sh
--- 10.244/config/ltmain.sh Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/config/ltmain.sh Fri, 28 Jul 2006 10:11:40 +0200 theo (oln/w/48_ltmain.sh 644)
@@ -0,0 +1,6426 @@
+# ltmain.sh - Provide generalized library-building support services.
+# NOTE: Changing this file will not affect anything until you rerun configure.
+#
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
+# Free Software Foundation, Inc.
+# Originally by Gordon Matzigkeit <gord(a)gnu.ai.mit.edu>, 1996
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+basename="s,^.*/,,g"
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+# The name of this program:
+progname=`echo "$progpath" | $SED $basename`
+modename="$progname"
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+
+PROGRAM=ltmain.sh
+PACKAGE=libtool
+VERSION=1.5.6
+TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
+
+
+# Check that we have a working $echo.
+if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+elif test "X$1" = X--fallback-echo; then
+ # Avoid inline document here, it may be left over
+ :
+elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
+ # Yippee, $echo works!
+ :
+else
+ # Restart under the correct shell, and then maybe $echo will work.
+ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+fi
+
+if test "X$1" = X--fallback-echo; then
+ # used as fallback echo
+ shift
+ cat <<EOF
+$*
+EOF
+ exit $EXIT_SUCCESS
+fi
+
+default_mode=
+help="Try \`$progname --help' for more information."
+magic="%%%MAGIC variable%%%"
+mkdir="mkdir"
+mv="mv -f"
+rm="rm -f"
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed="${SED}"' -e 1s/^X//'
+sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+# test EBCDIC or ASCII
+case `echo A|tr A '\301'` in
+ A) # EBCDIC based system
+ SP2NL="tr '\100' '\n'"
+ NL2SP="tr '\r\n' '\100\100'"
+ ;;
+ *) # Assume ASCII based system
+ SP2NL="tr '\040' '\012'"
+ NL2SP="tr '\015\012' '\040\040'"
+ ;;
+esac
+
+# NLS nuisances.
+# Only set LANG and LC_ALL to C if already set.
+# These must not be set unconditionally because not all systems understand
+# e.g. LANG=C (notably SCO).
+# We save the old values to restore during execute mode.
+if test "${LC_ALL+set}" = set; then
+ save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+fi
+if test "${LANG+set}" = set; then
+ save_LANG="$LANG"; LANG=C; export LANG
+fi
+
+# Make sure IFS has a sensible default
+: ${IFS="
+"}
+
+if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ $echo "$modename: not configured to build any kind of library" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit $EXIT_FAILURE
+fi
+
+# Global variables.
+mode=$default_mode
+nonopt=
+prev=
+prevopt=
+run=
+show="$echo"
+show_help=
+execute_dlfiles=
+lo2o="s/\\.lo\$/.${objext}/"
+o2lo="s/\\.${objext}\$/.lo/"
+
+#####################################
+# Shell function definitions:
+# This seems to be the best place for them
+
+# func_win32_libid arg
+# return the library type of file 'arg'
+#
+# Need a lot of goo to handle *both* DLLs and import libs
+# Has to be a shell function in order to 'eat' the argument
+# that is supplied when $file_magic_command is called.
+func_win32_libid () {
+ win32_libid_type="unknown"
+ win32_fileres=`file -L $1 2>/dev/null`
+ case $win32_fileres in
+ *ar\ archive\ import\ library*) # definitely import
+ win32_libid_type="x86 archive import"
+ ;;
+ *ar\ archive*) # could be an import, or static
+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 | \
+ sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+ if test "X$win32_nmres" = "Ximport" ; then
+ win32_libid_type="x86 archive import"
+ else
+ win32_libid_type="x86 archive static"
+ fi
+ fi
+ ;;
+ *DLL*)
+ win32_libid_type="x86 DLL"
+ ;;
+ *executable*) # but shell scripts are "executable" too...
+ case $win32_fileres in
+ *MS\ Windows\ PE\ Intel*)
+ win32_libid_type="x86 DLL"
+ ;;
+ esac
+ ;;
+ esac
+ $echo $win32_libid_type
+}
+
+
+# func_infer_tag arg
+# Infer tagged configuration to use if any are available and
+# if one wasn't chosen via the "--tag" command line option.
+# Only attempt this if the compiler in the base compile
+# command doesn't match the default compiler.
+# arg is usually of the form 'gcc ...'
+func_infer_tag () {
+ if test -n "$available_tags" && test -z "$tagname"; then
+ CC_quoted=
+ for arg in $CC; do
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+ CC_quoted="$CC_quoted $arg"
+ done
+ case $@ in
+ # Blanks in the command may have been stripped by the calling shell,
+ # but not from the CC environment variable when configure was run.
+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
+ # Blanks at the start of $base_compile will cause this to fail
+ # if we don't check for them as well.
+ *)
+ for z in $available_tags; do
+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
+ # Evaluate the configuration.
+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+ CC_quoted=
+ for arg in $CC; do
+ # Double-quote args containing other shell metacharacters.
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+ CC_quoted="$CC_quoted $arg"
+ done
+ case "$@ " in
+ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
+ # The compiler in the base compile command matches
+ # the one in the tagged configuration.
+ # Assume this is the tagged configuration we want.
+ tagname=$z
+ break
+ ;;
+ esac
+ fi
+ done
+ # If $tagname still isn't set, then no tagged configuration
+ # was found and let the user know that the "--tag" command
+ # line option must be used.
+ if test -z "$tagname"; then
+ $echo "$modename: unable to infer tagged configuration"
+ $echo "$modename: specify a tag with \`--tag'" 1>&2
+ exit $EXIT_FAILURE
+# else
+# $echo "$modename: using $tagname tagged configuration"
+ fi
+ ;;
+ esac
+ fi
+}
+# End of Shell function definitions
+#####################################
+
+# Darwin sucks
+eval std_shrext=\"$shrext_cmds\"
+
+# Parse our command line options once, thoroughly.
+while test "$#" -gt 0
+do
+ arg="$1"
+ shift
+
+ case $arg in
+ -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+
+ # If the previous option needs an argument, assign it.
+ if test -n "$prev"; then
+ case $prev in
+ execute_dlfiles)
+ execute_dlfiles="$execute_dlfiles $arg"
+ ;;
+ tag)
+ tagname="$arg"
+ preserve_args="${preserve_args}=$arg"
+
+ # Check whether tagname contains only valid characters
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ $echo "$progname: invalid tag name: $tagname" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $tagname in
+ CC)
+ # Don't test for the "default" C tag, as we know, it's there, but
+ # not specially marked.
+ ;;
+ *)
+ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+ taglist="$taglist $tagname"
+ # Evaluate the configuration.
+ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+ else
+ $echo "$progname: ignoring unknown tag $tagname" 1>&2
+ fi
+ ;;
+ esac
+ ;;
+ *)
+ eval "$prev=\$arg"
+ ;;
+ esac
+
+ prev=
+ prevopt=
+ continue
+ fi
+
+ # Have we seen a non-optional argument yet?
+ case $arg in
+ --help)
+ show_help=yes
+ ;;
+
+ --version)
+ $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+ $echo
+ $echo "Copyright (C) 2003 Free Software Foundation, Inc."
+ $echo "This is free software; see the source for copying conditions. There is NO"
+ $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+ exit $EXIT_SUCCESS
+ ;;
+
+ --config)
+ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+ # Now print the configurations for the tags.
+ for tagname in $taglist; do
+ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+ done
+ exit $EXIT_SUCCESS
+ ;;
+
+ --debug)
+ $echo "$progname: enabling shell trace mode"
+ set -x
+ preserve_args="$preserve_args $arg"
+ ;;
+
+ --dry-run | -n)
+ run=:
+ ;;
+
+ --features)
+ $echo "host: $host"
+ if test "$build_libtool_libs" = yes; then
+ $echo "enable shared libraries"
+ else
+ $echo "disable shared libraries"
+ fi
+ if test "$build_old_libs" = yes; then
+ $echo "enable static libraries"
+ else
+ $echo "disable static libraries"
+ fi
+ exit $EXIT_SUCCESS
+ ;;
+
+ --finish) mode="finish" ;;
+
+ --mode) prevopt="--mode" prev=mode ;;
+ --mode=*) mode="$optarg" ;;
+
+ --preserve-dup-deps) duplicate_deps="yes" ;;
+
+ --quiet | --silent)
+ show=:
+ preserve_args="$preserve_args $arg"
+ ;;
+
+ --tag) prevopt="--tag" prev=tag ;;
+ --tag=*)
+ set tag "$optarg" ${1+"$@"}
+ shift
+ prev=tag
+ preserve_args="$preserve_args --tag"
+ ;;
+
+ -dlopen)
+ prevopt="-dlopen"
+ prev=execute_dlfiles
+ ;;
+
+ -*)
+ $echo "$modename: unrecognized option \`$arg'" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+
+ *)
+ nonopt="$arg"
+ break
+ ;;
+ esac
+done
+
+if test -n "$prevopt"; then
+ $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+fi
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end. This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+if test -z "$show_help"; then
+
+ # Infer the operation mode.
+ if test -z "$mode"; then
+ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+ $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
+ case $nonopt in
+ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+ mode=link
+ for arg
+ do
+ case $arg in
+ -c)
+ mode=compile
+ break
+ ;;
+ esac
+ done
+ ;;
+ *db | *dbx | *strace | *truss)
+ mode=execute
+ ;;
+ *install*|cp|mv)
+ mode=install
+ ;;
+ *rm)
+ mode=uninstall
+ ;;
+ *)
+ # If we have no mode, but dlfiles were specified, then do execute mode.
+ test -n "$execute_dlfiles" && mode=execute
+
+ # Just use the default operation mode.
+ if test -z "$mode"; then
+ if test -n "$nonopt"; then
+ $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
+ else
+ $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
+ fi
+ fi
+ ;;
+ esac
+ fi
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
+ $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+ generic_help="$help"
+ help="Try \`$modename --help --mode=$mode' for more information."
+
+ # These modes are in order of execution frequency so that they run quickly.
+ case $mode in
+ # libtool compile mode
+ compile)
+ modename="$modename: compile"
+ # Get the compilation command and the source file.
+ base_compile=
+ srcfile="$nonopt" # always keep a non-empty value in "srcfile"
+ suppress_opt=yes
+ suppress_output=
+ arg_mode=normal
+ libobj=
+ later=
+
+ for arg
+ do
+ case "$arg_mode" in
+ arg )
+ # do not "continue". Instead, add this to base_compile
+ lastarg="$arg"
+ arg_mode=normal
+ ;;
+
+ target )
+ libobj="$arg"
+ arg_mode=normal
+ continue
+ ;;
+
+ normal )
+ # Accept any command-line options.
+ case $arg in
+ -o)
+ if test -n "$libobj" ; then
+ $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ arg_mode=target
+ continue
+ ;;
+
+ -static | -prefer-pic | -prefer-non-pic)
+ later="$later $arg"
+ continue
+ ;;
+
+ -no-suppress)
+ suppress_opt=no
+ continue
+ ;;
+
+ -Xcompiler)
+ arg_mode=arg # the next one goes into the "base_compile" arg list
+ continue # The current "srcfile" will either be retained or
+ ;; # replaced later. I would guess that would be a bug.
+
+ -Wc,*)
+ args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ lastarg=
+ save_ifs="$IFS"; IFS=','
+ for arg in $args; do
+ IFS="$save_ifs"
+
+ # Double-quote args containing other shell metacharacters.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+ lastarg="$lastarg $arg"
+ done
+ IFS="$save_ifs"
+ lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
+
+ # Add the arguments to base_compile.
+ base_compile="$base_compile $lastarg"
+ continue
+ ;;
+
+ * )
+ # Accept the current argument as the source file.
+ # The previous "srcfile" becomes the current argument.
+ #
+ lastarg="$srcfile"
+ srcfile="$arg"
+ ;;
+ esac # case $arg
+ ;;
+ esac # case $arg_mode
+
+ # Aesthetically quote the previous argument.
+ lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
+
+ case $lastarg in
+ # Double-quote args containing other shell metacharacters.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ lastarg="\"$lastarg\""
+ ;;
+ esac
+
+ base_compile="$base_compile $lastarg"
+ done # for arg
+
+ case $arg_mode in
+ arg)
+ $echo "$modename: you must specify an argument for -Xcompile"
+ exit $EXIT_FAILURE
+ ;;
+ target)
+ $echo "$modename: you must specify a target with \`-o'" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ *)
+ # Get the name of the library object.
+ [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
+ ;;
+ esac
+
+ # Recognize several different file suffixes.
+ # If the user specifies -o file.o, it is replaced with file.lo
+ xform='[cCFSifmso]'
+ case $libobj in
+ *.ada) xform=ada ;;
+ *.adb) xform=adb ;;
+ *.ads) xform=ads ;;
+ *.asm) xform=asm ;;
+ *.c++) xform=c++ ;;
+ *.cc) xform=cc ;;
+ *.ii) xform=ii ;;
+ *.class) xform=class ;;
+ *.cpp) xform=cpp ;;
+ *.cxx) xform=cxx ;;
+ *.f90) xform=f90 ;;
+ *.for) xform=for ;;
+ *.java) xform=java ;;
+ esac
+
+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+
+ case $libobj in
+ *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+ *)
+ $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ func_infer_tag $base_compile
+
+ for arg in $later; do
+ case $arg in
+ -static)
+ build_old_libs=yes
+ continue
+ ;;
+
+ -prefer-pic)
+ pic_mode=yes
+ continue
+ ;;
+
+ -prefer-non-pic)
+ pic_mode=no
+ continue
+ ;;
+ esac
+ done
+
+ objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$obj"; then
+ xdir=
+ else
+ xdir=$xdir/
+ fi
+ lobj=${xdir}$objdir/$objname
+
+ if test -z "$base_compile"; then
+ $echo "$modename: you must specify a compilation command" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Delete any leftover library objects.
+ if test "$build_old_libs" = yes; then
+ removelist="$obj $lobj $libobj ${libobj}T"
+ else
+ removelist="$lobj $libobj ${libobj}T"
+ fi
+
+ $run $rm $removelist
+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+
+ # On Cygwin there's no "real" PIC flag so we must build both object types
+ case $host_os in
+ cygwin* | mingw* | pw32* | os2*)
+ pic_mode=default
+ ;;
+ esac
+ if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ # non-PIC code in shared libraries is not supported
+ pic_mode=default
+ fi
+
+ # Calculate the filename of the output object if compiler does
+ # not support -o with -c
+ if test "$compiler_c_o" = no; then
+ output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ lockfile="$output_obj.lock"
+ removelist="$removelist $output_obj $lockfile"
+ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+ else
+ output_obj=
+ need_locks=no
+ lockfile=
+ fi
+
+ # Lock this critical section if it is needed
+ # We use this script file to make the link, it avoids creating a new file
+ if test "$need_locks" = yes; then
+ until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ $show "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+ elif test "$need_locks" = warn; then
+ if test -f "$lockfile"; then
+ $echo "\
+*** ERROR, $lockfile exists and contains:
+`cat $lockfile 2>/dev/null`
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together. If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+ $run $rm $removelist
+ exit $EXIT_FAILURE
+ fi
+ $echo $srcfile > "$lockfile"
+ fi
+
+ if test -n "$fix_srcfile_path"; then
+ eval srcfile=\"$fix_srcfile_path\"
+ fi
+
+ $run $rm "$libobj" "${libobj}T"
+
+ # Create a libtool object file (analogous to a ".la" file),
+ # but don't create it if we're doing a dry run.
+ test -z "$run" && cat > ${libobj}T <<EOF
+# $libobj - a libtool object file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# Name of the PIC object.
+EOF
+
+ # Only build a PIC object if we are building libtool libraries.
+ if test "$build_libtool_libs" = yes; then
+ # Without this assignment, base_compile gets emptied.
+ fbsd_hideous_sh_bug=$base_compile
+
+ if test "$pic_mode" != no; then
+ command="$base_compile $srcfile $pic_flag"
+ else
+ # Don't build PIC code
+ command="$base_compile $srcfile"
+ fi
+
+ if test ! -d "${xdir}$objdir"; then
+ $show "$mkdir ${xdir}$objdir"
+ $run $mkdir ${xdir}$objdir
+ status=$?
+ if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+ exit $status
+ fi
+ fi
+
+ if test -z "$output_obj"; then
+ # Place PIC objects in $objdir
+ command="$command -o $lobj"
+ fi
+
+ $run $rm "$lobj" "$output_obj"
+
+ $show "$command"
+ if $run eval "$command"; then :
+ else
+ test -n "$output_obj" && $run $rm $removelist
+ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+ $echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together. If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+ $run $rm $removelist
+ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed, then go on to compile the next one
+ if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
+ $show "$mv $output_obj $lobj"
+ if $run $mv $output_obj $lobj; then :
+ else
+ error=$?
+ $run $rm $removelist
+ exit $error
+ fi
+ fi
+
+ # Append the name of the PIC object to the libtool object file.
+ test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object='$objdir/$objname'
+
+EOF
+
+ # Allow error messages only from the first compilation.
+ if test "$suppress_opt" = yes; then
+ suppress_output=' >/dev/null 2>&1'
+ fi
+ else
+ # No PIC object so indicate it doesn't exist in the libtool
+ # object file.
+ test -z "$run" && cat >> ${libobj}T <<EOF
+pic_object=none
+
+EOF
+ fi
+
+ # Only build a position-dependent object if we build old libraries.
+ if test "$build_old_libs" = yes; then
+ if test "$pic_mode" != yes; then
+ # Don't build PIC code
+ command="$base_compile $srcfile"
+ else
+ command="$base_compile $srcfile $pic_flag"
+ fi
+ if test "$compiler_c_o" = yes; then
+ command="$command -o $obj"
+ fi
+
+ # Suppress compiler output if we already did a PIC compilation.
+ command="$command$suppress_output"
+ $run $rm "$obj" "$output_obj"
+ $show "$command"
+ if $run eval "$command"; then :
+ else
+ $run $rm $removelist
+ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+ test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
+ $echo "\
+*** ERROR, $lockfile contains:
+`cat $lockfile 2>/dev/null`
+
+but it should contain:
+$srcfile
+
+This indicates that another process is trying to use the same
+temporary object file, and libtool could not work around it because
+your compiler does not support \`-c' and \`-o' together. If you
+repeat this compilation, it may succeed, by chance, but you had better
+avoid parallel builds (make -j) in this platform, or get a better
+compiler."
+
+ $run $rm $removelist
+ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed
+ if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
+ $show "$mv $output_obj $obj"
+ if $run $mv $output_obj $obj; then :
+ else
+ error=$?
+ $run $rm $removelist
+ exit $error
+ fi
+ fi
+
+ # Append the name of the non-PIC object the libtool object file.
+ # Only append if the libtool object file exists.
+ test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object='$objname'
+
+EOF
+ else
+ # Append the name of the non-PIC object the libtool object file.
+ # Only append if the libtool object file exists.
+ test -z "$run" && cat >> ${libobj}T <<EOF
+# Name of the non-PIC object.
+non_pic_object=none
+
+EOF
+ fi
+
+ $run $mv "${libobj}T" "${libobj}"
+
+ # Unlock the critical section if it was locked
+ if test "$need_locks" != no; then
+ $run $rm "$lockfile"
+ fi
+
+ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool link mode
+ link | relink)
+ modename="$modename: link"
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ # It is impossible to link a dll without this setting, and
+ # we shouldn't force the makefile maintainer to figure out
+ # which system we are compiling for in order to pass an extra
+ # flag for every libtool invocation.
+ # allow_undefined=no
+
+ # FIXME: Unfortunately, there are problems with the above when trying
+ # to make a dll which has undefined symbols, in which case not
+ # even a static library is built. For now, we need to specify
+ # -no-undefined on the libtool link line when we can be certain
+ # that all symbols are satisfied, otherwise we get a static library.
+ allow_undefined=yes
+ ;;
+ *)
+ allow_undefined=yes
+ ;;
+ esac
+ libtool_args="$nonopt"
+ base_compile="$nonopt $@"
+ compile_command="$nonopt"
+ finalize_command="$nonopt"
+
+ compile_rpath=
+ finalize_rpath=
+ compile_shlibpath=
+ finalize_shlibpath=
+ convenience=
+ old_convenience=
+ deplibs=
+ old_deplibs=
+ compiler_flags=
+ linker_flags=
+ dllsearchpath=
+ lib_search_path=`pwd`
+ inst_prefix_dir=
+
+ avoid_version=no
+ dlfiles=
+ dlprefiles=
+ dlself=no
+ export_dynamic=no
+ export_symbols=
+ export_symbols_regex=
+ generated=
+ libobjs=
+ ltlibs=
+ module=no
+ no_install=no
+ objs=
+ non_pic_objects=
+ precious_files_regex=
+ prefer_static_libs=no
+ preload=no
+ prev=
+ prevarg=
+ release=
+ rpath=
+ xrpath=
+ perm_rpath=
+ temp_rpath=
+ thread_safe=no
+ vinfo=
+ vinfo_number=no
+
+ func_infer_tag $base_compile
+
+ # We need to know -static, to get the right output filenames.
+ for arg
+ do
+ case $arg in
+ -all-static | -static)
+ if test "X$arg" = "X-all-static"; then
+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ fi
+ if test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ else
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+ fi
+ build_libtool_libs=no
+ build_old_libs=yes
+ prefer_static_libs=yes
+ break
+ ;;
+ esac
+ done
+
+ # See if our shared archives depend on static archives.
+ test -n "$old_archive_from_new_cmds" && build_old_libs=yes
+
+ # Go through the arguments, transforming them on the way.
+ while test "$#" -gt 0; do
+ arg="$1"
+ shift
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
+ ;;
+ *) qarg=$arg ;;
+ esac
+ libtool_args="$libtool_args $qarg"
+
+ # If the previous option needs an argument, assign it.
+ if test -n "$prev"; then
+ case $prev in
+ output)
+ compile_command="$compile_command @OUTPUT@"
+ finalize_command="$finalize_command @OUTPUT@"
+ ;;
+ esac
+
+ case $prev in
+ dlfiles|dlprefiles)
+ if test "$preload" = no; then
+ # Add the symbol object into the linking commands.
+ compile_command="$compile_command @SYMFILE@"
+ finalize_command="$finalize_command @SYMFILE@"
+ preload=yes
+ fi
+ case $arg in
+ *.la | *.lo) ;; # We handle these cases below.
+ force)
+ if test "$dlself" = no; then
+ dlself=needless
+ export_dynamic=yes
+ fi
+ prev=
+ continue
+ ;;
+ self)
+ if test "$prev" = dlprefiles; then
+ dlself=yes
+ elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ dlself=yes
+ else
+ dlself=needless
+ export_dynamic=yes
+ fi
+ prev=
+ continue
+ ;;
+ *)
+ if test "$prev" = dlfiles; then
+ dlfiles="$dlfiles $arg"
+ else
+ dlprefiles="$dlprefiles $arg"
+ fi
+ prev=
+ continue
+ ;;
+ esac
+ ;;
+ expsyms)
+ export_symbols="$arg"
+ if test ! -f "$arg"; then
+ $echo "$modename: symbol file \`$arg' does not exist"
+ exit $EXIT_FAILURE
+ fi
+ prev=
+ continue
+ ;;
+ expsyms_regex)
+ export_symbols_regex="$arg"
+ prev=
+ continue
+ ;;
+ inst_prefix)
+ inst_prefix_dir="$arg"
+ prev=
+ continue
+ ;;
+ precious_regex)
+ precious_files_regex="$arg"
+ prev=
+ continue
+ ;;
+ release)
+ release="-$arg"
+ prev=
+ continue
+ ;;
+ objectlist)
+ if test -f "$arg"; then
+ save_arg=$arg
+ moreargs=
+ for fil in `cat $save_arg`
+ do
+# moreargs="$moreargs $fil"
+ arg=$fil
+ # A libtool-controlled object.
+
+ # Check to see that this really is a libtool object.
+ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ pic_object=
+ non_pic_object=
+
+ # Read the .lo file
+ # If there is no directory component, then add one.
+ case $arg in
+ */* | *\\*) . $arg ;;
+ *) . ./$arg ;;
+ esac
+
+ if test -z "$pic_object" || \
+ test -z "$non_pic_object" ||
+ test "$pic_object" = none && \
+ test "$non_pic_object" = none; then
+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Extract subdirectory from the argument.
+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$arg"; then
+ xdir=
+ else
+ xdir="$xdir/"
+ fi
+
+ if test "$pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+ pic_object="$xdir$pic_object"
+
+ if test "$prev" = dlfiles; then
+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ dlfiles="$dlfiles $pic_object"
+ prev=
+ continue
+ else
+ # If libtool objects are unsupported, then we need to preload.
+ prev=dlprefiles
+ fi
+ fi
+
+ # CHECK ME: I think I busted this. -Ossama
+ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+ dlprefiles="$dlprefiles $pic_object"
+ prev=
+ fi
+
+ # A PIC object.
+ libobjs="$libobjs $pic_object"
+ arg="$pic_object"
+ fi
+
+ # Non-PIC object.
+ if test "$non_pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+ non_pic_object="$xdir$non_pic_object"
+
+ # A standard non-PIC object
+ non_pic_objects="$non_pic_objects $non_pic_object"
+ if test -z "$pic_object" || test "$pic_object" = none ; then
+ arg="$non_pic_object"
+ fi
+ fi
+ else
+ # Only an error if not doing a dry-run.
+ if test -z "$run"; then
+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+ exit $EXIT_FAILURE
+ else
+ # Dry-run case.
+
+ # Extract subdirectory from the argument.
+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$arg"; then
+ xdir=
+ else
+ xdir="$xdir/"
+ fi
+
+ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+ libobjs="$libobjs $pic_object"
+ non_pic_objects="$non_pic_objects $non_pic_object"
+ fi
+ fi
+ done
+ else
+ $echo "$modename: link input file \`$save_arg' does not exist"
+ exit $EXIT_FAILURE
+ fi
+ arg=$save_arg
+ prev=
+ continue
+ ;;
+ rpath | xrpath)
+ # We need an absolute path.
+ case $arg in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+ if test "$prev" = rpath; then
+ case "$rpath " in
+ *" $arg "*) ;;
+ *) rpath="$rpath $arg" ;;
+ esac
+ else
+ case "$xrpath " in
+ *" $arg "*) ;;
+ *) xrpath="$xrpath $arg" ;;
+ esac
+ fi
+ prev=
+ continue
+ ;;
+ xcompiler)
+ compiler_flags="$compiler_flags $qarg"
+ prev=
+ compile_command="$compile_command $qarg"
+ finalize_command="$finalize_command $qarg"
+ continue
+ ;;
+ xlinker)
+ linker_flags="$linker_flags $qarg"
+ compiler_flags="$compiler_flags $wl$qarg"
+ prev=
+ compile_command="$compile_command $wl$qarg"
+ finalize_command="$finalize_command $wl$qarg"
+ continue
+ ;;
+ xcclinker)
+ linker_flags="$linker_flags $qarg"
+ compiler_flags="$compiler_flags $qarg"
+ prev=
+ compile_command="$compile_command $qarg"
+ finalize_command="$finalize_command $qarg"
+ continue
+ ;;
+ shrext)
+ shrext_cmds="$arg"
+ prev=
+ continue
+ ;;
+ *)
+ eval "$prev=\"\$arg\""
+ prev=
+ continue
+ ;;
+ esac
+ fi # test -n "$prev"
+
+ prevarg="$arg"
+
+ case $arg in
+ -all-static)
+ if test -n "$link_static_flag"; then
+ compile_command="$compile_command $link_static_flag"
+ finalize_command="$finalize_command $link_static_flag"
+ fi
+ continue
+ ;;
+
+ -allow-undefined)
+ # FIXME: remove this flag sometime in the future.
+ $echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
+ continue
+ ;;
+
+ -avoid-version)
+ avoid_version=yes
+ continue
+ ;;
+
+ -dlopen)
+ prev=dlfiles
+ continue
+ ;;
+
+ -dlpreopen)
+ prev=dlprefiles
+ continue
+ ;;
+
+ -export-dynamic)
+ export_dynamic=yes
+ continue
+ ;;
+
+ -export-symbols | -export-symbols-regex)
+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ $echo "$modename: more than one -exported-symbols argument is not allowed"
+ exit $EXIT_FAILURE
+ fi
+ if test "X$arg" = "X-export-symbols"; then
+ prev=expsyms
+ else
+ prev=expsyms_regex
+ fi
+ continue
+ ;;
+
+ -inst-prefix-dir)
+ prev=inst_prefix
+ continue
+ ;;
+
+ # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
+ # so, if we see these flags be careful not to treat them like -L
+ -L[A-Z][A-Z]*:*)
+ case $with_gcc/$host in
+ no/*-*-irix* | /*-*-irix*)
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ ;;
+ esac
+ continue
+ ;;
+
+ -L*)
+ dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+ $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ dir="$absdir"
+ ;;
+ esac
+ case "$deplibs " in
+ *" -L$dir "*) ;;
+ *)
+ deplibs="$deplibs -L$dir"
+ lib_search_path="$lib_search_path $dir"
+ ;;
+ esac
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ case :$dllsearchpath: in
+ *":$dir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$dir";;
+ esac
+ ;;
+ esac
+ continue
+ ;;
+
+ -l*)
+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ case $host in
+ *-*-cygwin* | *-*-pw32* | *-*-beos*)
+ # These systems don't actually have a C or math library (as such)
+ continue
+ ;;
+ *-*-mingw* | *-*-os2*)
+ # These systems don't actually have a C library (as such)
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-openbsd* | *-*-freebsd*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C and math libraries are in the System framework
+ deplibs="$deplibs -framework System"
+ continue
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+ *-*-openbsd* | *-*-freebsd*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+ esac
+ fi
+ deplibs="$deplibs $arg"
+ continue
+ ;;
+
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ deplibs="$deplibs $arg"
+ continue
+ ;;
+
+ -module)
+ module=yes
+ continue
+ ;;
+
+ # gcc -m* arguments should be passed to the linker via $compiler_flags
+ # in order to pass architecture information to the linker
+ # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo
+ # but this is not reliable with gcc because gcc may use -mfoo to
+ # select a different linker, different libraries, etc, while
+ # -Wl,-mfoo simply passes -mfoo to the linker.
+ -m*)
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ if test "$with_gcc" = "yes" ; then
+ compiler_flags="$compiler_flags $arg"
+ fi
+ continue
+ ;;
+
+ -shrext)
+ prev=shrext
+ continue
+ ;;
+
+ -no-fast-install)
+ fast_install=no
+ continue
+ ;;
+
+ -no-install)
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ # The PATH hackery in wrapper scripts is required on Windows
+ # in order for the loader to find any dlls it needs.
+ $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ fast_install=no
+ ;;
+ *) no_install=yes ;;
+ esac
+ continue
+ ;;
+
+ -no-undefined)
+ allow_undefined=no
+ continue
+ ;;
+
+ -objectlist)
+ prev=objectlist
+ continue
+ ;;
+
+ -o) prev=output ;;
+
+ -precious-files-regex)
+ prev=precious_regex
+ continue
+ ;;
+
+ -release)
+ prev=release
+ continue
+ ;;
+
+ -rpath)
+ prev=rpath
+ continue
+ ;;
+
+ -R)
+ prev=xrpath
+ continue
+ ;;
+
+ -R*)
+ dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+ case "$xrpath " in
+ *" $dir "*) ;;
+ *) xrpath="$xrpath $dir" ;;
+ esac
+ continue
+ ;;
+
+ -static)
+ # The effects of -static are defined in a previous loop.
+ # We used to do the same as -all-static on platforms that
+ # didn't have a PIC flag, but the assumption that the effects
+ # would be equivalent was wrong. It would break on at least
+ # Digital Unix and AIX.
+ continue
+ ;;
+
+ -thread-safe)
+ thread_safe=yes
+ continue
+ ;;
+
+ -version-info)
+ prev=vinfo
+ continue
+ ;;
+ -version-number)
+ prev=vinfo
+ vinfo_number=yes
+ continue
+ ;;
+
+ -Wc,*)
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
+ arg=
+ save_ifs="$IFS"; IFS=','
+ for flag in $args; do
+ IFS="$save_ifs"
+ case $flag in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ flag="\"$flag\""
+ ;;
+ esac
+ arg="$arg $wl$flag"
+ compiler_flags="$compiler_flags $flag"
+ done
+ IFS="$save_ifs"
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ ;;
+
+ -Wl,*)
+ args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ arg=
+ save_ifs="$IFS"; IFS=','
+ for flag in $args; do
+ IFS="$save_ifs"
+ case $flag in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ flag="\"$flag\""
+ ;;
+ esac
+ arg="$arg $wl$flag"
+ compiler_flags="$compiler_flags $wl$flag"
+ linker_flags="$linker_flags $flag"
+ done
+ IFS="$save_ifs"
+ arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ ;;
+
+ -Xcompiler)
+ prev=xcompiler
+ continue
+ ;;
+
+ -Xlinker)
+ prev=xlinker
+ continue
+ ;;
+
+ -XCClinker)
+ prev=xcclinker
+ continue
+ ;;
+
+ # Some other compiler flag.
+ -* | +*)
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+ ;;
+
+ *.$objext)
+ # A standard object.
+ objs="$objs $arg"
+ ;;
+
+ *.lo)
+ # A libtool-controlled object.
+
+ # Check to see that this really is a libtool object.
+ if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ pic_object=
+ non_pic_object=
+
+ # Read the .lo file
+ # If there is no directory component, then add one.
+ case $arg in
+ */* | *\\*) . $arg ;;
+ *) . ./$arg ;;
+ esac
+
+ if test -z "$pic_object" || \
+ test -z "$non_pic_object" ||
+ test "$pic_object" = none && \
+ test "$non_pic_object" = none; then
+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Extract subdirectory from the argument.
+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$arg"; then
+ xdir=
+ else
+ xdir="$xdir/"
+ fi
+
+ if test "$pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+ pic_object="$xdir$pic_object"
+
+ if test "$prev" = dlfiles; then
+ if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ dlfiles="$dlfiles $pic_object"
+ prev=
+ continue
+ else
+ # If libtool objects are unsupported, then we need to preload.
+ prev=dlprefiles
+ fi
+ fi
+
+ # CHECK ME: I think I busted this. -Ossama
+ if test "$prev" = dlprefiles; then
+ # Preload the old-style object.
+ dlprefiles="$dlprefiles $pic_object"
+ prev=
+ fi
+
+ # A PIC object.
+ libobjs="$libobjs $pic_object"
+ arg="$pic_object"
+ fi
+
+ # Non-PIC object.
+ if test "$non_pic_object" != none; then
+ # Prepend the subdirectory the object is found in.
+ non_pic_object="$xdir$non_pic_object"
+
+ # A standard non-PIC object
+ non_pic_objects="$non_pic_objects $non_pic_object"
+ if test -z "$pic_object" || test "$pic_object" = none ; then
+ arg="$non_pic_object"
+ fi
+ fi
+ else
+ # Only an error if not doing a dry-run.
+ if test -z "$run"; then
+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+ exit $EXIT_FAILURE
+ else
+ # Dry-run case.
+
+ # Extract subdirectory from the argument.
+ xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$arg"; then
+ xdir=
+ else
+ xdir="$xdir/"
+ fi
+
+ pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
+ non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
+ libobjs="$libobjs $pic_object"
+ non_pic_objects="$non_pic_objects $non_pic_object"
+ fi
+ fi
+ ;;
+
+ *.$libext)
+ # An archive.
+ deplibs="$deplibs $arg"
+ old_deplibs="$old_deplibs $arg"
+ continue
+ ;;
+
+ *.la)
+ # A libtool-controlled library.
+
+ if test "$prev" = dlfiles; then
+ # This library was specified with -dlopen.
+ dlfiles="$dlfiles $arg"
+ prev=
+ elif test "$prev" = dlprefiles; then
+ # The library was specified with -dlpreopen.
+ dlprefiles="$dlprefiles $arg"
+ prev=
+ else
+ deplibs="$deplibs $arg"
+ fi
+ continue
+ ;;
+
+ # Some other compiler argument.
+ *)
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+ ;;
+ esac # arg
+
+ # Now actually substitute the argument into the commands.
+ if test -n "$arg"; then
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ fi
+ done # argument parsing loop
+
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+ eval arg=\"$export_dynamic_flag_spec\"
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+ fi
+
+ oldlibs=
+ # calculate the name of the file, without its directory
+ outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
+ libobjs_save="$libobjs"
+
+ if test -n "$shlibpath_var"; then
+ # get the directories listed in $shlibpath_var
+ eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+ else
+ shlib_search_path=
+ fi
+ eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
+ eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+
+ output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$output_objdir" = "X$output"; then
+ output_objdir="$objdir"
+ else
+ output_objdir="$output_objdir/$objdir"
+ fi
+ # Create the object directory.
+ if test ! -d "$output_objdir"; then
+ $show "$mkdir $output_objdir"
+ $run $mkdir $output_objdir
+ status=$?
+ if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+ exit $status
+ fi
+ fi
+
+ # Determine the type of output
+ case $output in
+ "")
+ $echo "$modename: you must specify an output file" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ *.$libext) linkmode=oldlib ;;
+ *.lo | *.$objext) linkmode=obj ;;
+ *.la) linkmode=lib ;;
+ *) linkmode=prog ;; # Anything else should be a program.
+ esac
+
+ case $host in
+ *cygwin* | *mingw* | *pw32*)
+ # don't eliminate duplications in $postdeps and $predeps
+ duplicate_compiler_generated_deps=yes
+ ;;
+ *)
+ duplicate_compiler_generated_deps=$duplicate_deps
+ ;;
+ esac
+ specialdeplibs=
+
+ libs=
+ # Find all interdependent deplibs by searching for libraries
+ # that are linked more than once (e.g. -la -lb -la)
+ for deplib in $deplibs; do
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ libs="$libs $deplib"
+ done
+
+ if test "$linkmode" = lib; then
+ libs="$predeps $libs $compiler_lib_search_path $postdeps"
+
+ # Compute libraries that are listed more than once in $predeps
+ # $postdeps and mark them as special (i.e., whose duplicates are
+ # not to be eliminated).
+ pre_post_deps=
+ if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
+ for pre_post_dep in $predeps $postdeps; do
+ case "$pre_post_deps " in
+ *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+ esac
+ pre_post_deps="$pre_post_deps $pre_post_dep"
+ done
+ fi
+ pre_post_deps=
+ fi
+
+ deplibs=
+ newdependency_libs=
+ newlib_search_path=
+ need_relink=no # whether we're linking any uninstalled libtool libraries
+ notinst_deplibs= # not-installed libtool libraries
+ notinst_path= # paths that contain not-installed libtool libraries
+ case $linkmode in
+ lib)
+ passes="conv link"
+ for file in $dlfiles $dlprefiles; do
+ case $file in
+ *.la) ;;
+ *)
+ $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+ ;;
+ prog)
+ compile_deplibs=
+ finalize_deplibs=
+ alldeplibs=no
+ newdlfiles=
+ newdlprefiles=
+ passes="conv scan dlopen dlpreopen link"
+ ;;
+ *) passes="conv"
+ ;;
+ esac
+ for pass in $passes; do
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan"; then
+ libs="$deplibs"
+ deplibs=
+ fi
+ if test "$linkmode" = prog; then
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+ link)
+ libs="$deplibs %DEPLIBS%"
+ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+ ;;
+ esac
+ fi
+ if test "$pass" = dlopen; then
+ # Collect dlpreopened libraries
+ save_deplibs="$deplibs"
+ deplibs=
+ fi
+ for deplib in $libs; do
+ lib=
+ found=no
+ case $deplib in
+ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ fi
+ continue
+ ;;
+ -l*)
+ if test "$linkmode" != lib && test "$linkmode" != prog; then
+ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ continue
+ fi
+ name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+ for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ for search_ext in .la $std_shrext .so .a; do
+ # Search the libtool library
+ lib="$searchdir/lib${name}${search_ext}"
+ if test -f "$lib"; then
+ if test "$search_ext" = ".la"; then
+ found=yes
+ else
+ found=no
+ fi
+ break 2
+ fi
+ done
+ done
+ if test "$found" != yes; then
+ # deplib doesn't seem to be a libtool library
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
+ else # deplib is a libtool library
+ # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
+ # We need to do some special things here, and not later.
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $deplib "*)
+ if (${SED} -e '2q' $lib |
+ grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ library_names=
+ old_library=
+ case $lib in
+ */* | *\\*) . $lib ;;
+ *) . ./$lib ;;
+ esac
+ for l in $old_library $library_names; do
+ ll="$l"
+ done
+ if test "X$ll" = "X$old_library" ; then # only static version available
+ found=no
+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$ladir" = "X$lib" && ladir="."
+ lib=$ladir/$old_library
+ if test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
+ fi
+ fi
+ ;;
+ *) ;;
+ esac
+ fi
+ fi
+ ;; # -l
+ -L*)
+ case $linkmode in
+ lib)
+ deplibs="$deplib $deplibs"
+ test "$pass" = conv && continue
+ newdependency_libs="$deplib $newdependency_libs"
+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ ;;
+ prog)
+ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ continue
+ fi
+ if test "$pass" = scan; then
+ deplibs="$deplib $deplibs"
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
+ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ ;;
+ *)
+ $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+ ;;
+ esac # linkmode
+ continue
+ ;; # -L
+ -R*)
+ if test "$pass" = link; then
+ dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
+ # Make sure the xrpath contains only unique directories.
+ case "$xrpath " in
+ *" $dir "*) ;;
+ *) xrpath="$xrpath $dir" ;;
+ esac
+ fi
+ deplibs="$deplib $deplibs"
+ continue
+ ;;
+ *.la) lib="$deplib" ;;
+ *.$libext)
+ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ continue
+ fi
+ case $linkmode in
+ lib)
+ if test "$deplibs_check_method" != pass_all; then
+ $echo
+ $echo "*** Warning: Trying to link with static lib archive $deplib."
+ $echo "*** I have the capability to make that library automatically link in when"
+ $echo "*** you link to this library. But I can only do this if you have a"
+ $echo "*** shared version of the library, which you do not appear to have"
+ $echo "*** because the file extensions .$libext of this argument makes me believe"
+ $echo "*** that it is just a static archive that I should not used here."
+ else
+ $echo
+ $echo "*** Warning: Linking the shared library $output against the"
+ $echo "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+ fi
+ continue
+ ;;
+ prog)
+ if test "$pass" != link; then
+ deplibs="$deplib $deplibs"
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
+ continue
+ ;;
+ esac # linkmode
+ ;; # *.$libext
+ *.lo | *.$objext)
+ if test "$pass" = conv; then
+ deplibs="$deplib $deplibs"
+ elif test "$linkmode" = prog; then
+ if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ # If there is no dlopen support or we're linking statically,
+ # we need to preload.
+ newdlprefiles="$newdlprefiles $deplib"
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ newdlfiles="$newdlfiles $deplib"
+ fi
+ fi
+ continue
+ ;;
+ %DEPLIBS%)
+ alldeplibs=yes
+ continue
+ ;;
+ esac # case $deplib
+ if test "$found" = yes || test -f "$lib"; then :
+ else
+ $echo "$modename: cannot find the library \`$lib'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Check to see that this really is a libtool archive.
+ if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$ladir" = "X$lib" && ladir="."
+
+ dlname=
+ dlopen=
+ dlpreopen=
+ libdir=
+ library_names=
+ old_library=
+ # If the library was installed with an old release of libtool,
+ # it will not redefine variables installed, or shouldnotlink
+ installed=yes
+ shouldnotlink=no
+
+ # Read the .la file
+ case $lib in
+ */* | *\\*) . $lib ;;
+ *) . ./$lib ;;
+ esac
+
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan" ||
+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
+ test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+ fi
+
+ if test "$pass" = conv; then
+ # Only check for convenience libraries
+ deplibs="$lib $deplibs"
+ if test -z "$libdir"; then
+ if test -z "$old_library"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ deplibs="$deplib $deplibs"
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ $echo "$modename: \`$lib' is not a convenience library" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ continue
+ fi # $pass = conv
+
+
+ # Get the name of the library we link against.
+ linklib=
+ for l in $old_library $library_names; do
+ linklib="$l"
+ done
+ if test -z "$linklib"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # This library was specified with -dlopen.
+ if test "$pass" = dlopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ if test -z "$dlname" ||
+ test "$dlopen_support" != yes ||
+ test "$build_libtool_libs" = no; then
+ # If there is no dlname, no dlopen support or we're linking
+ # statically, we need to preload. We also need to preload any
+ # dependent libraries so libltdl's deplib preloader doesn't
+ # bomb out in the load deplibs phase.
+ dlprefiles="$dlprefiles $lib $dependency_libs"
+ else
+ newdlfiles="$newdlfiles $lib"
+ fi
+ continue
+ fi # $pass = dlopen
+
+ # We need an absolute path.
+ case $ladir in
+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ *)
+ abs_ladir=`cd "$ladir" && pwd`
+ if test -z "$abs_ladir"; then
+ $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
+ $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
+ abs_ladir="$ladir"
+ fi
+ ;;
+ esac
+ laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+
+ # Find the relevant object directory and library name.
+ if test "X$installed" = Xyes; then
+ if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+ $echo "$modename: warning: library \`$lib' was moved." 1>&2
+ dir="$ladir"
+ absdir="$abs_ladir"
+ libdir="$abs_ladir"
+ else
+ dir="$libdir"
+ absdir="$libdir"
+ fi
+ else
+ dir="$ladir/$objdir"
+ absdir="$abs_ladir/$objdir"
+ # Remove this search path later
+ notinst_path="$notinst_path $abs_ladir"
+ fi # $installed = yes
+ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+ # This library was specified with -dlpreopen.
+ if test "$pass" = dlpreopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+ if test -n "$old_library"; then
+ newdlprefiles="$newdlprefiles $dir/$old_library"
+ # Otherwise, use the dlname, so that lt_dlopen finds it.
+ elif test -n "$dlname"; then
+ newdlprefiles="$newdlprefiles $dir/$dlname"
+ else
+ newdlprefiles="$newdlprefiles $dir/$linklib"
+ fi
+ fi # $pass = dlpreopen
+
+ if test -z "$libdir"; then
+ # Link the convenience library
+ if test "$linkmode" = lib; then
+ deplibs="$dir/$old_library $deplibs"
+ elif test "$linkmode,$pass" = "prog,link"; then
+ compile_deplibs="$dir/$old_library $compile_deplibs"
+ finalize_deplibs="$dir/$old_library $finalize_deplibs"
+ else
+ deplibs="$lib $deplibs" # used for prog,scan pass
+ fi
+ continue
+ fi
+
+
+ if test "$linkmode" = prog && test "$pass" != link; then
+ newlib_search_path="$newlib_search_path $ladir"
+ deplibs="$lib $deplibs"
+
+ linkalldeplibs=no
+ if test "$link_all_deplibs" != no || test -z "$library_names" ||
+ test "$build_libtool_libs" = no; then
+ linkalldeplibs=yes
+ fi
+
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ case $deplib in
+ -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
+ esac
+ # Need to link against all dependency_libs?
+ if test "$linkalldeplibs" = yes; then
+ deplibs="$deplib $deplibs"
+ else
+ # Need to hardcode shared library paths
+ # or/and link against static libraries
+ newdependency_libs="$deplib $newdependency_libs"
+ fi
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done # for deplib
+ continue
+ fi # $linkmode = prog...
+
+ if test "$linkmode,$pass" = "prog,link"; then
+ if test -n "$library_names" &&
+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ # We need to hardcode the library path
+ if test -n "$shlibpath_var"; then
+ # Make sure the rpath contains only unique directories.
+ case "$temp_rpath " in
+ *" $dir "*) ;;
+ *" $absdir "*) ;;
+ *) temp_rpath="$temp_rpath $dir" ;;
+ esac
+ fi
+
+ # Hardcode the library path.
+ # Skip directories that are in the system default run-time
+ # search path.
+ case " $sys_lib_dlsearch_path " in
+ *" $absdir "*) ;;
+ *)
+ case "$compile_rpath " in
+ *" $absdir "*) ;;
+ *) compile_rpath="$compile_rpath $absdir"
+ esac
+ ;;
+ esac
+ case " $sys_lib_dlsearch_path " in
+ *" $libdir "*) ;;
+ *)
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_rpath="$finalize_rpath $libdir"
+ esac
+ ;;
+ esac
+ fi # $linkmode,$pass = prog,link...
+
+ if test "$alldeplibs" = yes &&
+ { test "$deplibs_check_method" = pass_all ||
+ { test "$build_libtool_libs" = yes &&
+ test -n "$library_names"; }; }; then
+ # We only need to search for static libraries
+ continue
+ fi
+ fi
+
+ link_static=no # Whether the deplib will be linked statically
+ if test -n "$library_names" &&
+ { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+ need_relink=yes
+ fi
+ # This is a shared library
+
+ # Warn about portability, can't link against -module's on
+ # some systems (darwin)
+ if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ $echo
+ if test "$linkmode" = prog; then
+ $echo "*** Warning: Linking the executable $output against the loadable module"
+ else
+ $echo "*** Warning: Linking the shared library $output against the loadable module"
+ fi
+ $echo "*** $linklib is not portable!"
+ fi
+ if test "$linkmode" = lib &&
+ test "$hardcode_into_libs" = yes; then
+ # Hardcode the library path.
+ # Skip directories that are in the system default run-time
+ # search path.
+ case " $sys_lib_dlsearch_path " in
+ *" $absdir "*) ;;
+ *)
+ case "$compile_rpath " in
+ *" $absdir "*) ;;
+ *) compile_rpath="$compile_rpath $absdir"
+ esac
+ ;;
+ esac
+ case " $sys_lib_dlsearch_path " in
+ *" $libdir "*) ;;
+ *)
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_rpath="$finalize_rpath $libdir"
+ esac
+ ;;
+ esac
+ fi
+
+ if test -n "$old_archive_from_expsyms_cmds"; then
+ # figure out the soname
+ set dummy $library_names
+ realname="$2"
+ shift; shift
+ libname=`eval \\$echo \"$libname_spec\"`
+ # use dlname if we got it. it's perfectly good, no?
+ if test -n "$dlname"; then
+ soname="$dlname"
+ elif test -n "$soname_spec"; then
+ # bleh windows
+ case $host in
+ *cygwin* | mingw*)
+ major=`expr $current - $age`
+ versuffix="-$major"
+ ;;
+ esac
+ eval soname=\"$soname_spec\"
+ else
+ soname="$realname"
+ fi
+
+ # Make a new name for the extract_expsyms_cmds to use
+ soroot="$soname"
+ soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
+ newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
+
+ # If the library has no export list, then create one now
+ if test -f "$output_objdir/$soname-def"; then :
+ else
+ $show "extracting exported symbol list from \`$soname'"
+ save_ifs="$IFS"; IFS='~'
+ cmds=$extract_expsyms_cmds
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ fi
+
+ # Create $newlib
+ if test -f "$output_objdir/$newlib"; then :; else
+ $show "generating import library for \`$soname'"
+ save_ifs="$IFS"; IFS='~'
+ cmds=$old_archive_from_expsyms_cmds
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ fi
+ # make sure the library variables are pointing to the new library
+ dir=$output_objdir
+ linklib=$newlib
+ fi # test -n "$old_archive_from_expsyms_cmds"
+
+ if test "$linkmode" = prog || test "$mode" != relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+ lib_linked=yes
+ case $hardcode_action in
+ immediate | unsupported)
+ if test "$hardcode_direct" = no; then
+ add="$dir/$linklib"
+ case $host in
+ *-*-sco3.2v5* ) add_dir="-L$dir" ;;
+ *-*-darwin* )
+ # if the lib is a module then we can not link against
+ # it, someone is ignoring the new warnings I added
+ if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
+ $echo "** Warning, lib $linklib is a module, not a shared library"
+ if test -z "$old_library" ; then
+ $echo
+ $echo "** And there doesn't seem to be a static archive available"
+ $echo "** The link will probably fail, sorry"
+ else
+ add="$dir/$old_library"
+ fi
+ fi
+ esac
+ elif test "$hardcode_minus_L" = no; then
+ case $host in
+ *-*-sunos*) add_shlibpath="$dir" ;;
+ esac
+ add_dir="-L$dir"
+ add="-l$name"
+ elif test "$hardcode_shlibpath_var" = no; then
+ add_shlibpath="$dir"
+ add="-l$name"
+ else
+ lib_linked=no
+ fi
+ ;;
+ relink)
+ if test "$hardcode_direct" = yes; then
+ add="$dir/$linklib"
+ elif test "$hardcode_minus_L" = yes; then
+ add_dir="-L$dir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+ case "$libdir" in
+ [\\/]*)
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+ add="-l$name"
+ elif test "$hardcode_shlibpath_var" = yes; then
+ add_shlibpath="$dir"
+ add="-l$name"
+ else
+ lib_linked=no
+ fi
+ ;;
+ *) lib_linked=no ;;
+ esac
+
+ if test "$lib_linked" != yes; then
+ $echo "$modename: configuration error: unsupported hardcode properties"
+ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$add_shlibpath"; then
+ case :$compile_shlibpath: in
+ *":$add_shlibpath:"*) ;;
+ *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+ esac
+ fi
+ if test "$linkmode" = prog; then
+ test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
+ test -n "$add" && compile_deplibs="$add $compile_deplibs"
+ else
+ test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ test -n "$add" && deplibs="$add $deplibs"
+ if test "$hardcode_direct" != yes && \
+ test "$hardcode_minus_L" != yes && \
+ test "$hardcode_shlibpath_var" = yes; then
+ case :$finalize_shlibpath: in
+ *":$libdir:"*) ;;
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ esac
+ fi
+ fi
+ fi
+
+ if test "$linkmode" = prog || test "$mode" = relink; then
+ add_shlibpath=
+ add_dir=
+ add=
+ # Finalize command for both is simple: just hardcode it.
+ if test "$hardcode_direct" = yes; then
+ add="$libdir/$linklib"
+ elif test "$hardcode_minus_L" = yes; then
+ add_dir="-L$libdir"
+ add="-l$name"
+ elif test "$hardcode_shlibpath_var" = yes; then
+ case :$finalize_shlibpath: in
+ *":$libdir:"*) ;;
+ *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+ esac
+ add="-l$name"
+ elif test "$hardcode_automatic" = yes; then
+ if test -n "$inst_prefix_dir" &&
+ test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ add="$inst_prefix_dir$libdir/$linklib"
+ else
+ add="$libdir/$linklib"
+ fi
+ else
+ # We cannot seem to hardcode it, guess we'll fake it.
+ add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+ case "$libdir" in
+ [\\/]*)
+ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+ add="-l$name"
+ fi
+
+ if test "$linkmode" = prog; then
+ test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
+ test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
+ else
+ test -n "$add_dir" && deplibs="$add_dir $deplibs"
+ test -n "$add" && deplibs="$add $deplibs"
+ fi
+ fi
+ elif test "$linkmode" = prog; then
+ # Here we assume that one of hardcode_direct or hardcode_minus_L
+ # is not unsupported. This is valid on all known static and
+ # shared platforms.
+ if test "$hardcode_direct" != unsupported; then
+ test -n "$old_library" && linklib="$old_library"
+ compile_deplibs="$dir/$linklib $compile_deplibs"
+ finalize_deplibs="$dir/$linklib $finalize_deplibs"
+ else
+ compile_deplibs="-l$name -L$dir $compile_deplibs"
+ finalize_deplibs="-l$name -L$dir $finalize_deplibs"
+ fi
+ elif test "$build_libtool_libs" = yes; then
+ # Not a shared library
+ if test "$deplibs_check_method" != pass_all; then
+ # We're trying link a shared library against a static one
+ # but the system doesn't support it.
+
+ # Just print a warning and add the library to dependency_libs so
+ # that the program can be linked against the static library.
+ $echo
+ $echo "*** Warning: This system can not link to static lib archive $lib."
+ $echo "*** I have the capability to make that library automatically link in when"
+ $echo "*** you link to this library. But I can only do this if you have a"
+ $echo "*** shared version of the library, which you do not appear to have."
+ if test "$module" = yes; then
+ $echo "*** But as you try to build a module library, libtool will still create "
+ $echo "*** a static module, that should work as long as the dlopening application"
+ $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
+ if test -z "$global_symbol_pipe"; then
+ $echo
+ $echo "*** However, this would only work if libtool was able to extract symbol"
+ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ $echo "*** not find such a program. So, this module is probably useless."
+ $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+ if test "$build_old_libs" = no; then
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+ build_libtool_libs=no
+ fi
+ fi
+ else
+ convenience="$convenience $dir/$old_library"
+ old_convenience="$old_convenience $dir/$old_library"
+ deplibs="$dir/$old_library $deplibs"
+ link_static=yes
+ fi
+ fi # link shared/static library?
+
+ if test "$linkmode" = lib; then
+ if test -n "$dependency_libs" &&
+ { test "$hardcode_into_libs" != yes ||
+ test "$build_old_libs" = yes ||
+ test "$link_static" = yes; }; then
+ # Extract -R from dependency_libs
+ temp_deplibs=
+ for libdir in $dependency_libs; do
+ case $libdir in
+ -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
+ case " $xrpath " in
+ *" $temp_xrpath "*) ;;
+ *) xrpath="$xrpath $temp_xrpath";;
+ esac;;
+ *) temp_deplibs="$temp_deplibs $libdir";;
+ esac
+ done
+ dependency_libs="$temp_deplibs"
+ fi
+
+ newlib_search_path="$newlib_search_path $absdir"
+ # Link against this library
+ test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ # ... and its dependency_libs
+ tmp_libs=
+ for deplib in $dependency_libs; do
+ newdependency_libs="$deplib $newdependency_libs"
+ if test "X$duplicate_deps" = "Xyes" ; then
+ case "$tmp_libs " in
+ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+ esac
+ fi
+ tmp_libs="$tmp_libs $deplib"
+ done
+
+ if test "$link_all_deplibs" != no; then
+ # Add the search paths of all dependency libraries
+ for deplib in $dependency_libs; do
+ case $deplib in
+ -L*) path="$deplib" ;;
+ *.la)
+ dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$dir" = "X$deplib" && dir="."
+ # We need an absolute path.
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ *)
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+ $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
+ absdir="$dir"
+ fi
+ ;;
+ esac
+ if grep "^installed=no" $deplib > /dev/null; then
+ path="$absdir/$objdir"
+ else
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ if test "$absdir" != "$libdir"; then
+ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ fi
+ path="$absdir"
+ fi
+ depdepl=
+ case $host in
+ *-*-darwin*)
+ # we do not want to link against static libs,
+ # but need to link against shared
+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names" ; then
+ for tmp in $deplibrary_names ; do
+ depdepl=$tmp
+ done
+ if test -f "$path/$depdepl" ; then
+ depdepl="$path/$depdepl"
+ fi
+ # do not add paths which are already there
+ case " $newlib_search_path " in
+ *" $path "*) ;;
+ *) newlib_search_path="$newlib_search_path $path";;
+ esac
+ fi
+ path=""
+ ;;
+ *)
+ path="-L$path"
+ ;;
+ esac
+ ;;
+ -l*)
+ case $host in
+ *-*-darwin*)
+ # Again, we only want to link against shared libraries
+ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+ for tmp in $newlib_search_path ; do
+ if test -f "$tmp/lib$tmp_libs.dylib" ; then
+ eval depdepl="$tmp/lib$tmp_libs.dylib"
+ break
+ fi
+ done
+ path=""
+ ;;
+ *) continue ;;
+ esac
+ ;;
+ *) continue ;;
+ esac
+ case " $deplibs " in
+ *" $depdepl "*) ;;
+ *) deplibs="$depdepl $deplibs" ;;
+ esac
+ case " $deplibs " in
+ *" $path "*) ;;
+ *) deplibs="$deplibs $path" ;;
+ esac
+ done
+ fi # link_all_deplibs != no
+ fi # linkmode = lib
+ done # for deplib in $libs
+ dependency_libs="$newdependency_libs"
+ if test "$pass" = dlpreopen; then
+ # Link the dlpreopened libraries before other libraries
+ for deplib in $save_deplibs; do
+ deplibs="$deplib $deplibs"
+ done
+ fi
+ if test "$pass" != dlopen; then
+ if test "$pass" != conv; then
+ # Make sure lib_search_path contains only unique directories.
+ lib_search_path=
+ for dir in $newlib_search_path; do
+ case "$lib_search_path " in
+ *" $dir "*) ;;
+ *) lib_search_path="$lib_search_path $dir" ;;
+ esac
+ done
+ newlib_search_path=
+ fi
+
+ if test "$linkmode,$pass" != "prog,link"; then
+ vars="deplibs"
+ else
+ vars="compile_deplibs finalize_deplibs"
+ fi
+ for var in $vars dependency_libs; do
+ # Add libraries to $var in reverse order
+ eval tmp_libs=\"\$$var\"
+ new_libs=
+ for deplib in $tmp_libs; do
+ # FIXME: Pedantically, this is the right thing to do, so
+ # that some nasty dependency loop isn't accidentally
+ # broken:
+ #new_libs="$deplib $new_libs"
+ # Pragmatically, this seems to cause very few problems in
+ # practice:
+ case $deplib in
+ -L*) new_libs="$deplib $new_libs" ;;
+ -R*) ;;
+ *)
+ # And here is the reason: when a library appears more
+ # than once as an explicit dependence of a library, or
+ # is implicitly linked in more than once by the
+ # compiler, it is considered special, and multiple
+ # occurrences thereof are not removed. Compare this
+ # with having the same library being listed as a
+ # dependency of multiple other libraries: in this case,
+ # we know (pedantically, we assume) the library does not
+ # need to be listed more than once, so we keep only the
+ # last copy. This is not always right, but it is rare
+ # enough that we require users that really mean to play
+ # such unportable linking tricks to link the library
+ # using -Wl,-lname, so that libtool does not consider it
+ # for duplicate removal.
+ case " $specialdeplibs " in
+ *" $deplib "*) new_libs="$deplib $new_libs" ;;
+ *)
+ case " $new_libs " in
+ *" $deplib "*) ;;
+ *) new_libs="$deplib $new_libs" ;;
+ esac
+ ;;
+ esac
+ ;;
+ esac
+ done
+ tmp_libs=
+ for deplib in $new_libs; do
+ case $deplib in
+ -L*)
+ case " $tmp_libs " in
+ *" $deplib "*) ;;
+ *) tmp_libs="$tmp_libs $deplib" ;;
+ esac
+ ;;
+ *) tmp_libs="$tmp_libs $deplib" ;;
+ esac
+ done
+ eval $var=\"$tmp_libs\"
+ done # for var
+ fi
+ # Last step: remove runtime libs from dependency_libs
+ # (they stay in deplibs)
+ tmp_libs=
+ for i in $dependency_libs ; do
+ case " $predeps $postdeps $compiler_lib_search_path " in
+ *" $i "*)
+ i=""
+ ;;
+ esac
+ if test -n "$i" ; then
+ tmp_libs="$tmp_libs $i"
+ fi
+ done
+ dependency_libs=$tmp_libs
+ done # for pass
+ if test "$linkmode" = prog; then
+ dlfiles="$newdlfiles"
+ dlprefiles="$newdlprefiles"
+ fi
+
+ case $linkmode in
+ oldlib)
+ if test -n "$deplibs"; then
+ $echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
+ fi
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$rpath"; then
+ $echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$xrpath"; then
+ $echo "$modename: warning: \`-R' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$release"; then
+ $echo "$modename: warning: \`-release' is ignored for archives" 1>&2
+ fi
+
+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ $echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
+ fi
+
+ # Now set the variables for building old libraries.
+ build_libtool_libs=no
+ oldlibs="$output"
+ objs="$objs$old_deplibs"
+ ;;
+
+ lib)
+ # Make sure we only generate libraries of the form `libNAME.la'.
+ case $outputname in
+ lib*)
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ ;;
+ *)
+ if test "$module" = no; then
+ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ if test "$need_lib_prefix" != no; then
+ # Add the "lib" prefix for modules if required
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ else
+ libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+ fi
+ ;;
+ esac
+
+ if test -n "$objs"; then
+ if test "$deplibs_check_method" != pass_all; then
+ $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+ exit $EXIT_FAILURE
+ else
+ $echo
+ $echo "*** Warning: Linking the shared library $output against the non-libtool"
+ $echo "*** objects $objs is not portable!"
+ libobjs="$libobjs $objs"
+ fi
+ fi
+
+ if test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
+ fi
+
+ set dummy $rpath
+ if test "$#" -gt 2; then
+ $echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+ fi
+ install_libdir="$2"
+
+ oldlibs=
+ if test -z "$rpath"; then
+ if test "$build_libtool_libs" = yes; then
+ # Building a libtool convenience library.
+ # Some compilers have problems with a `.al' extension so
+ # convenience libraries should have the same extension an
+ # archive normally would.
+ oldlibs="$output_objdir/$libname.$libext $oldlibs"
+ build_libtool_libs=convenience
+ build_old_libs=yes
+ fi
+
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
+ fi
+
+ if test -n "$release"; then
+ $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
+ fi
+ else
+
+ # Parse the version information argument.
+ save_ifs="$IFS"; IFS=':'
+ set dummy $vinfo 0 0 0
+ IFS="$save_ifs"
+
+ if test -n "$8"; then
+ $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # convert absolute version numbers to libtool ages
+ # this retains compatibility with .la files and attempts
+ # to make the code below a bit more comprehensible
+
+ case $vinfo_number in
+ yes)
+ number_major="$2"
+ number_minor="$3"
+ number_revision="$4"
+ #
+ # There are really only two kinds -- those that
+ # use the current revision as the major version
+ # and those that subtract age and use age as
+ # a minor version. But, then there is irix
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+ darwin|linux|osf|windows)
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
+ ;;
+ freebsd-aout|freebsd-elf|sunos)
+ current="$number_major"
+ revision="$number_minor"
+ age="0"
+ ;;
+ irix|nonstopux)
+ current=`expr $number_major + $number_minor - 1`
+ age="$number_minor"
+ revision="$number_minor"
+ ;;
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+ ;;
+ no)
+ current="$2"
+ revision="$3"
+ age="$4"
+ ;;
+ esac
+
+ # Check that each of the things are valid numbers.
+ case $current in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+ $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $revision in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+ $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $age in
+ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+ $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test "$age" -gt "$current"; then
+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Calculate the version variables.
+ major=
+ versuffix=
+ verstring=
+ case $version_type in
+ none) ;;
+
+ darwin)
+ # Like Linux, but with the current version available in
+ # verstring for coding it into the library header
+ major=.`expr $current - $age`
+ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ minor_current=`expr $current + 1`
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+
+ freebsd-aout)
+ major=".$current"
+ versuffix=".$current.$revision";
+ ;;
+
+ freebsd-elf)
+ major=".$current"
+ versuffix=".$current";
+ ;;
+
+ irix | nonstopux)
+ major=`expr $current - $age + 1`
+
+ case $version_type in
+ nonstopux) verstring_prefix=nonstopux ;;
+ *) verstring_prefix=sgi ;;
+ esac
+ verstring="$verstring_prefix$major.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$revision
+ while test "$loop" -ne 0; do
+ iface=`expr $revision - $loop`
+ loop=`expr $loop - 1`
+ verstring="$verstring_prefix$major.$iface:$verstring"
+ done
+
+ # Before this point, $major must not contain `.'.
+ major=.$major
+ versuffix="$major.$revision"
+ ;;
+
+ linux)
+ major=.`expr $current - $age`
+ versuffix="$major.$age.$revision"
+ ;;
+
+ osf)
+ major=.`expr $current - $age`
+ versuffix=".$current.$age.$revision"
+ verstring="$current.$age.$revision"
+
+ # Add in all the interfaces that we are compatible with.
+ loop=$age
+ while test "$loop" -ne 0; do
+ iface=`expr $current - $loop`
+ loop=`expr $loop - 1`
+ verstring="$verstring:${iface}.0"
+ done
+
+ # Make executables depend on our current version.
+ verstring="$verstring:${current}.0"
+ ;;
+
+ sunos)
+ major=".$current"
+ versuffix=".$current.$revision"
+ ;;
+
+ windows)
+ # Use '-' rather than '.', since we only want one
+ # extension on DOS 8.3 filesystems.
+ major=`expr $current - $age`
+ versuffix="-$major"
+ ;;
+
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ # Clear the version info if we defaulted, and they specified a release.
+ if test -z "$vinfo" && test -n "$release"; then
+ major=
+ case $version_type in
+ darwin)
+ # we can't check for "0.0" in archive_cmds due to quoting
+ # problems, so we reset it completely
+ verstring=
+ ;;
+ *)
+ verstring="0.0"
+ ;;
+ esac
+ if test "$need_version" = no; then
+ versuffix=
+ else
+ versuffix=".0.0"
+ fi
+ fi
+
+ # Remove version info from name if versioning should be avoided
+ if test "$avoid_version" = yes && test "$need_version" = no; then
+ major=
+ versuffix=
+ verstring=""
+ fi
+
+ # Check to see if the archive will have undefined symbols.
+ if test "$allow_undefined" = yes; then
+ if test "$allow_undefined_flag" = unsupported; then
+ $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
+ build_libtool_libs=no
+ build_old_libs=yes
+ fi
+ else
+ # Don't allow undefined symbols.
+ allow_undefined_flag="$no_undefined_flag"
+ fi
+ fi
+
+ if test "$mode" != relink; then
+ # Remove our outputs, but don't remove object files since they
+ # may have been created when compiling PIC objects.
+ removelist=
+ tempremovelist=`$echo "$output_objdir/*"`
+ for p in $tempremovelist; do
+ case $p in
+ *.$objext)
+ ;;
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
+ if test "X$precious_files_regex" != "X"; then
+ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
+ then
+ continue
+ fi
+ fi
+ removelist="$removelist $p"
+ ;;
+ *) ;;
+ esac
+ done
+ if test -n "$removelist"; then
+ $show "${rm}r $removelist"
+ $run ${rm}r $removelist
+ fi
+ fi
+
+ # Now set the variables for building old libraries.
+ if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ oldlibs="$oldlibs $output_objdir/$libname.$libext"
+
+ # Transform .lo files to .o files.
+ oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+ fi
+
+ # Eliminate all temporary directories.
+ for path in $notinst_path; do
+ lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+ deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+ dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+ done
+
+ if test -n "$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+ temp_xrpath=
+ for libdir in $xrpath; do
+ temp_xrpath="$temp_xrpath -R$libdir"
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
+ esac
+ done
+ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ dependency_libs="$temp_xrpath $dependency_libs"
+ fi
+ fi
+
+ # Make sure dlfiles contains only unique files that won't be dlpreopened
+ old_dlfiles="$dlfiles"
+ dlfiles=
+ for lib in $old_dlfiles; do
+ case " $dlprefiles $dlfiles " in
+ *" $lib "*) ;;
+ *) dlfiles="$dlfiles $lib" ;;
+ esac
+ done
+
+ # Make sure dlprefiles contains only unique files
+ old_dlprefiles="$dlprefiles"
+ dlprefiles=
+ for lib in $old_dlprefiles; do
+ case "$dlprefiles " in
+ *" $lib "*) ;;
+ *) dlprefiles="$dlprefiles $lib" ;;
+ esac
+ done
+
+ if test "$build_libtool_libs" = yes; then
+ if test -n "$rpath"; then
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
+ # these systems don't actually have a c library (as such)!
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C library is in the System framework
+ deplibs="$deplibs -framework System"
+ ;;
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+ ;;
+ *-*-openbsd* | *-*-freebsd*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+ if test "$build_libtool_need_lc" = "yes"; then
+ deplibs="$deplibs -lc"
+ fi
+ ;;
+ esac
+ fi
+
+ # Transform deplibs into only deplibs that can be linked in shared.
+ name_save=$name
+ libname_save=$libname
+ release_save=$release
+ versuffix_save=$versuffix
+ major_save=$major
+ # I'm not sure if I'm treating the release correctly. I think
+ # release should show up in the -l (ie -lgmp5) so we don't want to
+ # add it in twice. Is that correct?
+ release=""
+ versuffix=""
+ major=""
+ newdeplibs=
+ droppeddeps=no
+ case $deplibs_check_method in
+ pass_all)
+ # Don't check for shared/static. Everything works.
+ # This might be a little naive. We might want to check
+ # whether the library exists or not. But this is on
+ # osf3 & osf4 and I'm not really sure... Just
+ # implementing what was already the behavior.
+ newdeplibs=$deplibs
+ ;;
+ test_compile)
+ # This code stresses the "libraries are programs" paradigm to its
+ # limits. Maybe even breaks it. We compile a program, linking it
+ # against the deplibs as a proxy for the library. Then we can check
+ # whether they linked in statically or dynamically with ldd.
+ $rm conftest.c
+ cat > conftest.c <<EOF
+ int main() { return 0; }
+EOF
+ $rm conftest
+ $LTCC -o conftest conftest.c $deplibs
+ if test "$?" -eq 0 ; then
+ ldd_output=`ldd conftest`
+ for i in $deplibs; do
+ name="`expr $i : '-l\(.*\)'`"
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" -ne "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+ newdeplibs="$newdeplibs $i"
+ i=""
+ ;;
+ esac
+ fi
+ if test -n "$i" ; then
+ libname=`eval \\$echo \"$libname_spec\"`
+ deplib_matches=`eval \\$echo \"$library_names_spec\"`
+ set dummy $deplib_matches
+ deplib_match=$2
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ newdeplibs="$newdeplibs $i"
+ else
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning: dynamic linker does not accept needed library $i."
+ $echo "*** I have the capability to make that library automatically link in when"
+ $echo "*** you link to this library. But I can only do this if you have a"
+ $echo "*** shared version of the library, which I believe you do not have"
+ $echo "*** because a test_compile did reveal that the linker did not use it for"
+ $echo "*** its dynamic dependency list that programs get resolved with at runtime."
+ fi
+ fi
+ else
+ newdeplibs="$newdeplibs $i"
+ fi
+ done
+ else
+ # Error occurred in the first compile. Let's try to salvage
+ # the situation: Compile a separate program for each library.
+ for i in $deplibs; do
+ name="`expr $i : '-l\(.*\)'`"
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ $rm conftest
+ $LTCC -o conftest conftest.c $i
+ # Did it work?
+ if test "$?" -eq 0 ; then
+ ldd_output=`ldd conftest`
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+ newdeplibs="$newdeplibs $i"
+ i=""
+ ;;
+ esac
+ fi
+ if test -n "$i" ; then
+ libname=`eval \\$echo \"$libname_spec\"`
+ deplib_matches=`eval \\$echo \"$library_names_spec\"`
+ set dummy $deplib_matches
+ deplib_match=$2
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ newdeplibs="$newdeplibs $i"
+ else
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning: dynamic linker does not accept needed library $i."
+ $echo "*** I have the capability to make that library automatically link in when"
+ $echo "*** you link to this library. But I can only do this if you have a"
+ $echo "*** shared version of the library, which you do not appear to have"
+ $echo "*** because a test_compile did reveal that the linker did not use this one"
+ $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
+ fi
+ fi
+ else
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning! Library $i is needed by this library but I was not able to"
+ $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** library that it depends on before this library will be fully"
+ $echo "*** functional. Installing it before continuing would be even better."
+ fi
+ else
+ newdeplibs="$newdeplibs $i"
+ fi
+ done
+ fi
+ ;;
+ file_magic*)
+ set dummy $deplibs_check_method
+ file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+ name="`expr $a_deplib : '-l\(.*\)'`"
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $a_deplib "*)
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ ;;
+ esac
+ fi
+ if test -n "$a_deplib" ; then
+ libname=`eval \\$echo \"$libname_spec\"`
+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ for potent_lib in $potential_libs; do
+ # Follow soft links.
+ if ls -lLd "$potent_lib" 2>/dev/null \
+ | grep " -> " >/dev/null; then
+ continue
+ fi
+ # The statement above tries to avoid entering an
+ # endless loop below, in case of cyclic links.
+ # We might still enter an endless loop, since a link
+ # loop can be closed while we follow links,
+ # but so what?
+ potlib="$potent_lib"
+ while test -h "$potlib" 2>/dev/null; do
+ potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ case $potliblink in
+ [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
+ *) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+ esac
+ done
+ if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
+ | ${SED} 10q \
+ | $EGREP "$file_magic_regex" > /dev/null; then
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ break 2
+ fi
+ done
+ done
+ fi
+ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning: linker path does not have real file for library $a_deplib."
+ $echo "*** I have the capability to make that library automatically link in when"
+ $echo "*** you link to this library. But I can only do this if you have a"
+ $echo "*** shared version of the library, which you do not appear to have"
+ $echo "*** because I did check the linker path looking for a file starting"
+ if test -z "$potlib" ; then
+ $echo "*** with $libname but no candidates were found. (...for file magic test)"
+ else
+ $echo "*** with $libname and none of the candidates passed a file format test"
+ $echo "*** using a file magic. Last file checked: $potlib"
+ fi
+ fi
+ else
+ # Add a -L argument.
+ newdeplibs="$newdeplibs $a_deplib"
+ fi
+ done # Gone through all deplibs.
+ ;;
+ match_pattern*)
+ set dummy $deplibs_check_method
+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+ name="`expr $a_deplib : '-l\(.*\)'`"
+ # If $name is empty we are operating on a -L argument.
+ if test -n "$name" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $a_deplib "*)
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ ;;
+ esac
+ fi
+ if test -n "$a_deplib" ; then
+ libname=`eval \\$echo \"$libname_spec\"`
+ for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
+ potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+ for potent_lib in $potential_libs; do
+ potlib="$potent_lib" # see symlink-check above in file_magic test
+ if eval $echo \"$potent_lib\" 2>/dev/null \
+ | ${SED} 10q \
+ | $EGREP "$match_pattern_regex" > /dev/null; then
+ newdeplibs="$newdeplibs $a_deplib"
+ a_deplib=""
+ break 2
+ fi
+ done
+ done
+ fi
+ if test -n "$a_deplib" ; then
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning: linker path does not have real file for library $a_deplib."
+ $echo "*** I have the capability to make that library automatically link in when"
+ $echo "*** you link to this library. But I can only do this if you have a"
+ $echo "*** shared version of the library, which you do not appear to have"
+ $echo "*** because I did check the linker path looking for a file starting"
+ if test -z "$potlib" ; then
+ $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
+ else
+ $echo "*** with $libname and none of the candidates passed a file format test"
+ $echo "*** using a regex pattern. Last file checked: $potlib"
+ fi
+ fi
+ else
+ # Add a -L argument.
+ newdeplibs="$newdeplibs $a_deplib"
+ fi
+ done # Gone through all deplibs.
+ ;;
+ none | unknown | *)
+ newdeplibs=""
+ tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
+ -e 's/ -[LR][^ ]*//g'`
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ for i in $predeps $postdeps ; do
+ # can't use Xsed below, because $i might contain '/'
+ tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
+ done
+ fi
+ if $echo "X $tmp_deplibs" | $Xsed -e 's/[ ]//g' \
+ | grep . >/dev/null; then
+ $echo
+ if test "X$deplibs_check_method" = "Xnone"; then
+ $echo "*** Warning: inter-library dependencies are not supported in this platform."
+ else
+ $echo "*** Warning: inter-library dependencies are not known to be supported."
+ fi
+ $echo "*** All declared inter-library dependencies are being dropped."
+ droppeddeps=yes
+ fi
+ ;;
+ esac
+ versuffix=$versuffix_save
+ major=$major_save
+ release=$release_save
+ libname=$libname_save
+ name=$name_save
+
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ ;;
+ esac
+
+ if test "$droppeddeps" = yes; then
+ if test "$module" = yes; then
+ $echo
+ $echo "*** Warning: libtool could not satisfy all declared inter-library"
+ $echo "*** dependencies of module $libname. Therefore, libtool will create"
+ $echo "*** a static module, that should work as long as the dlopening"
+ $echo "*** application is linked with the -dlopen flag."
+ if test -z "$global_symbol_pipe"; then
+ $echo
+ $echo "*** However, this would only work if libtool was able to extract symbol"
+ $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ $echo "*** not find such a program. So, this module is probably useless."
+ $echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ fi
+ if test "$build_old_libs" = no; then
+ oldlibs="$output_objdir/$libname.$libext"
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+ build_libtool_libs=no
+ fi
+ else
+ $echo "*** The inter-library dependencies that have been dropped here will be"
+ $echo "*** automatically added whenever a program is linked with this library"
+ $echo "*** or is declared to -dlopen it."
+
+ if test "$allow_undefined" = no; then
+ $echo
+ $echo "*** Since this library must not contain undefined symbols,"
+ $echo "*** because either the platform does not support them or"
+ $echo "*** it was explicitly requested with -no-undefined,"
+ $echo "*** libtool will only create a static version of it."
+ if test "$build_old_libs" = no; then
+ oldlibs="$output_objdir/$libname.$libext"
+ build_libtool_libs=module
+ build_old_libs=yes
+ else
+ build_libtool_libs=no
+ fi
+ fi
+ fi
+ fi
+ # Done checking deplibs!
+ deplibs=$newdeplibs
+ fi
+
+ # All the library-specific variables (install_libdir is set above).
+ library_names=
+ old_library=
+ dlname=
+
+ # Test again, we may have decided not to build it any more
+ if test "$build_libtool_libs" = yes; then
+ if test "$hardcode_into_libs" = yes; then
+ # Hardcode the library paths
+ hardcode_libdirs=
+ dep_rpath=
+ rpath="$finalize_rpath"
+ test "$mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ dep_rpath="$dep_rpath $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+ *" $libdir "*) ;;
+ *) perm_rpath="$perm_rpath $libdir" ;;
+ esac
+ fi
+ done
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ if test -n "$hardcode_libdir_flag_spec_ld"; then
+ eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
+ else
+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ fi
+ fi
+ if test -n "$runpath_var" && test -n "$perm_rpath"; then
+ # We should set the runpath_var.
+ rpath=
+ for dir in $perm_rpath; do
+ rpath="$rpath$dir:"
+ done
+ eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
+ fi
+ test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
+ fi
+
+ shlibpath="$finalize_shlibpath"
+ test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ if test -n "$shlibpath"; then
+ eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
+ fi
+
+ # Get the real and link names of the library.
+ eval shared_ext=\"$shrext_cmds\"
+ eval library_names=\"$library_names_spec\"
+ set dummy $library_names
+ realname="$2"
+ shift; shift
+
+ if test -n "$soname_spec"; then
+ eval soname=\"$soname_spec\"
+ else
+ soname="$realname"
+ fi
+ if test -z "$dlname"; then
+ dlname=$soname
+ fi
+
+ lib="$output_objdir/$realname"
+ for link
+ do
+ linknames="$linknames $link"
+ done
+
+ # Use standard objects if they are pic
+ test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+ if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
+ $show "generating symbol list for \`$libname.la'"
+ export_symbols="$output_objdir/$libname.exp"
+ $run $rm $export_symbols
+ cmds=$export_symbols_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ if len=`expr "X$cmd" : ".*"` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ skipped_export=false
+ else
+ # The command line is too long to execute in one step.
+ $show "using reloadable object file for export list..."
+ skipped_export=:
+ fi
+ done
+ IFS="$save_ifs"
+ if test -n "$export_symbols_regex"; then
+ $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
+ $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
+ $show "$mv \"${export_symbols}T\" \"$export_symbols\""
+ $run eval '$mv "${export_symbols}T" "$export_symbols"'
+ fi
+ fi
+ fi
+
+ if test -n "$export_symbols" && test -n "$include_expsyms"; then
+ $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
+ fi
+
+ tmp_deplibs=
+ for test_deplib in $deplibs; do
+ case " $convenience " in
+ *" $test_deplib "*) ;;
+ *)
+ tmp_deplibs="$tmp_deplibs $test_deplib"
+ ;;
+ esac
+ done
+ deplibs="$tmp_deplibs"
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+ save_libobjs=$libobjs
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${outputname}x"
+ $show "${rm}r $gentop"
+ $run ${rm}r "$gentop"
+ $show "$mkdir $gentop"
+ $run $mkdir "$gentop"
+ status=$?
+ if test "$status" -ne 0 && test ! -d "$gentop"; then
+ exit $status
+ fi
+ generated="$generated $gentop"
+
+ for xlib in $convenience; do
+ # Extract the objects.
+ case $xlib in
+ [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ *) xabs=`pwd`"/$xlib" ;;
+ esac
+ xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ xdir="$gentop/$xlib"
+
+ $show "${rm}r $xdir"
+ $run ${rm}r "$xdir"
+ $show "$mkdir $xdir"
+ $run $mkdir "$xdir"
+ status=$?
+ if test "$status" -ne 0 && test ! -d "$xdir"; then
+ exit $status
+ fi
+ # We will extract separately just the conflicting names and we will no
+ # longer touch any unique names. It is faster to leave these extract
+ # automatically by $AR in one run.
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ $AR t "$xabs" | sort | uniq -cd | while read -r count name
+ do
+ i=1
+ while test "$i" -le "$count"
+ do
+ # Put our $i before any first dot (extension)
+ # Never overwrite any file
+ name_to="$name"
+ while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ do
+ name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ done
+ $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ i=`expr $i + 1`
+ done
+ done
+ fi
+
+ libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ done
+ fi
+ fi
+
+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ eval flag=\"$thread_safe_flag_spec\"
+ linker_flags="$linker_flags $flag"
+ fi
+
+ # Make a backup of the uninstalled library when relinking
+ if test "$mode" = relink; then
+ $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+ fi
+
+ # Do each of the archive commands.
+ if test "$module" = yes && test -n "$module_cmds" ; then
+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+ eval test_cmds=\"$module_expsym_cmds\"
+ cmds=$module_expsym_cmds
+ else
+ eval test_cmds=\"$module_cmds\"
+ cmds=$module_cmds
+ fi
+ else
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ eval test_cmds=\"$archive_expsym_cmds\"
+ cmds=$archive_expsym_cmds
+ else
+ eval test_cmds=\"$archive_cmds\"
+ cmds=$archive_cmds
+ fi
+ fi
+
+ if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ :
+ else
+ # The command line is too long to link in one step, link piecewise.
+ $echo "creating reloadable object files..."
+
+ # Save the value of $output and $libobjs because we want to
+ # use them later. If we have whole_archive_flag_spec, we
+ # want to use save_libobjs as it was before
+ # whole_archive_flag_spec was expanded, because we can't
+ # assume the linker understands whole_archive_flag_spec.
+ # This may have to be revisited, in case too many
+ # convenience libraries get linked in and end up exceeding
+ # the spec.
+ if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
+ save_libobjs=$libobjs
+ fi
+ save_output=$output
+
+ # Clear the reloadable object creation command queue and
+ # initialize k to one.
+ test_cmds=
+ concat_cmds=
+ objlist=
+ delfiles=
+ last_robj=
+ k=1
+ output=$output_objdir/$save_output-${k}.$objext
+ # Loop over the list of objects to be linked.
+ for obj in $save_libobjs
+ do
+ eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ if test "X$objlist" = X ||
+ { len=`expr "X$test_cmds" : ".*"` &&
+ test "$len" -le "$max_cmd_len"; }; then
+ objlist="$objlist $obj"
+ else
+ # The command $test_cmds is almost too long, add a
+ # command to the queue.
+ if test "$k" -eq 1 ; then
+ # The first file doesn't have a previous command to add.
+ eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+ else
+ # All subsequent reloadable object files will link in
+ # the last one created.
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ fi
+ last_robj=$output_objdir/$save_output-${k}.$objext
+ k=`expr $k + 1`
+ output=$output_objdir/$save_output-${k}.$objext
+ objlist=$obj
+ len=1
+ fi
+ done
+ # Handle the remaining objects by creating one last
+ # reloadable object file. All subsequent reloadable object
+ # files will link in the last one created.
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+
+ if ${skipped_export-false}; then
+ $show "generating symbol list for \`$libname.la'"
+ export_symbols="$output_objdir/$libname.exp"
+ $run $rm $export_symbols
+ libobjs=$output
+ # Append the command to create the export file.
+ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+ fi
+
+ # Set up a command to remove the reloadale object files
+ # after they are used.
+ i=0
+ while test "$i" -lt "$k"
+ do
+ i=`expr $i + 1`
+ delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
+ done
+
+ $echo "creating a temporary reloadable object file: $output"
+
+ # Loop through the commands generated above and execute them.
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $concat_cmds; do
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+
+ libobjs=$output
+ # Restore the value of output.
+ output=$save_output
+
+ if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ fi
+ # Expand the library linking commands again to reset the
+ # value of $libobjs for piecewise linking.
+
+ # Do each of the archive commands.
+ if test "$module" = yes && test -n "$module_cmds" ; then
+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+ cmds=$module_expsym_cmds
+ else
+ cmds=$module_cmds
+ fi
+ else
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+ cmds=$archive_expsym_cmds
+ else
+ cmds=$archive_cmds
+ fi
+ fi
+
+ # Append the command to remove the reloadable object files
+ # to the just-reset $cmds.
+ eval cmds=\"\$cmds~\$rm $delfiles\"
+ fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+ exit $EXIT_SUCCESS
+ fi
+
+ # Create links to the real library.
+ for linkname in $linknames; do
+ if test "$realname" != "$linkname"; then
+ $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
+ $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
+ fi
+ done
+
+ # If -module or -export-dynamic was specified, set the dlname.
+ if test "$module" = yes || test "$export_dynamic" = yes; then
+ # On all known operating systems, these are identical.
+ dlname="$soname"
+ fi
+ fi
+ ;;
+
+ obj)
+ if test -n "$deplibs"; then
+ $echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
+ fi
+
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ $echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
+ fi
+
+ if test -n "$rpath"; then
+ $echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
+ fi
+
+ if test -n "$xrpath"; then
+ $echo "$modename: warning: \`-R' is ignored for objects" 1>&2
+ fi
+
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
+ fi
+
+ if test -n "$release"; then
+ $echo "$modename: warning: \`-release' is ignored for objects" 1>&2
+ fi
+
+ case $output in
+ *.lo)
+ if test -n "$objs$old_deplibs"; then
+ $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ libobj="$output"
+ obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+ ;;
+ *)
+ libobj=
+ obj="$output"
+ ;;
+ esac
+
+ # Delete the old objects.
+ $run $rm $obj $libobj
+
+ # Objects from convenience libraries. This assumes
+ # single-version convenience libraries. Whenever we create
+ # different ones for PIC/non-PIC, this we'll have to duplicate
+ # the extraction.
+ reload_conv_objs=
+ gentop=
+ # reload_cmds runs $LD directly, so let us get rid of
+ # -Wl from whole_archive_flag_spec
+ wl=
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+ eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${obj}x"
+ $show "${rm}r $gentop"
+ $run ${rm}r "$gentop"
+ $show "$mkdir $gentop"
+ $run $mkdir "$gentop"
+ status=$?
+ if test "$status" -ne 0 && test ! -d "$gentop"; then
+ exit $status
+ fi
+ generated="$generated $gentop"
+
+ for xlib in $convenience; do
+ # Extract the objects.
+ case $xlib in
+ [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ *) xabs=`pwd`"/$xlib" ;;
+ esac
+ xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ xdir="$gentop/$xlib"
+
+ $show "${rm}r $xdir"
+ $run ${rm}r "$xdir"
+ $show "$mkdir $xdir"
+ $run $mkdir "$xdir"
+ status=$?
+ if test "$status" -ne 0 && test ! -d "$xdir"; then
+ exit $status
+ fi
+ # We will extract separately just the conflicting names and we will no
+ # longer touch any unique names. It is faster to leave these extract
+ # automatically by $AR in one run.
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ $AR t "$xabs" | sort | uniq -cd | while read -r count name
+ do
+ i=1
+ while test "$i" -le "$count"
+ do
+ # Put our $i before any first dot (extension)
+ # Never overwrite any file
+ name_to="$name"
+ while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ do
+ name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ done
+ $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ i=`expr $i + 1`
+ done
+ done
+ fi
+
+ reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+ done
+ fi
+ fi
+
+ # Create the old-style object.
+ reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+ output="$obj"
+ cmds=$reload_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+
+ # Exit if we aren't doing a library object file.
+ if test -z "$libobj"; then
+ if test -n "$gentop"; then
+ $show "${rm}r $gentop"
+ $run ${rm}r $gentop
+ fi
+
+ exit $EXIT_SUCCESS
+ fi
+
+ if test "$build_libtool_libs" != yes; then
+ if test -n "$gentop"; then
+ $show "${rm}r $gentop"
+ $run ${rm}r $gentop
+ fi
+
+ # Create an invalid libtool object if no PIC, so that we don't
+ # accidentally link it into a program.
+ # $show "echo timestamp > $libobj"
+ # $run eval "echo timestamp > $libobj" || exit $?
+ exit $EXIT_SUCCESS
+ fi
+
+ if test -n "$pic_flag" || test "$pic_mode" != default; then
+ # Only do commands if we really have different PIC objects.
+ reload_objs="$libobjs $reload_conv_objs"
+ output="$libobj"
+ cmds=$reload_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ fi
+
+ if test -n "$gentop"; then
+ $show "${rm}r $gentop"
+ $run ${rm}r $gentop
+ fi
+
+ exit $EXIT_SUCCESS
+ ;;
+
+ prog)
+ case $host in
+ *cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
+ esac
+ if test -n "$vinfo"; then
+ $echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
+ fi
+
+ if test -n "$release"; then
+ $echo "$modename: warning: \`-release' is ignored for programs" 1>&2
+ fi
+
+ if test "$preload" = yes; then
+ if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
+ test "$dlopen_self_static" = unknown; then
+ $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
+ fi
+ fi
+
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ ;;
+ esac
+
+ case $host in
+ *darwin*)
+ # Don't allow lazy linking, it breaks C++ global constructors
+ if test "$tagname" = CXX ; then
+ compile_command="$compile_command ${wl}-bind_at_load"
+ finalize_command="$finalize_command ${wl}-bind_at_load"
+ fi
+ ;;
+ esac
+
+ compile_command="$compile_command $compile_deplibs"
+ finalize_command="$finalize_command $finalize_deplibs"
+
+ if test -n "$rpath$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+ for libdir in $rpath $xrpath; do
+ # This is the magic to use -rpath.
+ case "$finalize_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
+ esac
+ done
+ fi
+
+ # Now hardcode the library paths
+ rpath=
+ hardcode_libdirs=
+ for libdir in $compile_rpath $finalize_rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ rpath="$rpath $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$perm_rpath " in
+ *" $libdir "*) ;;
+ *) perm_rpath="$perm_rpath $libdir" ;;
+ esac
+ fi
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
+ case :$dllsearchpath: in
+ *":$libdir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$libdir";;
+ esac
+ ;;
+ esac
+ done
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ eval rpath=\" $hardcode_libdir_flag_spec\"
+ fi
+ compile_rpath="$rpath"
+
+ rpath=
+ hardcode_libdirs=
+ for libdir in $finalize_rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+ if test -z "$hardcode_libdirs"; then
+ hardcode_libdirs="$libdir"
+ else
+ # Just accumulate the unique libdirs.
+ case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
+ *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
+ ;;
+ *)
+ hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+ ;;
+ esac
+ fi
+ else
+ eval flag=\"$hardcode_libdir_flag_spec\"
+ rpath="$rpath $flag"
+ fi
+ elif test -n "$runpath_var"; then
+ case "$finalize_perm_rpath " in
+ *" $libdir "*) ;;
+ *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+ esac
+ fi
+ done
+ # Substitute the hardcoded libdirs into the rpath.
+ if test -n "$hardcode_libdir_separator" &&
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ eval rpath=\" $hardcode_libdir_flag_spec\"
+ fi
+ finalize_rpath="$rpath"
+
+ if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ # Transform all the library objects into standard objects.
+ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ fi
+
+ dlsyms=
+ if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$NM" && test -n "$global_symbol_pipe"; then
+ dlsyms="${outputname}S.c"
+ else
+ $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
+ fi
+ fi
+
+ if test -n "$dlsyms"; then
+ case $dlsyms in
+ "") ;;
+ *.c)
+ # Discover the nlist of each of the dlfiles.
+ nlist="$output_objdir/${outputname}.nm"
+
+ $show "$rm $nlist ${nlist}S ${nlist}T"
+ $run $rm "$nlist" "${nlist}S" "${nlist}T"
+
+ # Parse the name list into a source file.
+ $show "creating $output_objdir/$dlsyms"
+
+ test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
+/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
+/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
+
+#ifdef __cplusplus
+extern \"C\" {
+#endif
+
+/* Prevent the only kind of declaration conflicts we can make. */
+#define lt_preloaded_symbols some_other_symbol
+
+/* External symbol declarations for the compiler. */\
+"
+
+ if test "$dlself" = yes; then
+ $show "generating symbol list for \`$output'"
+
+ test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
+
+ # Add our own program objects to the symbol list.
+ progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+ for arg in $progfiles; do
+ $show "extracting global C symbols from \`$arg'"
+ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+ done
+
+ if test -n "$exclude_expsyms"; then
+ $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
+ $run eval '$mv "$nlist"T "$nlist"'
+ fi
+
+ if test -n "$export_symbols_regex"; then
+ $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
+ $run eval '$mv "$nlist"T "$nlist"'
+ fi
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+ export_symbols="$output_objdir/$output.exp"
+ $run $rm $export_symbols
+ $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ else
+ $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+ $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
+ $run eval 'mv "$nlist"T "$nlist"'
+ fi
+ fi
+
+ for arg in $dlprefiles; do
+ $show "extracting global C symbols from \`$arg'"
+ name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
+ $run eval '$echo ": $name " >> "$nlist"'
+ $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
+ done
+
+ if test -z "$run"; then
+ # Make sure we have at least an empty file.
+ test -f "$nlist" || : > "$nlist"
+
+ if test -n "$exclude_expsyms"; then
+ $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
+ $mv "$nlist"T "$nlist"
+ fi
+
+ # Try sorting and uniquifying the output.
+ if grep -v "^: " < "$nlist" |
+ if sort -k 3 </dev/null >/dev/null 2>&1; then
+ sort -k 3
+ else
+ sort +2
+ fi |
+ uniq > "$nlist"S; then
+ :
+ else
+ grep -v "^: " < "$nlist" > "$nlist"S
+ fi
+
+ if test -f "$nlist"S; then
+ eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
+ else
+ $echo '/* NONE */' >> "$output_objdir/$dlsyms"
+ fi
+
+ $echo >> "$output_objdir/$dlsyms" "\
+
+#undef lt_preloaded_symbols
+
+#if defined (__STDC__) && __STDC__
+# define lt_ptr void *
+#else
+# define lt_ptr char *
+# define const
+#endif
+
+/* The mapping between symbol names and symbols. */
+const struct {
+ const char *name;
+ lt_ptr address;
+}
+lt_preloaded_symbols[] =
+{\
+"
+
+ eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
+
+ $echo >> "$output_objdir/$dlsyms" "\
+ {0, (lt_ptr) 0}
+};
+
+/* This works around a problem in FreeBSD linker */
+#ifdef FREEBSD_WORKAROUND
+static const void *lt_preloaded_setup() {
+ return lt_preloaded_symbols;
+}
+#endif
+
+#ifdef __cplusplus
+}
+#endif\
+"
+ fi
+
+ pic_flag_for_symtable=
+ case $host in
+ # compiling the symbol table file with pic_flag works around
+ # a FreeBSD bug that causes programs to crash when -lm is
+ # linked before any other PIC object. But we must not use
+ # pic_flag when linking with -static. The problem exists in
+ # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
+ *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+ case "$compile_command " in
+ *" -static "*) ;;
+ *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
+ esac;;
+ *-*-hpux*)
+ case "$compile_command " in
+ *" -static "*) ;;
+ *) pic_flag_for_symtable=" $pic_flag";;
+ esac
+ esac
+
+ # Now compile the dynamic symbol file.
+ $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+ $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+ # Clean up the generated files.
+ $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+ $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+
+ # Transform the symbol file into the correct name.
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+ ;;
+ *)
+ $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+ else
+ # We keep going just in case the user didn't refer to
+ # lt_preloaded_symbols. The linker will fail if global_symbol_pipe
+ # really was required.
+
+ # Nullify the symbol file.
+ compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+ finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+ fi
+
+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ # Replace the output file specification.
+ compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ link_command="$compile_command$compile_rpath"
+
+ # We have no uninstalled library dependencies, so finalize right now.
+ $show "$link_command"
+ $run eval "$link_command"
+ status=$?
+
+ # Delete the generated files.
+ if test -n "$dlsyms"; then
+ $show "$rm $output_objdir/${outputname}S.${objext}"
+ $run $rm "$output_objdir/${outputname}S.${objext}"
+ fi
+
+ exit $status
+ fi
+
+ if test -n "$shlibpath_var"; then
+ # We should set the shlibpath_var
+ rpath=
+ for dir in $temp_rpath; do
+ case $dir in
+ [\\/]* | [A-Za-z]:[\\/]*)
+ # Absolute path.
+ rpath="$rpath$dir:"
+ ;;
+ *)
+ # Relative path: add a thisdir entry.
+ rpath="$rpath\$thisdir/$dir:"
+ ;;
+ esac
+ done
+ temp_rpath="$rpath"
+ fi
+
+ if test -n "$compile_shlibpath$finalize_shlibpath"; then
+ compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
+ fi
+ if test -n "$finalize_shlibpath"; then
+ finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
+ fi
+
+ compile_var=
+ finalize_var=
+ if test -n "$runpath_var"; then
+ if test -n "$perm_rpath"; then
+ # We should set the runpath_var.
+ rpath=
+ for dir in $perm_rpath; do
+ rpath="$rpath$dir:"
+ done
+ compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ fi
+ if test -n "$finalize_perm_rpath"; then
+ # We should set the runpath_var.
+ rpath=
+ for dir in $finalize_perm_rpath; do
+ rpath="$rpath$dir:"
+ done
+ finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
+ fi
+ fi
+
+ if test "$no_install" = yes; then
+ # We don't need to create a wrapper script.
+ link_command="$compile_var$compile_command$compile_rpath"
+ # Replace the output file specification.
+ link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+ # Delete the old output file.
+ $run $rm $output
+ # Link the executable and exit
+ $show "$link_command"
+ $run eval "$link_command" || exit $?
+ exit $EXIT_SUCCESS
+ fi
+
+ if test "$hardcode_action" = relink; then
+ # Fast installation is not supported
+ link_command="$compile_var$compile_command$compile_rpath"
+ relink_command="$finalize_var$finalize_command$finalize_rpath"
+
+ $echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
+ $echo "$modename: \`$output' will be relinked during installation" 1>&2
+ else
+ if test "$fast_install" != no; then
+ link_command="$finalize_var$compile_command$finalize_rpath"
+ if test "$fast_install" = yes; then
+ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+ else
+ # fast_install is set to needless
+ relink_command=
+ fi
+ else
+ link_command="$compile_var$compile_command$compile_rpath"
+ relink_command="$finalize_var$finalize_command$finalize_rpath"
+ fi
+ fi
+
+ # Replace the output file specification.
+ link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+
+ # Delete the old output files.
+ $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
+
+ $show "$link_command"
+ $run eval "$link_command" || exit $?
+
+ # Now create the wrapper script.
+ $show "creating $output"
+
+ # Quote the relink command for shipping.
+ if test -n "$relink_command"; then
+ # Preserve any variables that may affect compiler behavior
+ for var in $variables_saved_for_relink; do
+ if eval test -z \"\${$var+set}\"; then
+ relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+ elif eval var_value=\$$var; test -z "$var_value"; then
+ relink_command="$var=; export $var; $relink_command"
+ else
+ var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+ relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ fi
+ done
+ relink_command="(cd `pwd`; $relink_command)"
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ fi
+
+ # Quote $echo for shipping.
+ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
+ case $progpath in
+ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
+ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ esac
+ qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+ else
+ qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
+ fi
+
+ # Only actually do things if our run command is non-null.
+ if test -z "$run"; then
+ # win32 will think the script is a binary if it has
+ # a .exe suffix, so we strip it off here.
+ case $output in
+ *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
+ esac
+ # test for cygwin because mv fails w/o .exe extensions
+ case $host in
+ *cygwin*)
+ exeext=.exe
+ outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
+ *) exeext= ;;
+ esac
+ case $host in
+ *cygwin* | *mingw* )
+ cwrappersource=`$echo ${objdir}/lt-${output}.c`
+ cwrapper=`$echo ${output}.exe`
+ $rm $cwrappersource $cwrapper
+ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+ cat > $cwrappersource <<EOF
+
+/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
+ Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+
+ The $output program cannot be directly executed until all the libtool
+ libraries that it depends on are installed.
+
+ This wrapper executable should never be moved out of the build directory.
+ If it is, it will not operate correctly.
+
+ Currently, it simply execs the wrapper *script* "/bin/sh $output",
+ but could eventually absorb all of the scripts functionality and
+ exec $objdir/$outputname directly.
+*/
+EOF
+ cat >> $cwrappersource<<"EOF"
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <malloc.h>
+#include <stdarg.h>
+#include <assert.h>
+
+#if defined(PATH_MAX)
+# define LT_PATHMAX PATH_MAX
+#elif defined(MAXPATHLEN)
+# define LT_PATHMAX MAXPATHLEN
+#else
+# define LT_PATHMAX 1024
+#endif
+
+#ifndef DIR_SEPARATOR
+#define DIR_SEPARATOR '/'
+#endif
+
+#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+ defined (__OS2__)
+#define HAVE_DOS_BASED_FILE_SYSTEM
+#ifndef DIR_SEPARATOR_2
+#define DIR_SEPARATOR_2 '\\'
+#endif
+#endif
+
+#ifndef DIR_SEPARATOR_2
+# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
+#else /* DIR_SEPARATOR_2 */
+# define IS_DIR_SEPARATOR(ch) \
+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+#endif /* DIR_SEPARATOR_2 */
+
+#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
+#define XFREE(stale) do { \
+ if (stale) { free ((void *) stale); stale = 0; } \
+} while (0)
+
+const char *program_name = NULL;
+
+void * xmalloc (size_t num);
+char * xstrdup (const char *string);
+char * basename (const char *name);
+char * fnqualify(const char *path);
+char * strendzap(char *str, const char *pat);
+void lt_fatal (const char *message, ...);
+
+int
+main (int argc, char *argv[])
+{
+ char **newargz;
+ int i;
+
+ program_name = (char *) xstrdup ((char *) basename (argv[0]));
+ newargz = XMALLOC(char *, argc+2);
+EOF
+
+ cat >> $cwrappersource <<EOF
+ newargz[0] = "$SHELL";
+EOF
+
+ cat >> $cwrappersource <<"EOF"
+ newargz[1] = fnqualify(argv[0]);
+ /* we know the script has the same name, without the .exe */
+ /* so make sure newargz[1] doesn't end in .exe */
+ strendzap(newargz[1],".exe");
+ for (i = 1; i < argc; i++)
+ newargz[i+1] = xstrdup(argv[i]);
+ newargz[argc+1] = NULL;
+EOF
+
+ cat >> $cwrappersource <<EOF
+ execv("$SHELL",newargz);
+EOF
+
+ cat >> $cwrappersource <<"EOF"
+}
+
+void *
+xmalloc (size_t num)
+{
+ void * p = (void *) malloc (num);
+ if (!p)
+ lt_fatal ("Memory exhausted");
+
+ return p;
+}
+
+char *
+xstrdup (const char *string)
+{
+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+;
+}
+
+char *
+basename (const char *name)
+{
+ const char *base;
+
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ /* Skip over the disk name in MSDOS pathnames. */
+ if (isalpha (name[0]) && name[1] == ':')
+ name += 2;
+#endif
+
+ for (base = name; *name; name++)
+ if (IS_DIR_SEPARATOR (*name))
+ base = name + 1;
+ return (char *) base;
+}
+
+char *
+fnqualify(const char *path)
+{
+ size_t size;
+ char *p;
+ char tmp[LT_PATHMAX + 1];
+
+ assert(path != NULL);
+
+ /* Is it qualified already? */
+#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ if (isalpha (path[0]) && path[1] == ':')
+ return xstrdup (path);
+#endif
+ if (IS_DIR_SEPARATOR (path[0]))
+ return xstrdup (path);
+
+ /* prepend the current directory */
+ /* doesn't handle '~' */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+ lt_fatal ("getcwd failed");
+ size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+ p = XMALLOC(char, size);
+ sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+ return p;
+}
+
+char *
+strendzap(char *str, const char *pat)
+{
+ size_t len, patlen;
+
+ assert(str != NULL);
+ assert(pat != NULL);
+
+ len = strlen(str);
+ patlen = strlen(pat);
+
+ if (patlen <= len)
+ {
+ str += len - patlen;
+ if (strcmp(str, pat) == 0)
+ *str = '\0';
+ }
+ return str;
+}
+
+static void
+lt_error_core (int exit_status, const char * mode,
+ const char * message, va_list ap)
+{
+ fprintf (stderr, "%s: %s: ", program_name, mode);
+ vfprintf (stderr, message, ap);
+ fprintf (stderr, ".\n");
+
+ if (exit_status >= 0)
+ exit (exit_status);
+}
+
+void
+lt_fatal (const char *message, ...)
+{
+ va_list ap;
+ va_start (ap, message);
+ lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+ va_end (ap);
+}
+EOF
+ # we should really use a build-platform specific compiler
+ # here, but OTOH, the wrappers (shell script and this C one)
+ # are only useful if you want to execute the "real" binary.
+ # Since the "real" binary is built for $host, then this
+ # wrapper might as well be built for $host, too.
+ $run $LTCC -s -o $cwrapper $cwrappersource
+ ;;
+ esac
+ $rm $output
+ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+
+ $echo > $output "\
+#! $SHELL
+
+# $output - temporary wrapper script for $objdir/$outputname
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# The $output program cannot be directly executed until all the libtool
+# libraries that it depends on are installed.
+#
+# This wrapper script should never be moved out of the build directory.
+# If it is, it will not operate correctly.
+
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+Xsed='${SED} -e 1s/^X//'
+sed_quote_subst='$sed_quote_subst'
+
+# The HP-UX ksh and POSIX shell print the target directory to stdout
+# if CDPATH is set.
+if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
+
+relink_command=\"$relink_command\"
+
+# This environment variable determines our operation mode.
+if test \"\$libtool_install_magic\" = \"$magic\"; then
+ # install mode needs the following variable:
+ notinst_deplibs='$notinst_deplibs'
+else
+ # When we are sourced in execute mode, \$file and \$echo are already set.
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+ echo=\"$qecho\"
+ file=\"\$0\"
+ # Make sure echo works.
+ if test \"X\$1\" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+ shift
+ elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
+ # Yippee, \$echo works!
+ :
+ else
+ # Restart under the correct shell, and then maybe \$echo will work.
+ exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
+ fi
+ fi\
+"
+ $echo >> $output "\
+
+ # Find the directory that this script lives in.
+ thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+ test \"x\$thisdir\" = \"x\$file\" && thisdir=.
+
+ # Follow symbolic links until we get to the real thisdir.
+ file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+ while test -n \"\$file\"; do
+ destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+
+ # If there was a directory component, then change thisdir.
+ if test \"x\$destdir\" != \"x\$file\"; then
+ case \"\$destdir\" in
+ [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
+ *) thisdir=\"\$thisdir/\$destdir\" ;;
+ esac
+ fi
+
+ file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
+ file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+ done
+
+ # Try to get the absolute directory name.
+ absdir=\`cd \"\$thisdir\" && pwd\`
+ test -n \"\$absdir\" && thisdir=\"\$absdir\"
+"
+
+ if test "$fast_install" = yes; then
+ $echo >> $output "\
+ program=lt-'$outputname'$exeext
+ progdir=\"\$thisdir/$objdir\"
+
+ if test ! -f \"\$progdir/\$program\" || \\
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ test \"X\$file\" != \"X\$progdir/\$program\"; }; then
+
+ file=\"\$\$-\$program\"
+
+ if test ! -d \"\$progdir\"; then
+ $mkdir \"\$progdir\"
+ else
+ $rm \"\$progdir/\$file\"
+ fi"
+
+ $echo >> $output "\
+
+ # relink executable if necessary
+ if test -n \"\$relink_command\"; then
+ if relink_command_output=\`eval \$relink_command 2>&1\`; then :
+ else
+ $echo \"\$relink_command_output\" >&2
+ $rm \"\$progdir/\$file\"
+ exit $EXIT_FAILURE
+ fi
+ fi
+
+ $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
+ { $rm \"\$progdir/\$program\";
+ $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
+ $rm \"\$progdir/\$file\"
+ fi"
+ else
+ $echo >> $output "\
+ program='$outputname'
+ progdir=\"\$thisdir/$objdir\"
+"
+ fi
+
+ $echo >> $output "\
+
+ if test -f \"\$progdir/\$program\"; then"
+
+ # Export our shlibpath_var if we have one.
+ if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ $echo >> $output "\
+ # Add our own library path to $shlibpath_var
+ $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
+
+ # Some systems cannot cope with colon-terminated $shlibpath_var
+ # The second colon is a workaround for a bug in BeOS R4 sed
+ $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+
+ export $shlibpath_var
+"
+ fi
+
+ # fixup the dll searchpath if we need to.
+ if test -n "$dllsearchpath"; then
+ $echo >> $output "\
+ # Add the dll search path components to the executable PATH
+ PATH=$dllsearchpath:\$PATH
+"
+ fi
+
+ $echo >> $output "\
+ if test \"\$libtool_execute_magic\" != \"$magic\"; then
+ # Run the actual program with our arguments.
+"
+ case $host in
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2*)
+ $echo >> $output "\
+ exec \$progdir\\\\\$program \${1+\"\$@\"}
+"
+ ;;
+
+ *)
+ $echo >> $output "\
+ exec \$progdir/\$program \${1+\"\$@\"}
+"
+ ;;
+ esac
+ $echo >> $output "\
+ \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+ exit $EXIT_FAILURE
+ fi
+ else
+ # The program doesn't exist.
+ \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
+ \$echo \"This script is just a wrapper for \$program.\" 1>&2
+ $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+ exit $EXIT_FAILURE
+ fi
+fi\
+"
+ chmod +x $output
+ fi
+ exit $EXIT_SUCCESS
+ ;;
+ esac
+
+ # See if we need to build an old-fashioned archive.
+ for oldlib in $oldlibs; do
+
+ if test "$build_libtool_libs" = convenience; then
+ oldobjs="$libobjs_save"
+ addlibs="$convenience"
+ build_libtool_libs=no
+ else
+ if test "$build_libtool_libs" = module; then
+ oldobjs="$libobjs_save"
+ build_libtool_libs=no
+ else
+ oldobjs="$old_deplibs $non_pic_objects"
+ fi
+ addlibs="$old_convenience"
+ fi
+
+ if test -n "$addlibs"; then
+ gentop="$output_objdir/${outputname}x"
+ $show "${rm}r $gentop"
+ $run ${rm}r "$gentop"
+ $show "$mkdir $gentop"
+ $run $mkdir "$gentop"
+ status=$?
+ if test "$status" -ne 0 && test ! -d "$gentop"; then
+ exit $status
+ fi
+ generated="$generated $gentop"
+
+ # Add in members from convenience archives.
+ for xlib in $addlibs; do
+ # Extract the objects.
+ case $xlib in
+ [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+ *) xabs=`pwd`"/$xlib" ;;
+ esac
+ xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+ xdir="$gentop/$xlib"
+
+ $show "${rm}r $xdir"
+ $run ${rm}r "$xdir"
+ $show "$mkdir $xdir"
+ $run $mkdir "$xdir"
+ status=$?
+ if test "$status" -ne 0 && test ! -d "$xdir"; then
+ exit $status
+ fi
+ # We will extract separately just the conflicting names and we will no
+ # longer touch any unique names. It is faster to leave these extract
+ # automatically by $AR in one run.
+ $show "(cd $xdir && $AR x $xabs)"
+ $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+ if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+ $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+ $AR t "$xabs" | sort | uniq -cd | while read -r count name
+ do
+ i=1
+ while test "$i" -le "$count"
+ do
+ # Put our $i before any first dot (extension)
+ # Never overwrite any file
+ name_to="$name"
+ while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+ do
+ name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+ done
+ $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+ $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+ i=`expr $i + 1`
+ done
+ done
+ fi
+
+ oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+ done
+ fi
+
+ # Do each command in the archive commands.
+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ cmds=$old_archive_from_new_cmds
+ else
+ eval cmds=\"$old_archive_cmds\"
+
+ if len=`expr "X$cmds" : ".*"` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ cmds=$old_archive_cmds
+ else
+ # the command line is too long to link in one step, link in parts
+ $echo "using piecewise archive linking..."
+ save_RANLIB=$RANLIB
+ RANLIB=:
+ objlist=
+ concat_cmds=
+ save_oldobjs=$oldobjs
+ # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+ # encoded into archives. This makes 'ar r' malfunction in
+ # this piecewise linking case whenever conflicting object
+ # names appear in distinct ar calls; check, warn and compensate.
+ if (for obj in $save_oldobjs
+ do
+ $echo "X$obj" | $Xsed -e 's%^.*/%%'
+ done | sort | sort -uc >/dev/null 2>&1); then
+ :
+ else
+ $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+ $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+ AR_FLAGS=cq
+ fi
+ # Is there a better way of finding the last object in the list?
+ for obj in $save_oldobjs
+ do
+ last_oldobj=$obj
+ done
+ for obj in $save_oldobjs
+ do
+ oldobjs="$objlist $obj"
+ objlist="$objlist $obj"
+ eval test_cmds=\"$old_archive_cmds\"
+ if len=`expr "X$test_cmds" : ".*"` &&
+ test "$len" -le "$max_cmd_len"; then
+ :
+ else
+ # the above command should be used before it gets too long
+ oldobjs=$objlist
+ if test "$obj" = "$last_oldobj" ; then
+ RANLIB=$save_RANLIB
+ fi
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ objlist=
+ fi
+ done
+ RANLIB=$save_RANLIB
+ oldobjs=$objlist
+ if test "X$oldobjs" = "X" ; then
+ eval cmds=\"\$concat_cmds\"
+ else
+ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ fi
+ fi
+ fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ eval cmd=\"$cmd\"
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ done
+
+ if test -n "$generated"; then
+ $show "${rm}r$generated"
+ $run ${rm}r$generated
+ fi
+
+ # Now create the libtool archive.
+ case $output in
+ *.la)
+ old_library=
+ test "$build_old_libs" = yes && old_library="$libname.$libext"
+ $show "creating $output"
+
+ # Preserve any variables that may affect compiler behavior
+ for var in $variables_saved_for_relink; do
+ if eval test -z \"\${$var+set}\"; then
+ relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
+ elif eval var_value=\$$var; test -z "$var_value"; then
+ relink_command="$var=; export $var; $relink_command"
+ else
+ var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
+ relink_command="$var=\"$var_value\"; export $var; $relink_command"
+ fi
+ done
+ # Quote the link command for shipping.
+ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+ if test "$hardcode_automatic" = yes ; then
+ relink_command=
+ fi
+
+
+ # Only create the output if not a dry run.
+ if test -z "$run"; then
+ for installed in no yes; do
+ if test "$installed" = yes; then
+ if test -z "$install_libdir"; then
+ break
+ fi
+ output="$output_objdir/$outputname"i
+ # Replace all uninstalled libtool libraries with the installed ones
+ newdependency_libs=
+ for deplib in $dependency_libs; do
+ case $deplib in
+ *.la)
+ name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ newdependency_libs="$newdependency_libs $libdir/$name"
+ ;;
+ *) newdependency_libs="$newdependency_libs $deplib" ;;
+ esac
+ done
+ dependency_libs="$newdependency_libs"
+ newdlfiles=
+ for lib in $dlfiles; do
+ name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ newdlfiles="$newdlfiles $libdir/$name"
+ done
+ dlfiles="$newdlfiles"
+ newdlprefiles=
+ for lib in $dlprefiles; do
+ name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ newdlprefiles="$newdlprefiles $libdir/$name"
+ done
+ dlprefiles="$newdlprefiles"
+ else
+ newdlfiles=
+ for lib in $dlfiles; do
+ case $lib in
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+ newdlfiles="$newdlfiles $abs"
+ done
+ dlfiles="$newdlfiles"
+ newdlprefiles=
+ for lib in $dlprefiles; do
+ case $lib in
+ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ *) abs=`pwd`"/$lib" ;;
+ esac
+ newdlprefiles="$newdlprefiles $abs"
+ done
+ dlprefiles="$newdlprefiles"
+ fi
+ $rm $output
+ # place dlname in correct position for cygwin
+ tdlname=$dlname
+ case $host,$output,$installed,$module,$dlname in
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ esac
+ $echo > $output "\
+# $outputname - a libtool library file
+# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+#
+# Please DO NOT delete this file!
+# It is necessary for linking the library.
+
+# The name that we can dlopen(3).
+dlname='$tdlname'
+
+# Names of this library.
+library_names='$library_names'
+
+# The name of the static archive.
+old_library='$old_library'
+
+# Libraries that this one depends upon.
+dependency_libs='$dependency_libs'
+
+# Version information for $libname.
+current=$current
+age=$age
+revision=$revision
+
+# Is this an already installed library?
+installed=$installed
+
+# Should we warn about portability when linking against -modules?
+shouldnotlink=$module
+
+# Files to dlopen/dlpreopen
+dlopen='$dlfiles'
+dlpreopen='$dlprefiles'
+
+# Directory that this library needs to be installed in:
+libdir='$install_libdir'"
+ if test "$installed" = no && test "$need_relink" = yes; then
+ $echo >> $output "\
+relink_command=\"$relink_command\""
+ fi
+ done
+ fi
+
+ # Do a symbolic link so that the libtool archive can be found in
+ # LD_LIBRARY_PATH before the program is installed.
+ $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
+ $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+ ;;
+ esac
+ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool install mode
+ install)
+ modename="$modename: install"
+
+ # There may be an optional sh(1) argument at the beginning of
+ # install_prog (especially on Windows NT).
+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+ $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
+ # Aesthetically quote it.
+ arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ arg="\"$arg\""
+ ;;
+ esac
+ install_prog="$arg "
+ arg="$1"
+ shift
+ else
+ install_prog=
+ arg="$nonopt"
+ fi
+
+ # The real first argument should be the name of the installation program.
+ # Aesthetically quote it.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ arg="\"$arg\""
+ ;;
+ esac
+ install_prog="$install_prog$arg"
+
+ # We need to accept at least all the BSD install flags.
+ dest=
+ files=
+ opts=
+ prev=
+ install_type=
+ isdir=no
+ stripme=
+ for arg
+ do
+ if test -n "$dest"; then
+ files="$files $dest"
+ dest="$arg"
+ continue
+ fi
+
+ case $arg in
+ -d) isdir=yes ;;
+ -f) prev="-f" ;;
+ -g) prev="-g" ;;
+ -m) prev="-m" ;;
+ -o) prev="-o" ;;
+ -s)
+ stripme=" -s"
+ continue
+ ;;
+ -*) ;;
+
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+ prev=
+ else
+ dest="$arg"
+ continue
+ fi
+ ;;
+ esac
+
+ # Aesthetically quote the argument.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
+ arg="\"$arg\""
+ ;;
+ esac
+ install_prog="$install_prog $arg"
+ done
+
+ if test -z "$install_prog"; then
+ $echo "$modename: you must specify an install program" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prev' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ if test -z "$files"; then
+ if test -z "$dest"; then
+ $echo "$modename: no file or destination specified" 1>&2
+ else
+ $echo "$modename: you must specify a destination" 1>&2
+ fi
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Strip any trailing slash from the destination.
+ dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
+
+ # Check to see that the destination is a directory.
+ test -d "$dest" && isdir=yes
+ if test "$isdir" = yes; then
+ destdir="$dest"
+ destname=
+ else
+ destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$destdir" = "X$dest" && destdir=.
+ destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
+
+ # Not a directory, so check to see that there is only one file specified.
+ set dummy $files
+ if test "$#" -gt 2; then
+ $echo "$modename: \`$dest' is not a directory" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ fi
+ case $destdir in
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ for file in $files; do
+ case $file in
+ *.lo) ;;
+ *)
+ $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+ ;;
+ esac
+
+ # This variable tells wrapper scripts just to set variables rather
+ # than running their programs.
+ libtool_install_magic="$magic"
+
+ staticlibs=
+ future_libdirs=
+ current_libdirs=
+ for file in $files; do
+
+ # Do each installation.
+ case $file in
+ *.$libext)
+ # Do the static libraries later.
+ staticlibs="$staticlibs $file"
+ ;;
+
+ *.la)
+ # Check to see that this really is a libtool archive.
+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ library_names=
+ old_library=
+ relink_command=
+ # If there is no directory component, then add one.
+ case $file in
+ */* | *\\*) . $file ;;
+ *) . ./$file ;;
+ esac
+
+ # Add the libdir to current_libdirs if it is the destination.
+ if test "X$destdir" = "X$libdir"; then
+ case "$current_libdirs " in
+ *" $libdir "*) ;;
+ *) current_libdirs="$current_libdirs $libdir" ;;
+ esac
+ else
+ # Note the libdir as a future libdir.
+ case "$future_libdirs " in
+ *" $libdir "*) ;;
+ *) future_libdirs="$future_libdirs $libdir" ;;
+ esac
+ fi
+
+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
+ test "X$dir" = "X$file/" && dir=
+ dir="$dir$objdir"
+
+ if test -n "$relink_command"; then
+ # Determine the prefix the user has applied to our future dir.
+ inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
+
+ # Don't allow the user to place us outside of our expected
+ # location b/c this prevents finding dependent libraries that
+ # are installed to the same prefix.
+ # At present, this check doesn't affect windows .dll's that
+ # are installed into $libdir/../bin (currently, that works fine)
+ # but it's something to keep an eye on.
+ if test "$inst_prefix_dir" = "$destdir"; then
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+ else
+ relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
+ fi
+
+ $echo "$modename: warning: relinking \`$file'" 1>&2
+ $show "$relink_command"
+ if $run eval "$relink_command"; then :
+ else
+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ fi
+
+ # See the names of the shared library.
+ set dummy $library_names
+ if test -n "$2"; then
+ realname="$2"
+ shift
+ shift
+
+ srcname="$realname"
+ test -n "$relink_command" && srcname="$realname"T
+
+ # Install the shared library and build the symlinks.
+ $show "$install_prog $dir/$srcname $destdir/$realname"
+ $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
+ if test -n "$stripme" && test -n "$striplib"; then
+ $show "$striplib $destdir/$realname"
+ $run eval "$striplib $destdir/$realname" || exit $?
+ fi
+
+ if test "$#" -gt 0; then
+ # Delete the old symlinks, and create new ones.
+ for linkname
+ do
+ if test "$linkname" != "$realname"; then
+ $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+ $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+ fi
+ done
+ fi
+
+ # Do each command in the postinstall commands.
+ lib="$destdir/$realname"
+ cmds=$postinstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ fi
+
+ # Install the pseudo-library for information purposes.
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ instname="$dir/$name"i
+ $show "$install_prog $instname $destdir/$name"
+ $run eval "$install_prog $instname $destdir/$name" || exit $?
+
+ # Maybe install the static library, too.
+ test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ ;;
+
+ *.lo)
+ # Install (i.e. copy) a libtool object.
+
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+ destfile="$destdir/$destname"
+ else
+ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ destfile="$destdir/$destfile"
+ fi
+
+ # Deduce the name of the destination old-style object file.
+ case $destfile in
+ *.lo)
+ staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
+ ;;
+ *.$objext)
+ staticdest="$destfile"
+ destfile=
+ ;;
+ *)
+ $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ # Install the libtool object if requested.
+ if test -n "$destfile"; then
+ $show "$install_prog $file $destfile"
+ $run eval "$install_prog $file $destfile" || exit $?
+ fi
+
+ # Install the old object if enabled.
+ if test "$build_old_libs" = yes; then
+ # Deduce the name of the old-style object file.
+ staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
+
+ $show "$install_prog $staticobj $staticdest"
+ $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ fi
+ exit $EXIT_SUCCESS
+ ;;
+
+ *)
+ # Figure out destination file name, if it wasn't already specified.
+ if test -n "$destname"; then
+ destfile="$destdir/$destname"
+ else
+ destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ destfile="$destdir/$destfile"
+ fi
+
+ # If the file is missing, and there is a .exe on the end, strip it
+ # because it is most likely a libtool script we actually want to
+ # install
+ stripped_ext=""
+ case $file in
+ *.exe)
+ if test ! -f "$file"; then
+ file=`$echo $file|${SED} 's,.exe$,,'`
+ stripped_ext=".exe"
+ fi
+ ;;
+ esac
+
+ # Do a test to see if this is really a libtool program.
+ case $host in
+ *cygwin*|*mingw*)
+ wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
+ ;;
+ *)
+ wrapper=$file
+ ;;
+ esac
+ if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
+ notinst_deplibs=
+ relink_command=
+
+ # To insure that "foo" is sourced, and not "foo.exe",
+ # finese the cygwin/MSYS system by explicitly sourcing "foo."
+ # which disallows the automatic-append-.exe behavior.
+ case $build in
+ *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+ *) wrapperdot=${wrapper} ;;
+ esac
+ # If there is no directory component, then add one.
+ case $file in
+ */* | *\\*) . ${wrapperdot} ;;
+ *) . ./${wrapperdot} ;;
+ esac
+
+ # Check the variables that should have been set.
+ if test -z "$notinst_deplibs"; then
+ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ finalize=yes
+ for lib in $notinst_deplibs; do
+ # Check to see that each library is installed.
+ libdir=
+ if test -f "$lib"; then
+ # If there is no directory component, then add one.
+ case $lib in
+ */* | *\\*) . $lib ;;
+ *) . ./$lib ;;
+ esac
+ fi
+ libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ if test -n "$libdir" && test ! -f "$libfile"; then
+ $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
+ finalize=no
+ fi
+ done
+
+ relink_command=
+ # To insure that "foo" is sourced, and not "foo.exe",
+ # finese the cygwin/MSYS system by explicitly sourcing "foo."
+ # which disallows the automatic-append-.exe behavior.
+ case $build in
+ *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+ *) wrapperdot=${wrapper} ;;
+ esac
+ # If there is no directory component, then add one.
+ case $file in
+ */* | *\\*) . ${wrapperdot} ;;
+ *) . ./${wrapperdot} ;;
+ esac
+
+ outputname=
+ if test "$fast_install" = no && test -n "$relink_command"; then
+ if test "$finalize" = yes && test -z "$run"; then
+ tmpdir="/tmp"
+ test -n "$TMPDIR" && tmpdir="$TMPDIR"
+ tmpdir="$tmpdir/libtool-$$"
+ save_umask=`umask`
+ umask 0077
+ if $mkdir "$tmpdir"; then
+ umask $save_umask
+ else
+ umask $save_umask
+ $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+ continue
+ fi
+ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+ relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+
+ $show "$relink_command"
+ if $run eval "$relink_command"; then :
+ else
+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+ ${rm}r "$tmpdir"
+ continue
+ fi
+ file="$outputname"
+ else
+ $echo "$modename: warning: cannot relink \`$file'" 1>&2
+ fi
+ else
+ # Install the binary that we compiled earlier.
+ file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+ fi
+ fi
+
+ # remove .exe since cygwin /usr/bin/install will append another
+ # one anyways
+ case $install_prog,$host in
+ */usr/bin/install*,*cygwin*)
+ case $file:$destfile in
+ *.exe:*.exe)
+ # this is ok
+ ;;
+ *.exe:*)
+ destfile=$destfile.exe
+ ;;
+ *:*.exe)
+ destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
+ ;;
+ esac
+ ;;
+ esac
+ $show "$install_prog$stripme $file $destfile"
+ $run eval "$install_prog\$stripme \$file \$destfile" || exit $?
+ test -n "$outputname" && ${rm}r "$tmpdir"
+ ;;
+ esac
+ done
+
+ for file in $staticlibs; do
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+
+ # Set up the ranlib parameters.
+ oldlib="$destdir/$name"
+
+ $show "$install_prog $file $oldlib"
+ $run eval "$install_prog \$file \$oldlib" || exit $?
+
+ if test -n "$stripme" && test -n "$old_striplib"; then
+ $show "$old_striplib $oldlib"
+ $run eval "$old_striplib $oldlib" || exit $?
+ fi
+
+ # Do each command in the postinstall commands.
+ cmds=$old_postinstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+ IFS="$save_ifs"
+ done
+
+ if test -n "$future_libdirs"; then
+ $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
+ fi
+
+ if test -n "$current_libdirs"; then
+ # Maybe just do a dry run.
+ test -n "$run" && current_libdirs=" -n$current_libdirs"
+ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ else
+ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+ # libtool finish mode
+ finish)
+ modename="$modename: finish"
+ libdirs="$nonopt"
+ admincmds=
+
+ if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+ for dir
+ do
+ libdirs="$libdirs $dir"
+ done
+
+ for libdir in $libdirs; do
+ if test -n "$finish_cmds"; then
+ # Do each command in the finish commands.
+ cmds=$finish_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || admincmds="$admincmds
+ $cmd"
+ done
+ IFS="$save_ifs"
+ fi
+ if test -n "$finish_eval"; then
+ # Do the single finish_eval.
+ eval cmds=\"$finish_eval\"
+ $run eval "$cmds" || admincmds="$admincmds
+ $cmds"
+ fi
+ done
+ fi
+
+ # Exit here if they wanted silent mode.
+ test "$show" = : && exit $EXIT_SUCCESS
+
+ $echo "----------------------------------------------------------------------"
+ $echo "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ $echo " $libdir"
+ done
+ $echo
+ $echo "If you ever happen to want to link against installed libraries"
+ $echo "in a given directory, LIBDIR, you must either use libtool, and"
+ $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ $echo "flag during linking and do at least one of the following:"
+ if test -n "$shlibpath_var"; then
+ $echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ $echo " during execution"
+ fi
+ if test -n "$runpath_var"; then
+ $echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ $echo " during linking"
+ fi
+ if test -n "$hardcode_libdir_flag_spec"; then
+ libdir=LIBDIR
+ eval flag=\"$hardcode_libdir_flag_spec\"
+
+ $echo " - use the \`$flag' linker flag"
+ fi
+ if test -n "$admincmds"; then
+ $echo " - have your system administrator run these commands:$admincmds"
+ fi
+ if test -f /etc/ld.so.conf; then
+ $echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ fi
+ $echo
+ $echo "See any operating system documentation about shared libraries for"
+ $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+ $echo "----------------------------------------------------------------------"
+ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool execute mode
+ execute)
+ modename="$modename: execute"
+
+ # The first argument is the command name.
+ cmd="$nonopt"
+ if test -z "$cmd"; then
+ $echo "$modename: you must specify a COMMAND" 1>&2
+ $echo "$help"
+ exit $EXIT_FAILURE
+ fi
+
+ # Handle -dlopen flags immediately.
+ for file in $execute_dlfiles; do
+ if test ! -f "$file"; then
+ $echo "$modename: \`$file' is not a file" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ dir=
+ case $file in
+ *.la)
+ # Check to see that this really is a libtool archive.
+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ # Read the libtool library.
+ dlname=
+ library_names=
+
+ # If there is no directory component, then add one.
+ case $file in
+ */* | *\\*) . $file ;;
+ *) . ./$file ;;
+ esac
+
+ # Skip this library if it cannot be dlopened.
+ if test -z "$dlname"; then
+ # Warn if it was a shared library.
+ test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
+ continue
+ fi
+
+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$dir" = "X$file" && dir=.
+
+ if test -f "$dir/$objdir/$dlname"; then
+ dir="$dir/$objdir"
+ else
+ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ ;;
+
+ *.lo)
+ # Just add the directory containing the .lo file.
+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ test "X$dir" = "X$file" && dir=.
+ ;;
+
+ *)
+ $echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
+ continue
+ ;;
+ esac
+
+ # Get the absolute pathname.
+ absdir=`cd "$dir" && pwd`
+ test -n "$absdir" && dir="$absdir"
+
+ # Now add the directory to shlibpath_var.
+ if eval "test -z \"\$$shlibpath_var\""; then
+ eval "$shlibpath_var=\"\$dir\""
+ else
+ eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
+ fi
+ done
+
+ # This variable tells wrapper scripts just to set shlibpath_var
+ # rather than running their programs.
+ libtool_execute_magic="$magic"
+
+ # Check if any of the arguments is a wrapper script.
+ args=
+ for file
+ do
+ case $file in
+ -*) ;;
+ *)
+ # Do a test to see if this is really a libtool program.
+ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ # If there is no directory component, then add one.
+ case $file in
+ */* | *\\*) . $file ;;
+ *) . ./$file ;;
+ esac
+
+ # Transform arg to wrapped name.
+ file="$progdir/$program"
+ fi
+ ;;
+ esac
+ # Quote arguments (to preserve shell metacharacters).
+ file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
+ args="$args \"$file\""
+ done
+
+ if test -z "$run"; then
+ if test -n "$shlibpath_var"; then
+ # Export the shlibpath_var.
+ eval "export $shlibpath_var"
+ fi
+
+ # Restore saved environment variables
+ if test "${save_LC_ALL+set}" = set; then
+ LC_ALL="$save_LC_ALL"; export LC_ALL
+ fi
+ if test "${save_LANG+set}" = set; then
+ LANG="$save_LANG"; export LANG
+ fi
+
+ # Now prepare to actually exec the command.
+ exec_cmd="\$cmd$args"
+ else
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
+ $echo "export $shlibpath_var"
+ fi
+ $echo "$cmd$args"
+ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+ # libtool clean and uninstall mode
+ clean | uninstall)
+ modename="$modename: $mode"
+ rm="$nonopt"
+ files=
+ rmforce=
+ exit_status=0
+
+ # This variable tells wrapper scripts just to set variables rather
+ # than running their programs.
+ libtool_install_magic="$magic"
+
+ for arg
+ do
+ case $arg in
+ -f) rm="$rm $arg"; rmforce=yes ;;
+ -*) rm="$rm $arg" ;;
+ *) files="$files $arg" ;;
+ esac
+ done
+
+ if test -z "$rm"; then
+ $echo "$modename: you must specify an RM program" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+
+ rmdirs=
+
+ origobjdir="$objdir"
+ for file in $files; do
+ dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$dir" = "X$file"; then
+ dir=.
+ objdir="$origobjdir"
+ else
+ objdir="$dir/$origobjdir"
+ fi
+ name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ test "$mode" = uninstall && objdir="$dir"
+
+ # Remember objdir for removal later, being careful to avoid duplicates
+ if test "$mode" = clean; then
+ case " $rmdirs " in
+ *" $objdir "*) ;;
+ *) rmdirs="$rmdirs $objdir" ;;
+ esac
+ fi
+
+ # Don't error if the file doesn't exist and rm -f was used.
+ if (test -L "$file") >/dev/null 2>&1 \
+ || (test -h "$file") >/dev/null 2>&1 \
+ || test -f "$file"; then
+ :
+ elif test -d "$file"; then
+ exit_status=1
+ continue
+ elif test "$rmforce" = yes; then
+ continue
+ fi
+
+ rmfiles="$file"
+
+ case $name in
+ *.la)
+ # Possibly a libtool archive, so verify it.
+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ . $dir/$name
+
+ # Delete the libtool libraries and symlinks.
+ for n in $library_names; do
+ rmfiles="$rmfiles $objdir/$n"
+ done
+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+ test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+
+ if test "$mode" = uninstall; then
+ if test -n "$library_names"; then
+ # Do each command in the postuninstall commands.
+ cmds=$postuninstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd"
+ if test "$?" -ne 0 && test "$rmforce" != yes; then
+ exit_status=1
+ fi
+ done
+ IFS="$save_ifs"
+ fi
+
+ if test -n "$old_library"; then
+ # Do each command in the old_postuninstall commands.
+ cmds=$old_postuninstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
+ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd"
+ if test "$?" -ne 0 && test "$rmforce" != yes; then
+ exit_status=1
+ fi
+ done
+ IFS="$save_ifs"
+ fi
+ # FIXME: should reinstall the best remaining shared library.
+ fi
+ fi
+ ;;
+
+ *.lo)
+ # Possibly a libtool object, so verify it.
+ if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+
+ # Read the .lo file
+ . $dir/$name
+
+ # Add PIC object to the list of files to remove.
+ if test -n "$pic_object" \
+ && test "$pic_object" != none; then
+ rmfiles="$rmfiles $dir/$pic_object"
+ fi
+
+ # Add non-PIC object to the list of files to remove.
+ if test -n "$non_pic_object" \
+ && test "$non_pic_object" != none; then
+ rmfiles="$rmfiles $dir/$non_pic_object"
+ fi
+ fi
+ ;;
+
+ *)
+ if test "$mode" = clean ; then
+ noexename=$name
+ case $file in
+ *.exe)
+ file=`$echo $file|${SED} 's,.exe$,,'`
+ noexename=`$echo $name|${SED} 's,.exe$,,'`
+ # $file with .exe has already been added to rmfiles,
+ # add $file without .exe
+ rmfiles="$rmfiles $file"
+ ;;
+ esac
+ # Do a test to see if this is a libtool program.
+ if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
+ relink_command=
+ . $dir/$noexename
+
+ # note $name still contains .exe if it was in $file originally
+ # as does the version of $file that was added into $rmfiles
+ rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+ if test "$fast_install" = yes && test -n "$relink_command"; then
+ rmfiles="$rmfiles $objdir/lt-$name"
+ fi
+ if test "X$noexename" != "X$name" ; then
+ rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+ fi
+ fi
+ fi
+ ;;
+ esac
+ $show "$rm $rmfiles"
+ $run $rm $rmfiles || exit_status=1
+ done
+ objdir="$origobjdir"
+
+ # Try to remove the ${objdir}s in the directories where we deleted files
+ for dir in $rmdirs; do
+ if test -d "$dir"; then
+ $show "rmdir $dir"
+ $run rmdir $dir >/dev/null 2>&1
+ fi
+ done
+
+ exit $exit_status
+ ;;
+
+ "")
+ $echo "$modename: you must specify a MODE" 1>&2
+ $echo "$generic_help" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test -z "$exec_cmd"; then
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$generic_help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+fi # test -z "$show_help"
+
+if test -n "$exec_cmd"; then
+ eval exec $exec_cmd
+ exit $EXIT_FAILURE
+fi
+
+# We need to display help for each of the modes.
+case $mode in
+"") $echo \
+"Usage: $modename [OPTION]... [MODE-ARG]...
+
+Provide generalized library-building support services.
+
+ --config show all configuration variables
+ --debug enable verbose shell tracing
+-n, --dry-run display commands without modifying any files
+ --features display basic configuration information and exit
+ --finish same as \`--mode=finish'
+ --help display this help message and exit
+ --mode=MODE use operation mode MODE [default=inferred from MODE-ARGS]
+ --quiet same as \`--silent'
+ --silent don't print informational messages
+ --tag=TAG use configuration variables from tag TAG
+ --version print version information
+
+MODE must be one of the following:
+
+ clean remove files from the build directory
+ compile compile a source file into a libtool object
+ execute automatically set library path, then run a program
+ finish complete the installation of libtool libraries
+ install install libraries or executables
+ link create a library or an executable
+ uninstall remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for
+a more detailed description of MODE.
+
+Report bugs to <bug-libtool(a)gnu.org>."
+ exit $EXIT_SUCCESS
+ ;;
+
+clean)
+ $echo \
+"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
+
+Remove files from the build directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, object or program, all the files associated
+with it are deleted. Otherwise, only FILE itself is deleted using RM."
+ ;;
+
+compile)
+ $echo \
+"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
+
+Compile a source file into a libtool library object.
+
+This mode accepts the following additional options:
+
+ -o OUTPUT-FILE set the output file name to OUTPUT-FILE
+ -prefer-pic try to building PIC objects only
+ -prefer-non-pic try to building non-PIC objects only
+ -static always build a \`.o' file suitable for static linking
+
+COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+from the given SOURCEFILE.
+
+The output file name is determined by removing the directory component from
+SOURCEFILE, then substituting the C source code suffix \`.c' with the
+library object suffix, \`.lo'."
+ ;;
+
+execute)
+ $echo \
+"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
+
+Automatically set library path, then run a program.
+
+This mode accepts the following additional options:
+
+ -dlopen FILE add the directory containing FILE to the library path
+
+This mode sets the library path environment variable according to \`-dlopen'
+flags.
+
+If any of the ARGS are libtool executable wrappers, then they are translated
+into their corresponding uninstalled binary, and any of their required library
+directories are added to the library path.
+
+Then, COMMAND is executed, with ARGS as arguments."
+ ;;
+
+finish)
+ $echo \
+"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
+
+Complete the installation of libtool libraries.
+
+Each LIBDIR is a directory that contains libtool libraries.
+
+The commands that this mode executes may require superuser privileges. Use
+the \`--dry-run' option if you just want to see what would be executed."
+ ;;
+
+install)
+ $echo \
+"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
+
+Install executables or libraries.
+
+INSTALL-COMMAND is the installation command. The first component should be
+either the \`install' or \`cp' program.
+
+The rest of the components are interpreted as arguments to that command (only
+BSD-compatible install options are recognized)."
+ ;;
+
+link)
+ $echo \
+"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
+
+Link object files or libraries together to form another library, or to
+create an executable program.
+
+LINK-COMMAND is a command using the C compiler that you would use to create
+a program from several object files.
+
+The following components of LINK-COMMAND are treated specially:
+
+ -all-static do not do any dynamic linking at all
+ -avoid-version do not add a version suffix if possible
+ -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+ -export-symbols SYMFILE
+ try to export only the symbols listed in SYMFILE
+ -export-symbols-regex REGEX
+ try to export only the symbols matching REGEX
+ -LLIBDIR search LIBDIR for required installed libraries
+ -lNAME OUTPUT-FILE requires the installed library libNAME
+ -module build a library that can dlopened
+ -no-fast-install disable the fast-install mode
+ -no-install link a not-installable executable
+ -no-undefined declare that a library does not refer to external symbols
+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
+ -objectlist FILE Use a list of object files found in FILE to specify objects
+ -precious-files-regex REGEX
+ don't remove output files matching REGEX
+ -release RELEASE specify package release information
+ -rpath LIBDIR the created library will eventually be installed in LIBDIR
+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
+ -static do not do any dynamic linking of libtool libraries
+ -version-info CURRENT[:REVISION[:AGE]]
+ specify library version info [each variable defaults to 0]
+
+All other options (arguments beginning with \`-') are ignored.
+
+Every other argument is treated as a filename. Files ending in \`.la' are
+treated as uninstalled libtool libraries, other files are standard or library
+object files.
+
+If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
+only library objects (\`.lo' files) may be specified, and \`-rpath' is
+required, except when creating a convenience library.
+
+If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
+using \`ar' and \`ranlib', or on Windows using \`lib'.
+
+If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+is created, otherwise an executable program is created."
+ ;;
+
+uninstall)
+ $echo \
+"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
+
+Remove libraries from an installation directory.
+
+RM is the name of the program to use to delete files associated with each FILE
+(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+to RM.
+
+If FILE is a libtool library, all the files associated with it are deleted.
+Otherwise, only FILE itself is deleted using RM."
+ ;;
+
+*)
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$help" 1>&2
+ exit $EXIT_FAILURE
+ ;;
+esac
+
+$echo
+$echo "Try \`$modename --help' for more information about other modes."
+
+exit $EXIT_SUCCESS
+
+# The TAGs below are defined such that we never get into a situation
+# in which we disable both kinds of libraries. Given conflicting
+# choices, we go for a static library, that is the most portable,
+# since we can't tell whether shared libraries were disabled because
+# the user asked for that or because the platform doesn't support
+# them. This is particularly important on AIX, because we don't
+# support having both static and shared libraries enabled at the same
+# time on that platform, so we default to a shared-only configuration.
+# If a disable-shared tag is given, we'll fallback to a static-only
+# configuration. But we'll never go from static-only to shared-only.
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+build_libtool_libs=no
+build_old_libs=yes
+# ### END LIBTOOL TAG CONFIG: disable-shared
+
+# ### BEGIN LIBTOOL TAG CONFIG: disable-static
+build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
+# ### END LIBTOOL TAG CONFIG: disable-static
+
+# Local Variables:
+# mode:shell-script
+# sh-indentation:2
+# End:
Index: 10.244/config/config.sub
--- 10.244/config/config.sub Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/config/config.sub Fri, 28 Jul 2006 10:12:07 +0200 theo (oln/w/49_config.sub 644)
@@ -0,0 +1,1569 @@
+#! /bin/sh
+# Configuration validation subroutine script.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+timestamp='2005-04-22'
+
+# This file is (in principle) common to ALL GNU software.
+# The presence of a machine in this file suggests that SOME GNU software
+# can handle that machine. It does not imply ALL GNU software can.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Please send patches to <config-patches(a)gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# Configuration subroutine to validate and canonicalize a configuration type.
+# Supply the specified configuration type as an argument.
+# If it is invalid, we print an error message on stderr and exit with code 1.
+# Otherwise, we print the canonical config type on stdout and succeed.
+
+# This file is supposed to be the same for all GNU packages
+# and recognize all the CPU types, system types and aliases
+# that are meaningful with *any* GNU software.
+# Each package is responsible for reporting which valid configurations
+# it does not support. The user should be able to distinguish
+# a failure to support a valid configuration from a meaningless
+# configuration.
+
+# The goal of this file is to map all the various variations of a given
+# machine specification into a single specification in the form:
+# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
+# or in some cases, the newer four-part form:
+# CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
+# It is wrong to echo any other type of specification.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION] CPU-MFR-OPSYS
+ $0 [OPTION] ALIAS
+
+Canonicalize a configuration name.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches(a)gnu.org>."
+
+version="\
+GNU config.sub ($timestamp)
+
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit 0 ;;
+ --version | -v )
+ echo "$version" ; exit 0 ;;
+ --help | --h* | -h )
+ echo "$usage"; exit 0 ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help"
+ exit 1 ;;
+
+ *local*)
+ # First pass through any local machine types.
+ echo $1
+ exit 0;;
+
+ * )
+ break ;;
+ esac
+done
+
+case $# in
+ 0) echo "$me: missing argument$help" >&2
+ exit 1;;
+ 1) ;;
+ *) echo "$me: too many arguments$help" >&2
+ exit 1;;
+esac
+
+# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
+# Here we must recognize all the valid KERNEL-OS combinations.
+maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
+case $maybe_os in
+ nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
+ kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+ os=-$maybe_os
+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
+ ;;
+ *)
+ basic_machine=`echo $1 | sed 's/-[^-]*$//'`
+ if [ $basic_machine != $1 ]
+ then os=`echo $1 | sed 's/.*-/-/'`
+ else os=; fi
+ ;;
+esac
+
+### Let's recognize common machines as not being operating systems so
+### that things like config.sub decstation-3100 work. We also
+### recognize some manufacturers as not being operating systems, so we
+### can provide default operating systems below.
+case $os in
+ -sun*os*)
+ # Prevent following clause from handling this invalid input.
+ ;;
+ -dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
+ -att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
+ -unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
+ -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
+ -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
+ -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
+ -apple | -axis | -knuth | -cray)
+ os=
+ basic_machine=$1
+ ;;
+ -sim | -cisco | -oki | -wec | -winbond)
+ os=
+ basic_machine=$1
+ ;;
+ -scout)
+ ;;
+ -wrs)
+ os=-vxworks
+ basic_machine=$1
+ ;;
+ -chorusos*)
+ os=-chorusos
+ basic_machine=$1
+ ;;
+ -chorusrdb)
+ os=-chorusrdb
+ basic_machine=$1
+ ;;
+ -hiux*)
+ os=-hiuxwe2
+ ;;
+ -sco5)
+ os=-sco3.2v5
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco4)
+ os=-sco3.2v4
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2.[4-9]*)
+ os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco3.2v[4-9]*)
+ # Don't forget version if it is 3.2v4 or newer.
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -sco*)
+ os=-sco3.2v2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -udk*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -isc)
+ os=-isc2.2
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -clix*)
+ basic_machine=clipper-intergraph
+ ;;
+ -isc*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+ ;;
+ -lynx*)
+ os=-lynxos
+ ;;
+ -ptx*)
+ basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
+ ;;
+ -windowsnt*)
+ os=`echo $os | sed -e 's/windowsnt/winnt/'`
+ ;;
+ -psos*)
+ os=-psos
+ ;;
+ -mint | -mint[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+esac
+
+# Decode aliases for certain CPU-COMPANY combinations.
+case $basic_machine in
+ # Recognize the basic CPU types without company name.
+ # Some are omitted here because they have special meanings below.
+ 1750a | 580 \
+ | a29k \
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | bfin \
+ | c4x | clipper \
+ | d10v | d30v | dlx | dsp16xx \
+ | fr30 | frv \
+ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+ | i370 | i860 | i960 | ia64 \
+ | ip2k | iq2000 \
+ | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+ | mips | mipsbe | mipseb | mipsel | mipsle \
+ | mips16 \
+ | mips64 | mips64el \
+ | mips64vr | mips64vrel \
+ | mips64orion | mips64orionel \
+ | mips64vr4100 | mips64vr4100el \
+ | mips64vr4300 | mips64vr4300el \
+ | mips64vr5000 | mips64vr5000el \
+ | mipsisa32 | mipsisa32el \
+ | mipsisa32r2 | mipsisa32r2el \
+ | mipsisa64 | mipsisa64el \
+ | mipsisa64r2 | mipsisa64r2el \
+ | mipsisa64sb1 | mipsisa64sb1el \
+ | mipsisa64sr71k | mipsisa64sr71kel \
+ | mipstx39 | mipstx39el \
+ | mn10200 | mn10300 \
+ | msp430 \
+ | ns16k | ns32k \
+ | openrisc | or32 \
+ | pdp10 | pdp11 | pj | pjl \
+ | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+ | pyramid \
+ | sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | sh64 | sh64le \
+ | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b \
+ | strongarm \
+ | tahoe | thumb | tic4x | tic80 | tron \
+ | v850 | v850e \
+ | we32k \
+ | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | z8k)
+ basic_machine=$basic_machine-unknown
+ ;;
+ m6811 | m68hc11 | m6812 | m68hc12)
+ # Motorola 68HC11/12.
+ basic_machine=$basic_machine-unknown
+ os=-none
+ ;;
+ m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+ ;;
+
+ # We use `pc' rather than `unknown'
+ # because (1) that's what they normally are, and
+ # (2) the word "unknown" tends to confuse beginning users.
+ i*86 | x86_64)
+ basic_machine=$basic_machine-pc
+ ;;
+ # Object if more than one company name word.
+ *-*-*)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+ # Recognize the basic CPU types with company name.
+ 580-* \
+ | a29k-* \
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
+ | avr-* \
+ | bfin-* | bs2000-* \
+ | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+ | clipper-* | craynv-* | cydra-* \
+ | d10v-* | d30v-* | dlx-* \
+ | elxsi-* \
+ | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | h8300-* | h8500-* \
+ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+ | i*86-* | i860-* | i960-* | ia64-* \
+ | ip2k-* | iq2000-* \
+ | m32r-* | m32rle-* \
+ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
+ | m88110-* | m88k-* | maxq-* | mcore-* \
+ | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
+ | mips16-* \
+ | mips64-* | mips64el-* \
+ | mips64vr-* | mips64vrel-* \
+ | mips64orion-* | mips64orionel-* \
+ | mips64vr4100-* | mips64vr4100el-* \
+ | mips64vr4300-* | mips64vr4300el-* \
+ | mips64vr5000-* | mips64vr5000el-* \
+ | mipsisa32-* | mipsisa32el-* \
+ | mipsisa32r2-* | mipsisa32r2el-* \
+ | mipsisa64-* | mipsisa64el-* \
+ | mipsisa64r2-* | mipsisa64r2el-* \
+ | mipsisa64sb1-* | mipsisa64sb1el-* \
+ | mipsisa64sr71k-* | mipsisa64sr71kel-* \
+ | mipstx39-* | mipstx39el-* \
+ | mmix-* \
+ | msp430-* \
+ | none-* | np1-* | ns16k-* | ns32k-* \
+ | orion-* \
+ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
+ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+ | pyramid-* \
+ | romp-* | rs6000-* \
+ | sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparclite-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | tahoe-* | thumb-* \
+ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
+ | tron-* \
+ | v850-* | v850e-* | vax-* \
+ | we32k-* \
+ | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | xstormy16-* | xtensa-* \
+ | ymp-* \
+ | z8k-*)
+ ;;
+ # Recognize the various machine names and aliases which stand
+ # for a CPU type and a company and sometimes even an OS.
+ 386bsd)
+ basic_machine=i386-unknown
+ os=-bsd
+ ;;
+ 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
+ basic_machine=m68000-att
+ ;;
+ 3b*)
+ basic_machine=we32k-att
+ ;;
+ a29khif)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ abacus)
+ basic_machine=abacus-unknown
+ ;;
+ adobe68k)
+ basic_machine=m68010-adobe
+ os=-scout
+ ;;
+ alliant | fx80)
+ basic_machine=fx80-alliant
+ ;;
+ altos | altos3068)
+ basic_machine=m68k-altos
+ ;;
+ am29k)
+ basic_machine=a29k-none
+ os=-bsd
+ ;;
+ amd64)
+ basic_machine=x86_64-pc
+ ;;
+ amd64-*)
+ basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ amdahl)
+ basic_machine=580-amdahl
+ os=-sysv
+ ;;
+ amiga | amiga-*)
+ basic_machine=m68k-unknown
+ ;;
+ amigaos | amigados)
+ basic_machine=m68k-unknown
+ os=-amigaos
+ ;;
+ amigaunix | amix)
+ basic_machine=m68k-unknown
+ os=-sysv4
+ ;;
+ apollo68)
+ basic_machine=m68k-apollo
+ os=-sysv
+ ;;
+ apollo68bsd)
+ basic_machine=m68k-apollo
+ os=-bsd
+ ;;
+ aux)
+ basic_machine=m68k-apple
+ os=-aux
+ ;;
+ balance)
+ basic_machine=ns32k-sequent
+ os=-dynix
+ ;;
+ c90)
+ basic_machine=c90-cray
+ os=-unicos
+ ;;
+ convex-c1)
+ basic_machine=c1-convex
+ os=-bsd
+ ;;
+ convex-c2)
+ basic_machine=c2-convex
+ os=-bsd
+ ;;
+ convex-c32)
+ basic_machine=c32-convex
+ os=-bsd
+ ;;
+ convex-c34)
+ basic_machine=c34-convex
+ os=-bsd
+ ;;
+ convex-c38)
+ basic_machine=c38-convex
+ os=-bsd
+ ;;
+ cray | j90)
+ basic_machine=j90-cray
+ os=-unicos
+ ;;
+ craynv)
+ basic_machine=craynv-cray
+ os=-unicosmp
+ ;;
+ cr16c)
+ basic_machine=cr16c-unknown
+ os=-elf
+ ;;
+ crds | unos)
+ basic_machine=m68k-crds
+ ;;
+ crisv32 | crisv32-* | etraxfs*)
+ basic_machine=crisv32-axis
+ ;;
+ cris | cris-* | etrax*)
+ basic_machine=cris-axis
+ ;;
+ crx)
+ basic_machine=crx-unknown
+ os=-elf
+ ;;
+ da30 | da30-*)
+ basic_machine=m68k-da30
+ ;;
+ decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
+ basic_machine=mips-dec
+ ;;
+ decsystem10* | dec10*)
+ basic_machine=pdp10-dec
+ os=-tops10
+ ;;
+ decsystem20* | dec20*)
+ basic_machine=pdp10-dec
+ os=-tops20
+ ;;
+ delta | 3300 | motorola-3300 | motorola-delta \
+ | 3300-motorola | delta-motorola)
+ basic_machine=m68k-motorola
+ ;;
+ delta88)
+ basic_machine=m88k-motorola
+ os=-sysv3
+ ;;
+ djgpp)
+ basic_machine=i586-pc
+ os=-msdosdjgpp
+ ;;
+ dpx20 | dpx20-*)
+ basic_machine=rs6000-bull
+ os=-bosx
+ ;;
+ dpx2* | dpx2*-bull)
+ basic_machine=m68k-bull
+ os=-sysv3
+ ;;
+ ebmon29k)
+ basic_machine=a29k-amd
+ os=-ebmon
+ ;;
+ elxsi)
+ basic_machine=elxsi-elxsi
+ os=-bsd
+ ;;
+ encore | umax | mmax)
+ basic_machine=ns32k-encore
+ ;;
+ es1800 | OSE68k | ose68k | ose | OSE)
+ basic_machine=m68k-ericsson
+ os=-ose
+ ;;
+ fx2800)
+ basic_machine=i860-alliant
+ ;;
+ genix)
+ basic_machine=ns32k-ns
+ ;;
+ gmicro)
+ basic_machine=tron-gmicro
+ os=-sysv
+ ;;
+ go32)
+ basic_machine=i386-pc
+ os=-go32
+ ;;
+ h3050r* | hiux*)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ h8300hms)
+ basic_machine=h8300-hitachi
+ os=-hms
+ ;;
+ h8300xray)
+ basic_machine=h8300-hitachi
+ os=-xray
+ ;;
+ h8500hms)
+ basic_machine=h8500-hitachi
+ os=-hms
+ ;;
+ harris)
+ basic_machine=m88k-harris
+ os=-sysv3
+ ;;
+ hp300-*)
+ basic_machine=m68k-hp
+ ;;
+ hp300bsd)
+ basic_machine=m68k-hp
+ os=-bsd
+ ;;
+ hp300hpux)
+ basic_machine=m68k-hp
+ os=-hpux
+ ;;
+ hp3k9[0-9][0-9] | hp9[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k2[0-9][0-9] | hp9k31[0-9])
+ basic_machine=m68000-hp
+ ;;
+ hp9k3[2-9][0-9])
+ basic_machine=m68k-hp
+ ;;
+ hp9k6[0-9][0-9] | hp6[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hp9k7[0-79][0-9] | hp7[0-79][0-9])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k78[0-9] | hp78[0-9])
+ # FIXME: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
+ # FIXME: really hppa2.0-hp
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][13679] | hp8[0-9][13679])
+ basic_machine=hppa1.1-hp
+ ;;
+ hp9k8[0-9][0-9] | hp8[0-9][0-9])
+ basic_machine=hppa1.0-hp
+ ;;
+ hppa-next)
+ os=-nextstep3
+ ;;
+ hppaosf)
+ basic_machine=hppa1.1-hp
+ os=-osf
+ ;;
+ hppro)
+ basic_machine=hppa1.1-hp
+ os=-proelf
+ ;;
+ i370-ibm* | ibm*)
+ basic_machine=i370-ibm
+ ;;
+# I'm not sure what "Sysv32" means. Should this be sysv3.2?
+ i*86v32)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv32
+ ;;
+ i*86v4*)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv4
+ ;;
+ i*86v)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-sysv
+ ;;
+ i*86sol2)
+ basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
+ os=-solaris2
+ ;;
+ i386mach)
+ basic_machine=i386-mach
+ os=-mach
+ ;;
+ i386-vsta | vsta)
+ basic_machine=i386-unknown
+ os=-vsta
+ ;;
+ iris | iris4d)
+ basic_machine=mips-sgi
+ case $os in
+ -irix*)
+ ;;
+ *)
+ os=-irix4
+ ;;
+ esac
+ ;;
+ isi68 | isi)
+ basic_machine=m68k-isi
+ os=-sysv
+ ;;
+ m88k-omron*)
+ basic_machine=m88k-omron
+ ;;
+ magnum | m3230)
+ basic_machine=mips-mips
+ os=-sysv
+ ;;
+ merlin)
+ basic_machine=ns32k-utek
+ os=-sysv
+ ;;
+ mingw32)
+ basic_machine=i386-pc
+ os=-mingw32
+ ;;
+ miniframe)
+ basic_machine=m68000-convergent
+ ;;
+ *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
+ basic_machine=m68k-atari
+ os=-mint
+ ;;
+ mips3*-*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
+ ;;
+ mips3*)
+ basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
+ ;;
+ monitor)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ morphos)
+ basic_machine=powerpc-unknown
+ os=-morphos
+ ;;
+ msdos)
+ basic_machine=i386-pc
+ os=-msdos
+ ;;
+ mvs)
+ basic_machine=i370-ibm
+ os=-mvs
+ ;;
+ ncr3000)
+ basic_machine=i486-ncr
+ os=-sysv4
+ ;;
+ netbsd386)
+ basic_machine=i386-unknown
+ os=-netbsd
+ ;;
+ netwinder)
+ basic_machine=armv4l-rebel
+ os=-linux
+ ;;
+ news | news700 | news800 | news900)
+ basic_machine=m68k-sony
+ os=-newsos
+ ;;
+ news1000)
+ basic_machine=m68030-sony
+ os=-newsos
+ ;;
+ news-3600 | risc-news)
+ basic_machine=mips-sony
+ os=-newsos
+ ;;
+ necv70)
+ basic_machine=v70-nec
+ os=-sysv
+ ;;
+ next | m*-next )
+ basic_machine=m68k-next
+ case $os in
+ -nextstep* )
+ ;;
+ -ns2*)
+ os=-nextstep2
+ ;;
+ *)
+ os=-nextstep3
+ ;;
+ esac
+ ;;
+ nh3000)
+ basic_machine=m68k-harris
+ os=-cxux
+ ;;
+ nh[45]000)
+ basic_machine=m88k-harris
+ os=-cxux
+ ;;
+ nindy960)
+ basic_machine=i960-intel
+ os=-nindy
+ ;;
+ mon960)
+ basic_machine=i960-intel
+ os=-mon960
+ ;;
+ nonstopux)
+ basic_machine=mips-compaq
+ os=-nonstopux
+ ;;
+ np1)
+ basic_machine=np1-gould
+ ;;
+ nsr-tandem)
+ basic_machine=nsr-tandem
+ ;;
+ op50n-* | op60c-*)
+ basic_machine=hppa1.1-oki
+ os=-proelf
+ ;;
+ or32 | or32-*)
+ basic_machine=or32-unknown
+ os=-coff
+ ;;
+ os400)
+ basic_machine=powerpc-ibm
+ os=-os400
+ ;;
+ OSE68000 | ose68000)
+ basic_machine=m68000-ericsson
+ os=-ose
+ ;;
+ os68k)
+ basic_machine=m68k-none
+ os=-os68k
+ ;;
+ pa-hitachi)
+ basic_machine=hppa1.1-hitachi
+ os=-hiuxwe2
+ ;;
+ paragon)
+ basic_machine=i860-intel
+ os=-osf
+ ;;
+ pbd)
+ basic_machine=sparc-tti
+ ;;
+ pbb)
+ basic_machine=m68k-tti
+ ;;
+ pc532 | pc532-*)
+ basic_machine=ns32k-pc532
+ ;;
+ pentium | p5 | k5 | k6 | nexgen | viac3)
+ basic_machine=i586-pc
+ ;;
+ pentiumpro | p6 | 6x86 | athlon | athlon_*)
+ basic_machine=i686-pc
+ ;;
+ pentiumii | pentium2 | pentiumiii | pentium3)
+ basic_machine=i686-pc
+ ;;
+ pentium4)
+ basic_machine=i786-pc
+ ;;
+ pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
+ basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumpro-* | p6-* | 6x86-* | athlon-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
+ basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pentium4-*)
+ basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ pn)
+ basic_machine=pn-gould
+ ;;
+ power) basic_machine=power-ibm
+ ;;
+ ppc) basic_machine=powerpc-unknown
+ ;;
+ ppc-*) basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppcle | powerpclittle | ppc-le | powerpc-little)
+ basic_machine=powerpcle-unknown
+ ;;
+ ppcle-* | powerpclittle-*)
+ basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64) basic_machine=powerpc64-unknown
+ ;;
+ ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ppc64le | powerpc64little | ppc64-le | powerpc64-little)
+ basic_machine=powerpc64le-unknown
+ ;;
+ ppc64le-* | powerpc64little-*)
+ basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
+ ;;
+ ps2)
+ basic_machine=i386-ibm
+ ;;
+ pw32)
+ basic_machine=i586-unknown
+ os=-pw32
+ ;;
+ rom68k)
+ basic_machine=m68k-rom68k
+ os=-coff
+ ;;
+ rm[46]00)
+ basic_machine=mips-siemens
+ ;;
+ rtpc | rtpc-*)
+ basic_machine=romp-ibm
+ ;;
+ s390 | s390-*)
+ basic_machine=s390-ibm
+ ;;
+ s390x | s390x-*)
+ basic_machine=s390x-ibm
+ ;;
+ sa29200)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ sb1)
+ basic_machine=mipsisa64sb1-unknown
+ ;;
+ sb1el)
+ basic_machine=mipsisa64sb1el-unknown
+ ;;
+ sei)
+ basic_machine=mips-sei
+ os=-seiux
+ ;;
+ sequent)
+ basic_machine=i386-sequent
+ ;;
+ sh)
+ basic_machine=sh-hitachi
+ os=-hms
+ ;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+ sparclite-wrs | simso-wrs)
+ basic_machine=sparclite-wrs
+ os=-vxworks
+ ;;
+ sps7)
+ basic_machine=m68k-bull
+ os=-sysv2
+ ;;
+ spur)
+ basic_machine=spur-unknown
+ ;;
+ st2000)
+ basic_machine=m68k-tandem
+ ;;
+ stratus)
+ basic_machine=i860-stratus
+ os=-sysv4
+ ;;
+ sun2)
+ basic_machine=m68000-sun
+ ;;
+ sun2os3)
+ basic_machine=m68000-sun
+ os=-sunos3
+ ;;
+ sun2os4)
+ basic_machine=m68000-sun
+ os=-sunos4
+ ;;
+ sun3os3)
+ basic_machine=m68k-sun
+ os=-sunos3
+ ;;
+ sun3os4)
+ basic_machine=m68k-sun
+ os=-sunos4
+ ;;
+ sun4os3)
+ basic_machine=sparc-sun
+ os=-sunos3
+ ;;
+ sun4os4)
+ basic_machine=sparc-sun
+ os=-sunos4
+ ;;
+ sun4sol2)
+ basic_machine=sparc-sun
+ os=-solaris2
+ ;;
+ sun3 | sun3-*)
+ basic_machine=m68k-sun
+ ;;
+ sun4)
+ basic_machine=sparc-sun
+ ;;
+ sun386 | sun386i | roadrunner)
+ basic_machine=i386-sun
+ ;;
+ sv1)
+ basic_machine=sv1-cray
+ os=-unicos
+ ;;
+ symmetry)
+ basic_machine=i386-sequent
+ os=-dynix
+ ;;
+ t3e)
+ basic_machine=alphaev5-cray
+ os=-unicos
+ ;;
+ t90)
+ basic_machine=t90-cray
+ os=-unicos
+ ;;
+ tic54x | c54x*)
+ basic_machine=tic54x-unknown
+ os=-coff
+ ;;
+ tic55x | c55x*)
+ basic_machine=tic55x-unknown
+ os=-coff
+ ;;
+ tic6x | c6x*)
+ basic_machine=tic6x-unknown
+ os=-coff
+ ;;
+ tx39)
+ basic_machine=mipstx39-unknown
+ ;;
+ tx39el)
+ basic_machine=mipstx39el-unknown
+ ;;
+ toad1)
+ basic_machine=pdp10-xkl
+ os=-tops20
+ ;;
+ tower | tower-32)
+ basic_machine=m68k-ncr
+ ;;
+ tpf)
+ basic_machine=s390x-ibm
+ os=-tpf
+ ;;
+ udi29k)
+ basic_machine=a29k-amd
+ os=-udi
+ ;;
+ ultra3)
+ basic_machine=a29k-nyu
+ os=-sym1
+ ;;
+ v810 | necv810)
+ basic_machine=v810-nec
+ os=-none
+ ;;
+ vaxv)
+ basic_machine=vax-dec
+ os=-sysv
+ ;;
+ vms)
+ basic_machine=vax-dec
+ os=-vms
+ ;;
+ vpp*|vx|vx-*)
+ basic_machine=f301-fujitsu
+ ;;
+ vxworks960)
+ basic_machine=i960-wrs
+ os=-vxworks
+ ;;
+ vxworks68)
+ basic_machine=m68k-wrs
+ os=-vxworks
+ ;;
+ vxworks29k)
+ basic_machine=a29k-wrs
+ os=-vxworks
+ ;;
+ w65*)
+ basic_machine=w65-wdc
+ os=-none
+ ;;
+ w89k-*)
+ basic_machine=hppa1.1-winbond
+ os=-proelf
+ ;;
+ xbox)
+ basic_machine=i686-pc
+ os=-mingw32
+ ;;
+ xps | xps100)
+ basic_machine=xps100-honeywell
+ ;;
+ ymp)
+ basic_machine=ymp-cray
+ os=-unicos
+ ;;
+ z8k-*-coff)
+ basic_machine=z8k-unknown
+ os=-sim
+ ;;
+ none)
+ basic_machine=none-none
+ os=-none
+ ;;
+
+# Here we handle the default manufacturer of certain CPU types. It is in
+# some cases the only manufacturer, in others, it is the most popular.
+ w89k)
+ basic_machine=hppa1.1-winbond
+ ;;
+ op50n)
+ basic_machine=hppa1.1-oki
+ ;;
+ op60c)
+ basic_machine=hppa1.1-oki
+ ;;
+ romp)
+ basic_machine=romp-ibm
+ ;;
+ mmix)
+ basic_machine=mmix-knuth
+ ;;
+ rs6000)
+ basic_machine=rs6000-ibm
+ ;;
+ vax)
+ basic_machine=vax-dec
+ ;;
+ pdp10)
+ # there are many clones, so DEC is not a safe bet
+ basic_machine=pdp10-unknown
+ ;;
+ pdp11)
+ basic_machine=pdp11-dec
+ ;;
+ we32k)
+ basic_machine=we32k-att
+ ;;
+ sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
+ basic_machine=sh-unknown
+ ;;
+ sh64)
+ basic_machine=sh64-unknown
+ ;;
+ sparc | sparcv8 | sparcv9 | sparcv9b)
+ basic_machine=sparc-sun
+ ;;
+ cydra)
+ basic_machine=cydra-cydrome
+ ;;
+ orion)
+ basic_machine=orion-highlevel
+ ;;
+ orion105)
+ basic_machine=clipper-highlevel
+ ;;
+ mac | mpw | mac-mpw)
+ basic_machine=m68k-apple
+ ;;
+ pmac | pmac-mpw)
+ basic_machine=powerpc-apple
+ ;;
+ *-unknown)
+ # Make sure to match an already-canonicalized machine name.
+ ;;
+ *)
+ echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+
+# Here we canonicalize certain aliases for manufacturers.
+case $basic_machine in
+ *-digital*)
+ basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
+ ;;
+ *-commodore*)
+ basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
+ ;;
+ *)
+ ;;
+esac
+
+# Decode manufacturer-specific aliases for certain operating systems.
+
+if [ x"$os" != x"" ]
+then
+case $os in
+ # First match some system type aliases
+ # that might get confused with valid system types.
+ # -solaris* is a basic system type, with this one exception.
+ -solaris1 | -solaris1.*)
+ os=`echo $os | sed -e 's|solaris1|sunos4|'`
+ ;;
+ -solaris)
+ os=-solaris2
+ ;;
+ -svr4*)
+ os=-sysv4
+ ;;
+ -unixware*)
+ os=-sysv4.2uw
+ ;;
+ -gnu/linux*)
+ os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
+ ;;
+ # First accept the basic system types.
+ # The portable systems comes first.
+ # Each alternative MUST END IN A *, to match a version number.
+ # -sysv* is not here because it comes later, after sysvr4.
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
+ | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
+ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
+ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
+ | -aos* \
+ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
+ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
+ | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
+ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
+ | -chorusos* | -chorusrdb* \
+ | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+ | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
+ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
+ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
+ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
+ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
+ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
+ # Remember, each alternative MUST END IN *, to match a version number.
+ ;;
+ -qnx*)
+ case $basic_machine in
+ x86-* | i*86-*)
+ ;;
+ *)
+ os=-nto$os
+ ;;
+ esac
+ ;;
+ -nto-qnx*)
+ ;;
+ -nto*)
+ os=`echo $os | sed -e 's|nto|nto-qnx|'`
+ ;;
+ -sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
+ | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
+ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
+ ;;
+ -mac*)
+ os=`echo $os | sed -e 's|mac|macos|'`
+ ;;
+ -linux-dietlibc)
+ os=-linux-dietlibc
+ ;;
+ -linux*)
+ os=`echo $os | sed -e 's|linux|linux-gnu|'`
+ ;;
+ -sunos5*)
+ os=`echo $os | sed -e 's|sunos5|solaris2|'`
+ ;;
+ -sunos6*)
+ os=`echo $os | sed -e 's|sunos6|solaris3|'`
+ ;;
+ -opened*)
+ os=-openedition
+ ;;
+ -os400*)
+ os=-os400
+ ;;
+ -wince*)
+ os=-wince
+ ;;
+ -osfrose*)
+ os=-osfrose
+ ;;
+ -osf*)
+ os=-osf
+ ;;
+ -utek*)
+ os=-bsd
+ ;;
+ -dynix*)
+ os=-bsd
+ ;;
+ -acis*)
+ os=-aos
+ ;;
+ -atheos*)
+ os=-atheos
+ ;;
+ -syllable*)
+ os=-syllable
+ ;;
+ -386bsd)
+ os=-bsd
+ ;;
+ -ctix* | -uts*)
+ os=-sysv
+ ;;
+ -nova*)
+ os=-rtmk-nova
+ ;;
+ -ns2 )
+ os=-nextstep2
+ ;;
+ -nsk*)
+ os=-nsk
+ ;;
+ # Preserve the version number of sinix5.
+ -sinix5.*)
+ os=`echo $os | sed -e 's|sinix|sysv|'`
+ ;;
+ -sinix*)
+ os=-sysv4
+ ;;
+ -tpf*)
+ os=-tpf
+ ;;
+ -triton*)
+ os=-sysv3
+ ;;
+ -oss*)
+ os=-sysv3
+ ;;
+ -svr4)
+ os=-sysv4
+ ;;
+ -svr3)
+ os=-sysv3
+ ;;
+ -sysvr4)
+ os=-sysv4
+ ;;
+ # This must come after -sysvr4.
+ -sysv*)
+ ;;
+ -ose*)
+ os=-ose
+ ;;
+ -es1800*)
+ os=-ose
+ ;;
+ -xenix)
+ os=-xenix
+ ;;
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ os=-mint
+ ;;
+ -aros*)
+ os=-aros
+ ;;
+ -kaos*)
+ os=-kaos
+ ;;
+ -zvmoe)
+ os=-zvmoe
+ ;;
+ -none)
+ ;;
+ *)
+ # Get rid of the `-' at the beginning of $os.
+ os=`echo $os | sed 's/[^-]*-//'`
+ echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
+ exit 1
+ ;;
+esac
+else
+
+# Here we handle the default operating systems that come with various machines.
+# The value should be what the vendor currently ships out the door with their
+# machine or put another way, the most popular os provided with the machine.
+
+# Note that if you're going to try to match "-MANUFACTURER" here (say,
+# "-sun"), then you have to tell the case statement up towards the top
+# that MANUFACTURER isn't an operating system. Otherwise, code above
+# will signal an error saying that MANUFACTURER isn't an operating
+# system, and we'll never get to this point.
+
+case $basic_machine in
+ *-acorn)
+ os=-riscix1.2
+ ;;
+ arm*-rebel)
+ os=-linux
+ ;;
+ arm*-semi)
+ os=-aout
+ ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
+ # This must come before the *-dec entry.
+ pdp10-*)
+ os=-tops20
+ ;;
+ pdp11-*)
+ os=-none
+ ;;
+ *-dec | vax-*)
+ os=-ultrix4.2
+ ;;
+ m68*-apollo)
+ os=-domain
+ ;;
+ i386-sun)
+ os=-sunos4.0.2
+ ;;
+ m68000-sun)
+ os=-sunos3
+ # This also exists in the configure program, but was not the
+ # default.
+ # os=-sunos4
+ ;;
+ m68*-cisco)
+ os=-aout
+ ;;
+ mips*-cisco)
+ os=-elf
+ ;;
+ mips*-*)
+ os=-elf
+ ;;
+ or32-*)
+ os=-coff
+ ;;
+ *-tti) # must be before sparc entry or we get the wrong os.
+ os=-sysv3
+ ;;
+ sparc-* | *-sun)
+ os=-sunos4.1.1
+ ;;
+ *-be)
+ os=-beos
+ ;;
+ *-ibm)
+ os=-aix
+ ;;
+ *-knuth)
+ os=-mmixware
+ ;;
+ *-wec)
+ os=-proelf
+ ;;
+ *-winbond)
+ os=-proelf
+ ;;
+ *-oki)
+ os=-proelf
+ ;;
+ *-hp)
+ os=-hpux
+ ;;
+ *-hitachi)
+ os=-hiux
+ ;;
+ i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
+ os=-sysv
+ ;;
+ *-cbm)
+ os=-amigaos
+ ;;
+ *-dg)
+ os=-dgux
+ ;;
+ *-dolphin)
+ os=-sysv3
+ ;;
+ m68k-ccur)
+ os=-rtu
+ ;;
+ m88k-omron*)
+ os=-luna
+ ;;
+ *-next )
+ os=-nextstep
+ ;;
+ *-sequent)
+ os=-ptx
+ ;;
+ *-crds)
+ os=-unos
+ ;;
+ *-ns)
+ os=-genix
+ ;;
+ i370-*)
+ os=-mvs
+ ;;
+ *-next)
+ os=-nextstep3
+ ;;
+ *-gould)
+ os=-sysv
+ ;;
+ *-highlevel)
+ os=-bsd
+ ;;
+ *-encore)
+ os=-bsd
+ ;;
+ *-sgi)
+ os=-irix
+ ;;
+ *-siemens)
+ os=-sysv4
+ ;;
+ *-masscomp)
+ os=-rtu
+ ;;
+ f30[01]-fujitsu | f700-fujitsu)
+ os=-uxpv
+ ;;
+ *-rom68k)
+ os=-coff
+ ;;
+ *-*bug)
+ os=-coff
+ ;;
+ *-apple)
+ os=-macos
+ ;;
+ *-atari*)
+ os=-mint
+ ;;
+ *)
+ os=-none
+ ;;
+esac
+fi
+
+# Here we handle the case where we know the os, and the CPU type, but not the
+# manufacturer. We pick the logical manufacturer.
+vendor=unknown
+case $basic_machine in
+ *-unknown)
+ case $os in
+ -riscix*)
+ vendor=acorn
+ ;;
+ -sunos*)
+ vendor=sun
+ ;;
+ -aix*)
+ vendor=ibm
+ ;;
+ -beos*)
+ vendor=be
+ ;;
+ -hpux*)
+ vendor=hp
+ ;;
+ -mpeix*)
+ vendor=hp
+ ;;
+ -hiux*)
+ vendor=hitachi
+ ;;
+ -unos*)
+ vendor=crds
+ ;;
+ -dgux*)
+ vendor=dg
+ ;;
+ -luna*)
+ vendor=omron
+ ;;
+ -genix*)
+ vendor=ns
+ ;;
+ -mvs* | -opened*)
+ vendor=ibm
+ ;;
+ -os400*)
+ vendor=ibm
+ ;;
+ -ptx*)
+ vendor=sequent
+ ;;
+ -tpf*)
+ vendor=ibm
+ ;;
+ -vxsim* | -vxworks* | -windiss*)
+ vendor=wrs
+ ;;
+ -aux*)
+ vendor=apple
+ ;;
+ -hms*)
+ vendor=hitachi
+ ;;
+ -mpw* | -macos*)
+ vendor=apple
+ ;;
+ -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
+ vendor=atari
+ ;;
+ -vos*)
+ vendor=stratus
+ ;;
+ esac
+ basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
+ ;;
+esac
+
+echo $basic_machine$os
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
Index: 10.244/config/config.guess
--- 10.244/config/config.guess Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/config/config.guess Fri, 28 Jul 2006 10:12:07 +0200 theo (oln/w/50_config.gue 644)
@@ -0,0 +1,1465 @@
+#! /bin/sh
+# Attempt to guess a canonical system name.
+# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
+# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+
+timestamp='2005-04-22'
+
+# This file is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Originally written by Per Bothner <per(a)bothner.com>.
+# Please send patches to <config-patches(a)gnu.org>. Submit a context
+# diff and a properly formatted ChangeLog entry.
+#
+# This script attempts to guess a canonical system name similar to
+# config.sub. If it succeeds, it prints the system name on stdout, and
+# exits with 0. Otherwise, it exits with 1.
+#
+# The plan is that this can be called by configure scripts if you
+# don't specify an explicit build system type.
+
+me=`echo "$0" | sed -e 's,.*/,,'`
+
+usage="\
+Usage: $0 [OPTION]
+
+Output the configuration name of the system \`$me' is run on.
+
+Operation modes:
+ -h, --help print this help, then exit
+ -t, --time-stamp print date of last modification, then exit
+ -v, --version print version number, then exit
+
+Report bugs and patches to <config-patches(a)gnu.org>."
+
+version="\
+GNU config.guess ($timestamp)
+
+Originally written by Per Bothner.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+Free Software Foundation, Inc.
+
+This is free software; see the source for copying conditions. There is NO
+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+
+help="
+Try \`$me --help' for more information."
+
+# Parse command line
+while test $# -gt 0 ; do
+ case $1 in
+ --time-stamp | --time* | -t )
+ echo "$timestamp" ; exit 0 ;;
+ --version | -v )
+ echo "$version" ; exit 0 ;;
+ --help | --h* | -h )
+ echo "$usage"; exit 0 ;;
+ -- ) # Stop option processing
+ shift; break ;;
+ - ) # Use stdin as input.
+ break ;;
+ -* )
+ echo "$me: invalid option $1$help" >&2
+ exit 1 ;;
+ * )
+ break ;;
+ esac
+done
+
+if test $# != 0; then
+ echo "$me: too many arguments$help" >&2
+ exit 1
+fi
+
+trap 'exit 1' 1 2 15
+
+# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
+# compiler to aid in system detection is discouraged as it requires
+# temporary files to be created and, as you can see below, it is a
+# headache to deal with in a portable fashion.
+
+# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
+# use `HOST_CC' if defined, but it is deprecated.
+
+# Portable tmp directory creation inspired by the Autoconf team.
+
+set_cc_for_build='
+trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
+trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
+: ${TMPDIR=/tmp} ;
+ { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
+ { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
+ { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
+dummy=$tmp/dummy ;
+tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
+case $CC_FOR_BUILD,$HOST_CC,$CC in
+ ,,) echo "int x;" > $dummy.c ;
+ for c in cc gcc c89 c99 ; do
+ if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
+ CC_FOR_BUILD="$c"; break ;
+ fi ;
+ done ;
+ if test x"$CC_FOR_BUILD" = x ; then
+ CC_FOR_BUILD=no_compiler_found ;
+ fi
+ ;;
+ ,,*) CC_FOR_BUILD=$CC ;;
+ ,*,*) CC_FOR_BUILD=$HOST_CC ;;
+esac ;'
+
+# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
+# (ghazi(a)noc.rutgers.edu 1994-08-24)
+if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
+ PATH=$PATH:/.attbin ; export PATH
+fi
+
+UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
+UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
+UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown
+UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
+
+# Note: order is significant - the case branches are not exclusive.
+
+case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
+ *:NetBSD:*:*)
+ # NetBSD (nbsd) targets should (where applicable) match one or
+ # more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+ # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently
+ # switched to ELF, *-*-netbsd* would select the old
+ # object file format. This provides both forward
+ # compatibility and a consistent mechanism for selecting the
+ # object file format.
+ #
+ # Note: NetBSD doesn't particularly care about the vendor
+ # portion of the name. We always set it to "unknown".
+ sysctl="sysctl -n hw.machine_arch"
+ UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
+ /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
+ case "${UNAME_MACHINE_ARCH}" in
+ armeb) machine=armeb-unknown ;;
+ arm*) machine=arm-unknown ;;
+ sh3el) machine=shl-unknown ;;
+ sh3eb) machine=sh-unknown ;;
+ *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
+ esac
+ # The Operating System including object format, if it has switched
+ # to ELF recently, or will in the future.
+ case "${UNAME_MACHINE_ARCH}" in
+ arm*|i386|m68k|ns32k|sh3*|sparc|vax)
+ eval $set_cc_for_build
+ if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep __ELF__ >/dev/null
+ then
+ # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
+ # Return netbsd for either. FIX?
+ os=netbsd
+ else
+ os=netbsdelf
+ fi
+ ;;
+ *)
+ os=netbsd
+ ;;
+ esac
+ # The OS release
+ # Debian GNU/NetBSD machines have a different userland, and
+ # thus, need a distinct triplet. However, they do not need
+ # kernel version information, so it can be replaced with a
+ # suitable tag, in the style of linux-gnu.
+ case "${UNAME_VERSION}" in
+ Debian*)
+ release='-gnu'
+ ;;
+ *)
+ release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
+ ;;
+ esac
+ # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
+ # contains redundant information, the shorter form:
+ # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
+ echo "${machine}-${os}${release}"
+ exit 0 ;;
+ amd64:OpenBSD:*:*)
+ echo x86_64-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ amiga:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ cats:OpenBSD:*:*)
+ echo arm-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ hp300:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ luna88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mac68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ macppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme68k:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvme88k:OpenBSD:*:*)
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ mvmeppc:OpenBSD:*:*)
+ echo powerpc-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sgi:OpenBSD:*:*)
+ echo mips64-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ sun3:OpenBSD:*:*)
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:OpenBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:ekkoBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
+ exit 0 ;;
+ macppc:MirBSD:*:*)
+ echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ exit 0 ;;
+ *:MirBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
+ exit 0 ;;
+ alpha:OSF1:*:*)
+ case $UNAME_RELEASE in
+ *4.0)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
+ ;;
+ *5.*)
+ UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+ ;;
+ esac
+ # According to Compaq, /usr/sbin/psrinfo has been available on
+ # OSF/1 and Tru64 systems produced since 1995. I hope that
+ # covers most systems running today. This code pipes the CPU
+ # types through head -n 1, so we only detect the type of CPU 0.
+ ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1`
+ case "$ALPHA_CPU_TYPE" in
+ "EV4 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "EV4.5 (21064)")
+ UNAME_MACHINE="alpha" ;;
+ "LCA4 (21066/21068)")
+ UNAME_MACHINE="alpha" ;;
+ "EV5 (21164)")
+ UNAME_MACHINE="alphaev5" ;;
+ "EV5.6 (21164A)")
+ UNAME_MACHINE="alphaev56" ;;
+ "EV5.6 (21164PC)")
+ UNAME_MACHINE="alphapca56" ;;
+ "EV5.7 (21164PC)")
+ UNAME_MACHINE="alphapca57" ;;
+ "EV6 (21264)")
+ UNAME_MACHINE="alphaev6" ;;
+ "EV6.7 (21264A)")
+ UNAME_MACHINE="alphaev67" ;;
+ "EV6.8CB (21264C)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8AL (21264B)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.8CX (21264D)")
+ UNAME_MACHINE="alphaev68" ;;
+ "EV6.9A (21264/EV69A)")
+ UNAME_MACHINE="alphaev69" ;;
+ "EV7 (21364)")
+ UNAME_MACHINE="alphaev7" ;;
+ "EV7.9 (21364A)")
+ UNAME_MACHINE="alphaev79" ;;
+ esac
+ # A Pn.n version is a patched version.
+ # A Vn.n version is a released version.
+ # A Tn.n version is a released field test version.
+ # A Xn.n version is an unreleased experimental baselevel.
+ # 1.2 uses "1.2" for uname -r.
+ echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ exit 0 ;;
+ Alpha\ *:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # Should we change UNAME_MACHINE based on the output of uname instead
+ # of the specific Alpha model?
+ echo alpha-pc-interix
+ exit 0 ;;
+ 21064:Windows_NT:50:3)
+ echo alpha-dec-winnt3.5
+ exit 0 ;;
+ Amiga*:UNIX_System_V:4.0:*)
+ echo m68k-unknown-sysv4
+ exit 0;;
+ *:[Aa]miga[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-amigaos
+ exit 0 ;;
+ *:[Mm]orph[Oo][Ss]:*:*)
+ echo ${UNAME_MACHINE}-unknown-morphos
+ exit 0 ;;
+ *:OS/390:*:*)
+ echo i370-ibm-openedition
+ exit 0 ;;
+ *:z/VM:*:*)
+ echo s390-ibm-zvmoe
+ exit 0 ;;
+ *:OS400:*:*)
+ echo powerpc-ibm-os400
+ exit 0 ;;
+ arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
+ echo arm-acorn-riscix${UNAME_RELEASE}
+ exit 0;;
+ SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
+ echo hppa1.1-hitachi-hiuxmpp
+ exit 0;;
+ Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
+ # akee(a)wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
+ if test "`(/bin/universe) 2>/dev/null`" = att ; then
+ echo pyramid-pyramid-sysv3
+ else
+ echo pyramid-pyramid-bsd
+ fi
+ exit 0 ;;
+ NILE*:*:*:dcosx)
+ echo pyramid-pyramid-svr4
+ exit 0 ;;
+ DRS?6000:unix:4.0:6*)
+ echo sparc-icl-nx6
+ exit 0 ;;
+ DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
+ case `/usr/bin/uname -p` in
+ sparc) echo sparc-icl-nx7 && exit 0 ;;
+ esac ;;
+ sun4H:SunOS:5.*:*)
+ echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
+ echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ i86pc:SunOS:5.*:*)
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:6*:*)
+ # According to config.sub, this is the proper way to canonicalize
+ # SunOS6. Hard to guess exactly what SunOS6 will be like, but
+ # it's likely to be more like Solaris than SunOS4.
+ echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ sun4*:SunOS:*:*)
+ case "`/usr/bin/arch -k`" in
+ Series*|S4*)
+ UNAME_RELEASE=`uname -v`
+ ;;
+ esac
+ # Japanese Language versions have a version number like `4.1.3-JL'.
+ echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
+ exit 0 ;;
+ sun3*:SunOS:*:*)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ exit 0 ;;
+ sun*:*:4.2BSD:*)
+ UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
+ test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
+ case "`/bin/arch`" in
+ sun3)
+ echo m68k-sun-sunos${UNAME_RELEASE}
+ ;;
+ sun4)
+ echo sparc-sun-sunos${UNAME_RELEASE}
+ ;;
+ esac
+ exit 0 ;;
+ aushp:SunOS:*:*)
+ echo sparc-auspex-sunos${UNAME_RELEASE}
+ exit 0 ;;
+ # The situation for MiNT is a little confusing. The machine name
+ # can be virtually everything (everything which is not
+ # "atarist" or "atariste" at least should have a processor
+ # > m68000). The system name ranges from "MiNT" over "FreeMiNT"
+ # to the lowercase version "mint" (or "freemint"). Finally
+ # the system name "TOS" denotes a system which is actually not
+ # MiNT. But MiNT is downward compatible to TOS, so this should
+ # be no problem.
+ atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
+ echo m68k-atari-mint${UNAME_RELEASE}
+ exit 0 ;;
+ milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
+ echo m68k-milan-mint${UNAME_RELEASE}
+ exit 0 ;;
+ hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
+ echo m68k-hades-mint${UNAME_RELEASE}
+ exit 0 ;;
+ *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
+ echo m68k-unknown-mint${UNAME_RELEASE}
+ exit 0 ;;
+ m68k:machten:*:*)
+ echo m68k-apple-machten${UNAME_RELEASE}
+ exit 0 ;;
+ powerpc:machten:*:*)
+ echo powerpc-apple-machten${UNAME_RELEASE}
+ exit 0 ;;
+ RISC*:Mach:*:*)
+ echo mips-dec-mach_bsd4.3
+ exit 0 ;;
+ RISC*:ULTRIX:*:*)
+ echo mips-dec-ultrix${UNAME_RELEASE}
+ exit 0 ;;
+ VAX*:ULTRIX*:*:*)
+ echo vax-dec-ultrix${UNAME_RELEASE}
+ exit 0 ;;
+ 2020:CLIX:*:* | 2430:CLIX:*:*)
+ echo clipper-intergraph-clix${UNAME_RELEASE}
+ exit 0 ;;
+ mips:*:*:UMIPS | mips:*:*:RISCos)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+#ifdef __cplusplus
+#include <stdio.h> /* for printf() prototype */
+ int main (int argc, char *argv[]) {
+#else
+ int main (argc, argv) int argc; char *argv[]; {
+#endif
+ #if defined (host_mips) && defined (MIPSEB)
+ #if defined (SYSTYPE_SYSV)
+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_SVR4)
+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
+ #endif
+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
+ #endif
+ #endif
+ exit (-1);
+ }
+EOF
+ $CC_FOR_BUILD -o $dummy $dummy.c \
+ && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
+ && exit 0
+ echo mips-mips-riscos${UNAME_RELEASE}
+ exit 0 ;;
+ Motorola:PowerMAX_OS:*:*)
+ echo powerpc-motorola-powermax
+ exit 0 ;;
+ Motorola:*:4.3:PL8-*)
+ echo powerpc-harris-powermax
+ exit 0 ;;
+ Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
+ echo powerpc-harris-powermax
+ exit 0 ;;
+ Night_Hawk:Power_UNIX:*:*)
+ echo powerpc-harris-powerunix
+ exit 0 ;;
+ m88k:CX/UX:7*:*)
+ echo m88k-harris-cxux7
+ exit 0 ;;
+ m88k:*:4*:R4*)
+ echo m88k-motorola-sysv4
+ exit 0 ;;
+ m88k:*:3*:R3*)
+ echo m88k-motorola-sysv3
+ exit 0 ;;
+ AViiON:dgux:*:*)
+ # DG/UX returns AViiON for all architectures
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
+ if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
+ then
+ if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
+ [ ${TARGET_BINARY_INTERFACE}x = x ]
+ then
+ echo m88k-dg-dgux${UNAME_RELEASE}
+ else
+ echo m88k-dg-dguxbcs${UNAME_RELEASE}
+ fi
+ else
+ echo i586-dg-dgux${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ M88*:DolphinOS:*:*) # DolphinOS (SVR3)
+ echo m88k-dolphin-sysv3
+ exit 0 ;;
+ M88*:*:R3*:*)
+ # Delta 88k system running SVR3
+ echo m88k-motorola-sysv3
+ exit 0 ;;
+ XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
+ echo m88k-tektronix-sysv3
+ exit 0 ;;
+ Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
+ echo m68k-tektronix-bsd
+ exit 0 ;;
+ *:IRIX*:*:*)
+ echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
+ exit 0 ;;
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
+ echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
+ exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
+ i*86:AIX:*:*)
+ echo i386-ibm-aix
+ exit 0 ;;
+ ia64:AIX:*:*)
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
+ exit 0 ;;
+ *:AIX:2:3)
+ if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <sys/systemcfg.h>
+
+ main()
+ {
+ if (!__power_pc())
+ exit(1);
+ puts("powerpc-ibm-aix3.2.5");
+ exit(0);
+ }
+EOF
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ echo rs6000-ibm-aix3.2.5
+ elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
+ echo rs6000-ibm-aix3.2.4
+ else
+ echo rs6000-ibm-aix3.2
+ fi
+ exit 0 ;;
+ *:AIX:*:[45])
+ IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
+ if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
+ IBM_ARCH=rs6000
+ else
+ IBM_ARCH=powerpc
+ fi
+ if [ -x /usr/bin/oslevel ] ; then
+ IBM_REV=`/usr/bin/oslevel`
+ else
+ IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
+ fi
+ echo ${IBM_ARCH}-ibm-aix${IBM_REV}
+ exit 0 ;;
+ *:AIX:*:*)
+ echo rs6000-ibm-aix
+ exit 0 ;;
+ ibmrt:4.4BSD:*|romp-ibm:BSD:*)
+ echo romp-ibm-bsd4.4
+ exit 0 ;;
+ ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and
+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
+ exit 0 ;; # report: romp-ibm BSD 4.3
+ *:BOSX:*:*)
+ echo rs6000-bull-bosx
+ exit 0 ;;
+ DPX/2?00:B.O.S.:*:*)
+ echo m68k-bull-sysv3
+ exit 0 ;;
+ 9000/[34]??:4.3bsd:1.*:*)
+ echo m68k-hp-bsd
+ exit 0 ;;
+ hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
+ echo m68k-hp-bsd4.4
+ exit 0 ;;
+ 9000/[34678]??:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ case "${UNAME_MACHINE}" in
+ 9000/31? ) HP_ARCH=m68000 ;;
+ 9000/[34]?? ) HP_ARCH=m68k ;;
+ 9000/[678][0-9][0-9])
+ if [ -x /usr/bin/getconf ]; then
+ sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
+ sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+ case "${sc_cpu_version}" in
+ 523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+ 528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+ 532) # CPU_PA_RISC2_0
+ case "${sc_kernel_bits}" in
+ 32) HP_ARCH="hppa2.0n" ;;
+ 64) HP_ARCH="hppa2.0w" ;;
+ '') HP_ARCH="hppa2.0" ;; # HP-UX 10.20
+ esac ;;
+ esac
+ fi
+ if [ "${HP_ARCH}" = "" ]; then
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+
+ #define _HPUX_SOURCE
+ #include <stdlib.h>
+ #include <unistd.h>
+
+ int main ()
+ {
+ #if defined(_SC_KERNEL_BITS)
+ long bits = sysconf(_SC_KERNEL_BITS);
+ #endif
+ long cpu = sysconf (_SC_CPU_VERSION);
+
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+ case CPU_PA_RISC2_0:
+ #if defined(_SC_KERNEL_BITS)
+ switch (bits)
+ {
+ case 64: puts ("hppa2.0w"); break;
+ case 32: puts ("hppa2.0n"); break;
+ default: puts ("hppa2.0"); break;
+ } break;
+ #else /* !defined(_SC_KERNEL_BITS) */
+ puts ("hppa2.0"); break;
+ #endif
+ default: puts ("hppa1.0"); break;
+ }
+ exit (0);
+ }
+EOF
+ (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
+ test -z "$HP_ARCH" && HP_ARCH=hppa
+ fi ;;
+ esac
+ if [ ${HP_ARCH} = "hppa2.0w" ]
+ then
+ # avoid double evaluation of $set_cc_for_build
+ test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
+ if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
+ then
+ HP_ARCH="hppa2.0w"
+ else
+ HP_ARCH="hppa64"
+ fi
+ fi
+ echo ${HP_ARCH}-hp-hpux${HPUX_REV}
+ exit 0 ;;
+ ia64:HP-UX:*:*)
+ HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
+ echo ia64-hp-hpux${HPUX_REV}
+ exit 0 ;;
+ 3050*:HI-UX:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <unistd.h>
+ int
+ main ()
+ {
+ long cpu = sysconf (_SC_CPU_VERSION);
+ /* The order matters, because CPU_IS_HP_MC68K erroneously returns
+ true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct
+ results, however. */
+ if (CPU_IS_PA_RISC (cpu))
+ {
+ switch (cpu)
+ {
+ case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
+ case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
+ default: puts ("hppa-hitachi-hiuxwe2"); break;
+ }
+ }
+ else if (CPU_IS_HP_MC68K (cpu))
+ puts ("m68k-hitachi-hiuxwe2");
+ else puts ("unknown-hitachi-hiuxwe2");
+ exit (0);
+ }
+EOF
+ $CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
+ echo unknown-hitachi-hiuxwe2
+ exit 0 ;;
+ 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
+ echo hppa1.1-hp-bsd
+ exit 0 ;;
+ 9000/8??:4.3bsd:*:*)
+ echo hppa1.0-hp-bsd
+ exit 0 ;;
+ *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
+ echo hppa1.0-hp-mpeix
+ exit 0 ;;
+ hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
+ echo hppa1.1-hp-osf
+ exit 0 ;;
+ hp8??:OSF1:*:*)
+ echo hppa1.0-hp-osf
+ exit 0 ;;
+ i*86:OSF1:*:*)
+ if [ -x /usr/sbin/sysversion ] ; then
+ echo ${UNAME_MACHINE}-unknown-osf1mk
+ else
+ echo ${UNAME_MACHINE}-unknown-osf1
+ fi
+ exit 0 ;;
+ parisc*:Lites*:*:*)
+ echo hppa1.1-hp-lites
+ exit 0 ;;
+ C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
+ echo c1-convex-bsd
+ exit 0 ;;
+ C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit 0 ;;
+ C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
+ echo c34-convex-bsd
+ exit 0 ;;
+ C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
+ echo c38-convex-bsd
+ exit 0 ;;
+ C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
+ echo c4-convex-bsd
+ exit 0 ;;
+ CRAY*Y-MP:*:*:*)
+ echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*[A-Z]90:*:*:*)
+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
+ -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*TS:*:*:*)
+ echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*T3E:*:*:*)
+ echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ CRAY*SV1:*:*:*)
+ echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ *:UNICOS/mp:*:*)
+ echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
+ exit 0 ;;
+ F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
+ FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+ echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit 0 ;;
+ 5000:UNIX_System_V:4.*:*)
+ FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+ echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+ exit 0 ;;
+ i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ sparc*:BSD/OS:*:*)
+ echo sparc-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ *:BSD/OS:*:*)
+ echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
+ exit 0 ;;
+ *:FreeBSD:*:*)
+ echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit 0 ;;
+ i*:CYGWIN*:*)
+ echo ${UNAME_MACHINE}-pc-cygwin
+ exit 0 ;;
+ i*:MINGW*:*)
+ echo ${UNAME_MACHINE}-pc-mingw32
+ exit 0 ;;
+ i*:PW*:*)
+ echo ${UNAME_MACHINE}-pc-pw32
+ exit 0 ;;
+ x86:Interix*:[34]*)
+ echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+ exit 0 ;;
+ [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
+ echo i${UNAME_MACHINE}-pc-mks
+ exit 0 ;;
+ i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
+ # How do we know it's Interix rather than the generic POSIX subsystem?
+ # It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
+ # UNAME_MACHINE based on the output of uname instead of i386?
+ echo i586-pc-interix
+ exit 0 ;;
+ i*:UWIN*:*)
+ echo ${UNAME_MACHINE}-pc-uwin
+ exit 0 ;;
+ amd64:CYGWIN*:*:*)
+ echo x86_64-unknown-cygwin
+ exit 0 ;;
+ p*:CYGWIN*:*)
+ echo powerpcle-unknown-cygwin
+ exit 0 ;;
+ prep*:SunOS:5.*:*)
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
+ exit 0 ;;
+ *:GNU:*:*)
+ # the GNU system
+ echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+ exit 0 ;;
+ *:GNU/*:*:*)
+ # other systems with GNU libc and userland
+ echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+ exit 0 ;;
+ i*86:Minix:*:*)
+ echo ${UNAME_MACHINE}-pc-minix
+ exit 0 ;;
+ arm*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ cris:Linux:*:*)
+ echo cris-axis-linux-gnu
+ exit 0 ;;
+ crisv32:Linux:*:*)
+ echo crisv32-axis-linux-gnu
+ exit 0 ;;
+ frv:Linux:*:*)
+ echo frv-unknown-linux-gnu
+ exit 0 ;;
+ ia64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ m32r*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ m68*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ mips:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips
+ #undef mipsel
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mipsel
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ ;;
+ mips64:Linux:*:*)
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #undef CPU
+ #undef mips64
+ #undef mips64el
+ #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
+ CPU=mips64el
+ #else
+ #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
+ CPU=mips64
+ #else
+ CPU=
+ #endif
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+ test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
+ ;;
+ ppc:Linux:*:*)
+ echo powerpc-unknown-linux-gnu
+ exit 0 ;;
+ ppc64:Linux:*:*)
+ echo powerpc64-unknown-linux-gnu
+ exit 0 ;;
+ alpha:Linux:*:*)
+ case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
+ EV5) UNAME_MACHINE=alphaev5 ;;
+ EV56) UNAME_MACHINE=alphaev56 ;;
+ PCA56) UNAME_MACHINE=alphapca56 ;;
+ PCA57) UNAME_MACHINE=alphapca56 ;;
+ EV6) UNAME_MACHINE=alphaev6 ;;
+ EV67) UNAME_MACHINE=alphaev67 ;;
+ EV68*) UNAME_MACHINE=alphaev68 ;;
+ esac
+ objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
+ if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
+ echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+ exit 0 ;;
+ parisc:Linux:*:* | hppa:Linux:*:*)
+ # Look for CPU level
+ case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
+ PA7*) echo hppa1.1-unknown-linux-gnu ;;
+ PA8*) echo hppa2.0-unknown-linux-gnu ;;
+ *) echo hppa-unknown-linux-gnu ;;
+ esac
+ exit 0 ;;
+ parisc64:Linux:*:* | hppa64:Linux:*:*)
+ echo hppa64-unknown-linux-gnu
+ exit 0 ;;
+ s390:Linux:*:* | s390x:Linux:*:*)
+ echo ${UNAME_MACHINE}-ibm-linux
+ exit 0 ;;
+ sh64*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ sh*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ sparc:Linux:*:* | sparc64:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit 0 ;;
+ x86_64:Linux:*:*)
+ echo x86_64-unknown-linux-gnu
+ exit 0 ;;
+ i*86:Linux:*:*)
+ # The BFD linker knows what the default object file format is, so
+ # first see if it will tell us. cd to the root directory to prevent
+ # problems with other programs or directories called `ld' in the path.
+ # Set LC_ALL=C to ensure ld outputs messages in English.
+ ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
+ | sed -ne '/supported targets:/!d
+ s/[ ][ ]*/ /g
+ s/.*supported targets: *//
+ s/ .*//
+ p'`
+ case "$ld_supported_targets" in
+ elf32-i386)
+ TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
+ ;;
+ a.out-i386-linux)
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout"
+ exit 0 ;;
+ coff-i386)
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff"
+ exit 0 ;;
+ "")
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or
+ # one that does not give us useful --help.
+ echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
+ exit 0 ;;
+ esac
+ # Determine whether the default compiler is a.out or elf
+ eval $set_cc_for_build
+ sed 's/^ //' << EOF >$dummy.c
+ #include <features.h>
+ #ifdef __ELF__
+ # ifdef __GLIBC__
+ # if __GLIBC__ >= 2
+ LIBC=gnu
+ # else
+ LIBC=gnulibc1
+ # endif
+ # else
+ LIBC=gnulibc1
+ # endif
+ #else
+ #ifdef __INTEL_COMPILER
+ LIBC=gnu
+ #else
+ LIBC=gnuaout
+ #endif
+ #endif
+ #ifdef __dietlibc__
+ LIBC=dietlibc
+ #endif
+EOF
+ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+ test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
+ test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
+ ;;
+ i*86:DYNIX/ptx:4*:*)
+ # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
+ # earlier versions are messed up and put the nodename in both
+ # sysname and nodename.
+ echo i386-sequent-sysv4
+ exit 0 ;;
+ i*86:UNIX_SV:4.2MP:2.*)
+ # Unixware is an offshoot of SVR4, but it has its own version
+ # number series starting with 2...
+ # I am not positive that other SVR4 systems won't match this,
+ # I just have to hope. -- rms.
+ # Use sysv4.2uw... so that sysv4* matches it.
+ echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
+ exit 0 ;;
+ i*86:OS/2:*:*)
+ # If we were able to find `uname', then EMX Unix compatibility
+ # is probably installed.
+ echo ${UNAME_MACHINE}-pc-os2-emx
+ exit 0 ;;
+ i*86:XTS-300:*:STOP)
+ echo ${UNAME_MACHINE}-unknown-stop
+ exit 0 ;;
+ i*86:atheos:*:*)
+ echo ${UNAME_MACHINE}-unknown-atheos
+ exit 0 ;;
+ i*86:syllable:*:*)
+ echo ${UNAME_MACHINE}-pc-syllable
+ exit 0 ;;
+ i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
+ echo i386-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ i*86:*DOS:*:*)
+ echo ${UNAME_MACHINE}-pc-msdosdjgpp
+ exit 0 ;;
+ i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
+ UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
+ if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
+ echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
+ else
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
+ fi
+ exit 0 ;;
+ i*86:*:5:[78]*)
+ case `/bin/uname -X | grep "^Machine"` in
+ *486*) UNAME_MACHINE=i486 ;;
+ *Pentium) UNAME_MACHINE=i586 ;;
+ *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
+ esac
+ echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
+ exit 0 ;;
+ i*86:*:3.2:*)
+ if test -f /usr/options/cb.name; then
+ UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
+ elif /bin/uname -X 2>/dev/null >/dev/null ; then
+ UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
+ (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
+ (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
+ && UNAME_MACHINE=i586
+ (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
+ && UNAME_MACHINE=i686
+ (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
+ && UNAME_MACHINE=i686
+ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
+ else
+ echo ${UNAME_MACHINE}-pc-sysv32
+ fi
+ exit 0 ;;
+ pc:*:*:*)
+ # Left here for compatibility:
+ # uname -m prints for DJGPP always 'pc', but it prints nothing about
+ # the processor, so we play safe by assuming i386.
+ echo i386-pc-msdosdjgpp
+ exit 0 ;;
+ Intel:Mach:3*:*)
+ echo i386-pc-mach3
+ exit 0 ;;
+ paragon:*:*:*)
+ echo i860-intel-osf1
+ exit 0 ;;
+ i860:*:4.*:*) # i860-SVR4
+ if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
+ echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
+ else # Add other i860-SVR4 vendors below as they are discovered.
+ echo i860-unknown-sysv${UNAME_RELEASE} # Unknown i860-SVR4
+ fi
+ exit 0 ;;
+ mini*:CTIX:SYS*5:*)
+ # "miniframe"
+ echo m68010-convergent-sysv
+ exit 0 ;;
+ mc68k:UNIX:SYSTEM5:3.51m)
+ echo m68k-convergent-sysv
+ exit 0 ;;
+ M680?0:D-NIX:5.3:*)
+ echo m68k-diab-dnix
+ exit 0 ;;
+ M68*:*:R3V[5678]*:*)
+ test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
+ 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
+ OS_REL=''
+ test -r /etc/.relid \
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && echo i486-ncr-sysv4.3${OS_REL} && exit 0
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
+ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
+ 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+ && echo i486-ncr-sysv4 && exit 0 ;;
+ m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ mc68030:UNIX_System_V:4.*:*)
+ echo m68k-atari-sysv4
+ exit 0 ;;
+ TSUNAMI:LynxOS:2.*:*)
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ rs6000:LynxOS:2.*:*)
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
+ echo powerpc-unknown-lynxos${UNAME_RELEASE}
+ exit 0 ;;
+ SM[BE]S:UNIX_SV:*:*)
+ echo mips-dde-sysv${UNAME_RELEASE}
+ exit 0 ;;
+ RM*:ReliantUNIX-*:*:*)
+ echo mips-sni-sysv4
+ exit 0 ;;
+ RM*:SINIX-*:*:*)
+ echo mips-sni-sysv4
+ exit 0 ;;
+ *:SINIX-*:*:*)
+ if uname -p 2>/dev/null >/dev/null ; then
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ echo ${UNAME_MACHINE}-sni-sysv4
+ else
+ echo ns32k-sni-sysv
+ fi
+ exit 0 ;;
+ PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+ # says <Richard.M.Bartel(a)ccMail.Census.GOV>
+ echo i586-unisys-sysv4
+ exit 0 ;;
+ *:UNIX_System_V:4*:FTX*)
+ # From Gerald Hewes <hewes(a)openmarket.com>.
+ # How about differentiating between stratus architectures? -djm
+ echo hppa1.1-stratus-sysv4
+ exit 0 ;;
+ *:*:*:FTX*)
+ # From seanf(a)swdc.stratus.com.
+ echo i860-stratus-sysv4
+ exit 0 ;;
+ i*86:VOS:*:*)
+ # From Paul.Green(a)stratus.com.
+ echo ${UNAME_MACHINE}-stratus-vos
+ exit 0 ;;
+ *:VOS:*:*)
+ # From Paul.Green(a)stratus.com.
+ echo hppa1.1-stratus-vos
+ exit 0 ;;
+ mc68*:A/UX:*:*)
+ echo m68k-apple-aux${UNAME_RELEASE}
+ exit 0 ;;
+ news*:NEWS-OS:6*:*)
+ echo mips-sony-newsos6
+ exit 0 ;;
+ R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
+ if [ -d /usr/nec ]; then
+ echo mips-nec-sysv${UNAME_RELEASE}
+ else
+ echo mips-unknown-sysv${UNAME_RELEASE}
+ fi
+ exit 0 ;;
+ BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only.
+ echo powerpc-be-beos
+ exit 0 ;;
+ BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only.
+ echo powerpc-apple-beos
+ exit 0 ;;
+ BePC:BeOS:*:*) # BeOS running on Intel PC compatible.
+ echo i586-pc-beos
+ exit 0 ;;
+ SX-4:SUPER-UX:*:*)
+ echo sx4-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
+ SX-5:SUPER-UX:*:*)
+ echo sx5-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
+ SX-6:SUPER-UX:*:*)
+ echo sx6-nec-superux${UNAME_RELEASE}
+ exit 0 ;;
+ Power*:Rhapsody:*:*)
+ echo powerpc-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+ *:Rhapsody:*:*)
+ echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
+ exit 0 ;;
+ *:Darwin:*:*)
+ UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
+ case $UNAME_PROCESSOR in
+ *86) UNAME_PROCESSOR=i686 ;;
+ unknown) UNAME_PROCESSOR=powerpc ;;
+ esac
+ echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
+ exit 0 ;;
+ *:procnto*:*:* | *:QNX:[0123456789]*:*)
+ UNAME_PROCESSOR=`uname -p`
+ if test "$UNAME_PROCESSOR" = "x86"; then
+ UNAME_PROCESSOR=i386
+ UNAME_MACHINE=pc
+ fi
+ echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
+ exit 0 ;;
+ *:QNX:*:4*)
+ echo i386-pc-qnx
+ exit 0 ;;
+ NSE-?:NONSTOP_KERNEL:*:*)
+ echo nse-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
+ NSR-?:NONSTOP_KERNEL:*:*)
+ echo nsr-tandem-nsk${UNAME_RELEASE}
+ exit 0 ;;
+ *:NonStop-UX:*:*)
+ echo mips-compaq-nonstopux
+ exit 0 ;;
+ BS2000:POSIX*:*:*)
+ echo bs2000-siemens-sysv
+ exit 0 ;;
+ DS/*:UNIX_System_V:*:*)
+ echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
+ exit 0 ;;
+ *:Plan9:*:*)
+ # "uname -m" is not consistent, so use $cputype instead. 386
+ # is converted to i386 for consistency with other x86
+ # operating systems.
+ if test "$cputype" = "386"; then
+ UNAME_MACHINE=i386
+ else
+ UNAME_MACHINE="$cputype"
+ fi
+ echo ${UNAME_MACHINE}-unknown-plan9
+ exit 0 ;;
+ *:TOPS-10:*:*)
+ echo pdp10-unknown-tops10
+ exit 0 ;;
+ *:TENEX:*:*)
+ echo pdp10-unknown-tenex
+ exit 0 ;;
+ KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
+ echo pdp10-dec-tops20
+ exit 0 ;;
+ XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
+ echo pdp10-xkl-tops20
+ exit 0 ;;
+ *:TOPS-20:*:*)
+ echo pdp10-unknown-tops20
+ exit 0 ;;
+ *:ITS:*:*)
+ echo pdp10-unknown-its
+ exit 0 ;;
+ SEI:*:*:SEIUX)
+ echo mips-sei-seiux${UNAME_RELEASE}
+ exit 0 ;;
+ *:DragonFly:*:*)
+ echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+ exit 0 ;;
+ *:*VMS:*:*)
+ UNAME_MACHINE=`(uname -p) 2>/dev/null`
+ case "${UNAME_MACHINE}" in
+ A*) echo alpha-dec-vms && exit 0 ;;
+ I*) echo ia64-dec-vms && exit 0 ;;
+ V*) echo vax-dec-vms && exit 0 ;;
+ esac ;;
+ *:XENIX:*:SysV)
+ echo i386-pc-xenix
+ exit 0 ;;
+esac
+
+#echo '(No uname command or uname output not recognized.)' 1>&2
+#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
+
+eval $set_cc_for_build
+cat >$dummy.c <<EOF
+#ifdef _SEQUENT_
+# include <sys/types.h>
+# include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+ /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed,
+ I don't know.... */
+ printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+ printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+ "4"
+#else
+ ""
+#endif
+ ); exit (0);
+#endif
+#endif
+
+#if defined (__arm) && defined (__acorn) && defined (__unix)
+ printf ("arm-acorn-riscix"); exit (0);
+#endif
+
+#if defined (hp300) && !defined (hpux)
+ printf ("m68k-hp-bsd\n"); exit (0);
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+ int version;
+ version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+ if (version < 4)
+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+ else
+ printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+ exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+ printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+ printf ("ns32k-encore-mach\n"); exit (0);
+#else
+ printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+ printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+ printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+ printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+ struct utsname un;
+
+ uname(&un);
+
+ if (strncmp(un.version, "V2", 2) == 0) {
+ printf ("i386-sequent-ptx2\n"); exit (0);
+ }
+ if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+ printf ("i386-sequent-ptx1\n"); exit (0);
+ }
+ printf ("i386-sequent-ptx\n"); exit (0);
+
+#endif
+
+#if defined (vax)
+# if !defined (ultrix)
+# include <sys/param.h>
+# if defined (BSD)
+# if BSD == 43
+ printf ("vax-dec-bsd4.3\n"); exit (0);
+# else
+# if BSD == 199006
+ printf ("vax-dec-bsd4.3reno\n"); exit (0);
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# endif
+# else
+ printf ("vax-dec-bsd\n"); exit (0);
+# endif
+# else
+ printf ("vax-dec-ultrix\n"); exit (0);
+# endif
+#endif
+
+#if defined (alliant) && defined (i860)
+ printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+ exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
+
+# Apollos put the system type in the environment.
+
+test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
+
+# Convex versions that predate uname can use getsysinfo(1)
+
+if [ -x /usr/convex/getsysinfo ]
+then
+ case `getsysinfo -f cpu_type` in
+ c1*)
+ echo c1-convex-bsd
+ exit 0 ;;
+ c2*)
+ if getsysinfo -f scalar_acc
+ then echo c32-convex-bsd
+ else echo c2-convex-bsd
+ fi
+ exit 0 ;;
+ c34*)
+ echo c34-convex-bsd
+ exit 0 ;;
+ c38*)
+ echo c38-convex-bsd
+ exit 0 ;;
+ c4*)
+ echo c4-convex-bsd
+ exit 0 ;;
+ esac
+fi
+
+cat >&2 <<EOF
+$0: unable to guess system type
+
+This script, last modified $timestamp, has failed to recognize
+the operating system you are using. It is advised that you
+download the most up to date version of the config scripts from
+
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.gue…
+and
+ http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+
+If the version you run ($0) is already up to date, please
+send the following data and any information you think might be
+pertinent to <config-patches(a)gnu.org> in order to provide the needed
+information to handle your system.
+
+config.guess timestamp = $timestamp
+
+uname -m = `(uname -m) 2>/dev/null || echo unknown`
+uname -r = `(uname -r) 2>/dev/null || echo unknown`
+uname -s = `(uname -s) 2>/dev/null || echo unknown`
+uname -v = `(uname -v) 2>/dev/null || echo unknown`
+
+/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
+/bin/uname -X = `(/bin/uname -X) 2>/dev/null`
+
+hostinfo = `(hostinfo) 2>/dev/null`
+/bin/universe = `(/bin/universe) 2>/dev/null`
+/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null`
+/bin/arch = `(/bin/arch) 2>/dev/null`
+/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null`
+/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
+
+UNAME_MACHINE = ${UNAME_MACHINE}
+UNAME_RELEASE = ${UNAME_RELEASE}
+UNAME_SYSTEM = ${UNAME_SYSTEM}
+UNAME_VERSION = ${UNAME_VERSION}
+EOF
+
+exit 1
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "timestamp='"
+# time-stamp-format: "%:y-%02m-%02d"
+# time-stamp-end: "'"
+# End:
Index: 10.244/olena/oln/lrde/ufmt/basic_salembier.hh
--- 10.244/olena/oln/lrde/ufmt/basic_salembier.hh Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/olena/oln/lrde/ufmt/basic_salembier.hh Thu, 03 Aug 2006 15:48:24 +0200 theo (oln/w/51_basic_sale 644)
@@ -0,0 +1,234 @@
+// Copyright (C) 2006 EPITA Research and Development Laboratory
+//
+// This file is part of the Olena Library. This library is free
+// software; you can redistribute it and/or modify it under the terms
+// of the GNU General Public License version 2 as published by the
+// Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this library; see the file COPYING. If not, write to
+// the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
+// MA 02111-1307, USA.
+//
+// As a special exception, you may use this file as part of a free
+// software library without restriction. Specifically, if other files
+// instantiate templates or use macros or inline functions from this
+// file, or you compile this file and link it with other files to
+// produce an executable, this file does not by itself cause the
+// resulting executable to be covered by the GNU General Public
+// License. This exception does not however invalidate any other
+// reasons why the executable file might be covered by the GNU General
+// Public License.
+
+#ifndef OLENA_LRDE_UFMT_BASIC_SALEMBIER_HH
+# define OLENA_LRDE_UFMT_BASIC_SALEMBIER_HH
+
+# include <values.h> // for MAXINT...
+# include <queue>
+# include <map>
+
+# include <oln/level/fill.hh>
+# include <oln/lrde/ufmt/utils.hh>
+
+
+
+namespace oln
+{
+
+ namespace lrde
+ {
+
+ namespace ufmt
+ {
+
+ template <class P>
+ struct hqueue_t
+ {
+ unsigned nvalues;
+
+ hqueue_t()
+ {
+ nvalues = 0;
+ }
+
+ void set_nvalues(unsigned nvalues)
+ {
+ assert(nvalues > 0);
+ this->nvalues = nvalues;
+ q = new std::queue<P>[nvalues];
+ }
+
+ void add(unsigned h, const P& p)
+ {
+ assert(h < nvalues);
+ q[h].push(p);
+ }
+
+ bool empty(unsigned h) const
+ {
+ assert(h < nvalues);
+ return q[h].empty();
+ }
+
+ P first(unsigned h)
+ {
+ assert(h < nvalues);
+ P tmp = q[h].front();
+ q[h].pop();
+ return tmp;
+ }
+
+ unsigned size() const
+ {
+ unsigned s = 0;
+ for (unsigned i = 0; i < nvalues; ++i)
+ s += q[i].size();
+ return s;
+ }
+
+ std::queue<P>* q;
+ };
+
+
+ template <class I>
+ struct basic_salembier
+ {
+ typedef oln_point_type(I) point;
+ typedef oln_value_type(I) value;
+ typedef oln_neighborhood_type(I) Nbh;
+ typedef oln_iter_type(Nbh) niter;
+
+ enum {
+ not_analyzed = MAXINT - 2,
+ in_the_queue = MAXINT - 1
+ };
+
+ const I& f;
+ const Nbh& nbh;
+
+ typename mute<I, int>::ret status;
+
+ size_t nvalues;
+ unsigned* number_nodes;
+ bool* node_at_level;
+ hqueue_t<point> hqueue;
+ int h_min;
+
+ typedef std::pair<unsigned,unsigned> pair_t;
+ std::map<pair_t, pair_t> father;
+
+
+ basic_salembier(const abstract::image<I>& f,
+ const oln_neighborhood_type(I)& nbh) :
+ f(f.exact()),
+ nbh(nbh),
+ // FIXME: status should NOT be initialized here! (but in "init()")
+ status(f.size())
+ {
+ }
+
+
+ void go()
+ {
+ init();
+ flood(h_min);
+ }
+
+
+ void init()
+ {
+ nvalues = uint_nvalues(f);
+ number_nodes = new unsigned[nvalues];
+ node_at_level = new bool[nvalues];
+ for (unsigned i = 0; i < nvalues; ++i)
+ {
+ number_nodes[i] = 0;
+ node_at_level[i] = false;
+ }
+
+ level::fill(status, not_analyzed);
+
+ hqueue.set_nvalues(nvalues);
+ h_min = nvalues;
+ {
+ point p_min;
+ oln_iter_type(I) p(f);
+ for_all(p)
+ if (f[p] < h_min)
+ {
+ h_min = f[p];
+ p_min = p;
+ }
+ hqueue.add(h_min, p_min);
+ }
+ }
+
+
+ int flood(int h)
+ {
+ int m;
+ while (not hqueue.empty(h))
+ {
+ point p = hqueue.first(h);
+ status[p] = number_nodes[h];
+
+ oln_neighb_type(Nbh) q(nbh, p);
+ for_all(q)
+ if (f.hold(q))
+ {
+ if (status[q] == not_analyzed)
+ {
+ hqueue.add(f[q], q);
+ status[q] = in_the_queue;
+ node_at_level[f[q]] = true; // err. 1
+ if (f[q] > f[p])
+ {
+ m = f[q];
+ while (m > h) // err. 2
+ m = flood(m);
+ }
+ }
+ }
+ }
+ number_nodes[h] = number_nodes[h] + 1;
+
+ m = h - 1;
+ while (m >= 0 and node_at_level[m] == false)
+ m = m - 1;
+ int i = number_nodes[h] - 1;
+ if (m >= 0)
+ {
+ int j = number_nodes[m];
+ father[pair_t(i, h)] = pair_t(j, m );
+ }
+ else
+ {
+ father[pair_t(i, h)] = pair_t(i, h);
+ }
+ node_at_level[h] = false;
+ return m;
+ }
+
+
+ unsigned n_level_roots() const
+ {
+ return father.size();
+ }
+
+ }; // end of struct basic_salembier
+
+
+
+ } // end of namespace oln::lrde::ufmt
+
+ } // end of namespace oln::lrde
+
+} // end of namespace oln
+
+
+#endif // ! OLENA_LRDE_UFMT_BASIC_SALEMBIER_HH
Index: 10.244/olena/oln/lrde/ufmt/bin/basic_maxtree.cc
--- 10.244/olena/oln/lrde/ufmt/bin/basic_maxtree.cc Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/olena/oln/lrde/ufmt/bin/basic_maxtree.cc Thu, 03 Aug 2006 15:15:52 +0200 theo (oln/x/0_basic_maxt 644)
@@ -0,0 +1,40 @@
+
+#include <cstdlib>
+
+#include <ntg/int.hh>
+#include <oln/basics2d.hh>
+#include <oln/lrde/ufmt/basic_maxtree.hh>
+#include <oln/lrde/ufmt/log.hh>
+
+
+
+void usage(char* argv[])
+{
+ std::cerr << "usage: " << argv[0] << " input.pgm c" << std::endl;
+ std::cerr << "basic max-tree computation with union-find" << std::endl;
+ // FIXME: get precise description...
+ exit(1);
+}
+
+
+int main(int argc, char* argv[])
+{
+ if (argc != 3)
+ usage(argv);
+
+ using namespace oln;
+ typedef image2d<ntg::int_u8> image_t;
+
+ image_t input = load(argv[1]);
+
+ int c = atoi(argv[2]);
+ if (not (c == 4 or c == 8))
+ usage(argv);
+
+ typedef lrde::ufmt::basic_maxtree<image_t> algorithm_t;
+
+ algorithm_t run(input,
+ c == 4 ? neighb_c4() : neighb_c8());
+ run.go();
+ std::cout << "n level roots = " << n_level_roots(run) << std::endl;
+}
Index: 10.244/olena/oln/lrde/ufmt/bin/basic_salembier.cc
--- 10.244/olena/oln/lrde/ufmt/bin/basic_salembier.cc Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/olena/oln/lrde/ufmt/bin/basic_salembier.cc Thu, 03 Aug 2006 15:42:55 +0200 theo (oln/x/1_basic_sale 644)
@@ -0,0 +1,39 @@
+
+#include <cstdlib>
+
+#include <ntg/int.hh>
+#include <oln/basics2d.hh>
+#include <oln/lrde/ufmt/basic_salembier.hh>
+
+
+
+void usage(char* argv[])
+{
+ std::cerr << "usage: " << argv[0] << " input.pgm c" << std::endl;
+ std::cerr << "basic max-tree computation with salembier's flooding" << std::endl;
+ // FIXME: get precise description...
+ exit(1);
+}
+
+
+int main(int argc, char* argv[])
+{
+ if (argc != 3)
+ usage(argv);
+
+ using namespace oln;
+ typedef image2d<ntg::int_u8> image_t;
+
+ image_t input = load(argv[1]);
+
+ int c = atoi(argv[2]);
+ if (not (c == 4 or c == 8))
+ usage(argv);
+
+ typedef lrde::ufmt::basic_salembier<image_t> algorithm_t;
+
+ algorithm_t run(input,
+ c == 4 ? neighb_c4() : neighb_c8());
+ run.go();
+ std::cout << "n level roots = " << run.n_level_roots() << std::endl;
+}
Index: 10.244/olena/oln/lrde/ufmt/bin/gppo
--- 10.244/olena/oln/lrde/ufmt/bin/gppo Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/olena/oln/lrde/ufmt/bin/gppo Thu, 03 Aug 2006 15:16:50 +0200 theo (oln/x/2_gppo 644)
@@ -0,0 +1 @@
+g++-4.0 -Wall -Werror -ansi -pedantic -Iinc/metalic -Iinc/integre -Iinc/olena -DNDEBUG -O3 $1
Index: 10.244/olena/oln/lrde/ufmt/bin/gpp
--- 10.244/olena/oln/lrde/ufmt/bin/gpp Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/olena/oln/lrde/ufmt/bin/gpp Thu, 03 Aug 2006 12:32:29 +0200 theo (oln/x/3_gpp 644)
@@ -0,0 +1 @@
+g++-4.0 -Wall -Werror -ansi -pedantic -Iinc/metalic -Iinc/integre -Iinc/olena $1
Index: 10.244/olena/oln/lrde/ufmt/basic_maxtree.hh
--- 10.244/olena/oln/lrde/ufmt/basic_maxtree.hh Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/olena/oln/lrde/ufmt/basic_maxtree.hh Thu, 03 Aug 2006 15:32:23 +0200 theo (oln/x/4_basic_maxt 644)
@@ -0,0 +1,185 @@
+// Copyright (C) 2006 EPITA Research and Development Laboratory
+//
+// This file is part of the Olena Library. This library is free
+// software; you can redistribute it and/or modify it under the terms
+// of the GNU General Public License version 2 as published by the
+// Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this library; see the file COPYING. If not, write to
+// the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
+// MA 02111-1307, USA.
+//
+// As a special exception, you may use this file as part of a free
+// software library without restriction. Specifically, if other files
+// instantiate templates or use macros or inline functions from this
+// file, or you compile this file and link it with other files to
+// produce an executable, this file does not by itself cause the
+// resulting executable to be covered by the GNU General Public
+// License. This exception does not however invalidate any other
+// reasons why the executable file might be covered by the GNU General
+// Public License.
+
+#ifndef OLENA_LRDE_UFMT_BASIC_MAXTREE_HH
+# define OLENA_LRDE_UFMT_BASIC_MAXTREE_HH
+
+# include <oln/level/fill.hh>
+# include <oln/lrde/ufmt/utils.hh>
+
+
+
+namespace oln
+{
+
+ namespace lrde
+ {
+
+ namespace ufmt
+ {
+
+
+ // FIXME: doc.
+
+ template <class I>
+ struct basic_maxtree
+ {
+ typedef I image;
+ typedef oln_point_type(I) point;
+ typedef oln_value_type(I) value;
+ typedef oln_neighborhood_type(I) Nbh;
+ typedef oln_iter_type(Nbh) niter;
+
+ // input
+ const I& f;
+ const Nbh& nbh;
+
+ // aux data
+ typename mute<I, point>::ret par;
+ typename mute<I, bool>::ret isproc;
+ std::vector<point> S;
+
+
+ // ctor
+
+ basic_maxtree(const abstract::image<I>& f,
+ const oln_neighborhood_type(I)& nbh)
+ :
+ f(f.exact()),
+ nbh(nbh),
+ // FIXME: par and isproc should NOT be initialized here! (but in "init()")
+ par(f.size()),
+ isproc(f.size())
+ {
+ }
+
+ void go()
+ {
+ init();
+ compute_parent(); // 1st pass
+ extract_maxtree(); // 2nd pass
+ }
+
+ void init()
+ {
+ S = histogram_reverse_sort_p(f);
+ level::fill(isproc, false);
+ }
+
+ void compute_parent()
+ {
+ for (int ip = 0; ip < int(S.size()); ++ip)
+ {
+ point p = S[ip];
+ make_set(p);
+
+ oln_neighb_type(Nbh) n(nbh, p);
+ for_all(n)
+ if (f.hold(n) and isproc[n])
+ do_union(n, p);
+ isproc[p] = true;
+ }
+ }
+
+ void extract_maxtree()
+ {
+ // FIXME: TODO
+ }
+
+ void make_set(const point& x)
+ {
+ par[x] = x;
+ }
+
+ void do_union(const point& n, const point& p)
+ {
+ point r = find_tree_root(n);
+ if (r != p)
+ par[r] = p;
+ }
+
+ bool is_tree_root(const point& x) const
+ {
+ return par[x] == x;
+ }
+
+ bool is_level_root(const point& x) const
+ {
+ return is_tree_root(x) or f[par[x]] < f[x];
+ }
+
+ point find_level_root(const point& x)
+ {
+ if (is_level_root(x))
+ return x;
+ else
+ return par[x] = find_level_root(par[x]);
+ }
+
+ point find_tree_root(point x)
+ {
+ while (not is_tree_root(x))
+ x = find_level_root(par[x]);
+ return x;
+ }
+
+
+
+ // uniformized interface
+
+ const point& parent_(const point& p) const {
+ return par[p];
+ }
+ const value& f_(const point& p) const {
+ return f[p];
+ }
+ const I& f_() const {
+ return f;
+ }
+ bool is_tree_root_(const point& p) const {
+ return is_tree_root(p);
+ }
+ bool is_level_root_(const point& p) const {
+ return is_level_root(p);
+ }
+
+ // end of uniformized interface
+
+
+
+ }; // end of class basic_maxtree
+
+
+
+ } // end of namespace oln::lrde::ufmt
+
+ } // end of namespace oln::lrde
+
+} // end of namespace oln
+
+
+#endif // ! OLENA_LRDE_UFMT_BASIC_MAXTREE_HH
Index: 10.244/olena/oln/lrde/ufmt/log.hh
--- 10.244/olena/oln/lrde/ufmt/log.hh Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/olena/oln/lrde/ufmt/log.hh Thu, 03 Aug 2006 15:08:01 +0200 theo (oln/x/5_log.hh 644)
@@ -0,0 +1,64 @@
+// Copyright (C) 2006 EPITA Research and Development Laboratory
+//
+// This file is part of the Olena Library. This library is free
+// software; you can redistribute it and/or modify it under the terms
+// of the GNU General Public License version 2 as published by the
+// Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this library; see the file COPYING. If not, write to
+// the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
+// MA 02111-1307, USA.
+//
+// As a special exception, you may use this file as part of a free
+// software library without restriction. Specifically, if other files
+// instantiate templates or use macros or inline functions from this
+// file, or you compile this file and link it with other files to
+// produce an executable, this file does not by itself cause the
+// resulting executable to be covered by the GNU General Public
+// License. This exception does not however invalidate any other
+// reasons why the executable file might be covered by the GNU General
+// Public License.
+
+#ifndef OLENA_LRDE_UFMT_LOG_HH
+# define OLENA_LRDE_UFMT_LOG_HH
+
+
+
+namespace oln
+{
+
+ namespace lrde
+ {
+
+ namespace ufmt
+ {
+
+
+ template <class Algo>
+ unsigned n_level_roots(const Algo& algo)
+ {
+ typedef typename Algo::image I;
+ unsigned count = 0;
+ oln_iter_type(I) p(algo.f_());
+ for_all(p)
+ if (algo.is_level_root_(p))
+ ++count;
+ return count;
+ }
+
+
+
+ } // end of namespace oln::lrde::ufmt
+
+ } // end of namespace oln::lrde
+
+} // end of namespace oln
+
+
+#endif // ! OLENA_LRDE_UFMT_LOG_HH
Index: 10.244/olena/oln/lrde/ufmt/img/lena64.pgm
--- 10.244/olena/oln/lrde/ufmt/img/lena64.pgm Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/olena/oln/lrde/ufmt/img/lena64.pgm Thu, 03 Aug 2006 11:42:20 +0200 theo (oln/x/6_lena64.pgm 644)
@@ -0,0 +1,5 @@
+P5
+# CREATOR: XV Version 3.10a Rev: 12/29/94 (PNG patch 1.2)
+64 64
+255
+¢€€«bgmmmmmzwiÑÝirzwzzr¢«¬b_iggmwzzrgÊ×mwwwzz_¢€€b[ibgirwrmr×ÚiwzrzzQ+¢€€b_mgiizzzzzzmm¢ÅÝŸmwzwI,+««bbgmiiwzzzzzzri¢¢ÊÝrwV7,3€¢€€€¢_[ggbirwzzrzzmmŽÝÑirI+337¢«€€__gggrmzzz¢¬ŽÅrzrmÑárM+3773¢«€€[Vgbimwz«Ÿ«Ÿ«zzzzwwrÝáQ+,3377€«[«¢_Qbbgiwrzwzzzz€€žŸÅÅÊmrrrmiiÑá+373+,3¬¢gb«¢QVggggrrwzmmzzz¢°ŸŸžÂŸÊrbrmrg%+33,3,3¢Q_€€VQ[igimzzwzzirwzw«¬°ŽžŸÊÚ×á[gbi_,+,3+33Q[[[b««[Q_igiiwzzzimzwz¢€€¬ÑÑÑÊÑ×_b_FVm3,7+7,F[iV[_¢€[[bbibwrwmrwrzŽ¬ÊÅÏÏÑÊÏ×bIVI+%3=,97=VQ_[b€€b[_gbgiwwrirzzÅÊŸÂÂÏÏÑÏ××rQM%I,+773+=9€[_[_€¢[V_bgmmrgmizrž°ŸžÊÅÊÊÏÊÏ×á=Q+%VÚ¬r,73373%V[[[€¢MI_bggmmÂ_rrmii¬°¬ŸŽÅÅÂÊÏÏÏÊÚ¢zQ%žÝáÑ,93333w¢¢[___«€QQb_gmri¬gmrzzm¢«Žž¬ŸÂžŸÅÅÊÊÊÅÊ×w7Ñ¢×ÊÑá+7,,77¢¢gbbg€«[Vgggmm__imrrg°°Ž°žŸŸŸÊŽÅÅÅÅÏÅÅÏÊÅ×Ý37,3 ¢bggg««_[bb_gm€bggri¬¬«°¬¬ÂŸÂŸžŸ«ÑžÏÅÅÏÅÚ79,,[__bb«¬[V_b_gi×rgmm¢«°¬Ž€Ž°°ÂŽ€ŽÊŸÊÏÊÅÊŸÂ×,+F7%¢b_bb¬¬VV___bbݬr__z¢««¢€«°€€¬«°ÅÊŸÅÊÊÏzÏ%B73¢__bi¬«b[_bbb_ן[ww««¬žŸŸŽÂÅÊÅÑ,979¢bbgi«¬[Q_gbbVÚŽwzwmzzb3¢¢ÅÂÅÂÊÅÊÏÏV_Ñ%,%3z€¢bibi«¬_VbbbibžrrzmibMiV_7 žÅÂÂÂÂÅÊÊVbbÅ3,33+€¢iiim««[Q_giibMž[ww3B7w+9%,¢ÅŽžžžŸÂÅi€°,,9%Ir€€¢gggg¬«_Q___bm_Ê¢zmmM==I=9I, zÅŸŽ°¬žŸ[rm«ž,,77+,€€¢¢ii__¬°¢[Q[_bbim[Ågw=Q7, 7M9_žÂžž°ŽžÅI[zÂ,+93+7I€¢€€¢¢mgg[°¬_M_g_bir[ÚmrgwM37FI,37Q€ŽŽ«¬€ÅÅÊžQmz+,97,,¢¢¢¢¢gib_¬¬¢bQ[bbgrrbÚriwVBV+3IF, g€€Ž«°€žÅÅÑÏb,wM,7B337¢€¢€¢ig__«°¢b[bigirwwÅm9,F+,Ii7 z«Ž€ž€€«ÂÅÏÑ×+_b39B,9z¢¢gbb[«Ž_VbgbirwzbV%==99%9+w¢žž€¬°žÂÅÊÑ¢37999,,¢€€bgbV¬¬¢_Vbgggrz¬%žFb+ 99+F,wŽÂÂwF¬¬ÂŸÅŸi+3«9=39F«¢_gbQ°°¢bVbgbir€[3+bm3_++ ¬ŽÊgQiVzŸI=F,°,B,7__[M¬°¢gV_b_QŽ,wi9+g3++«ÊÂF=%¬FmÏQ,¢+,,žB=3+b_[F°Ž¢i[bgm9«Ï,g3Qg7==% 9ŸÂrbgÊÝM¬773«V373¢¢g_QF¬Ž«i[mmQ+i+ib3+7b°ÅmzwáQ[,MQ,7z¢žŸb_V=¬ž€i[imr7iwi3V«3+3mŸÅVz«¢««ÝŽr799++ŽÅžQII=°Ž€iVmi_=IM=,+__g, mž+iz¬Ž°€Ý«w,VB=+¢¬ÂÅÂÅIII7¬¬€i[i,M7=93%,_,_€Fb«¬«Ê¢i7_i9[ŸÂÊÏQMB,«°€gMwwQV[_+,79V7 rÊ+bb°žI3MI%ŽŸŸÑÏÏ[MF+«°°rgV_Fi¢,3++r,°M+i_zw¬€%3M%%ÅÂÊÏÏÑMMFI«¬«mQgbV+_Fr%7mImb9,riw°i79Q%%ÅÊÏÏÑÑIIFV€°«mViVB7I_r_=3€QÂ3,,mmŽÂ7,9B%¢i¬ÂÏÏÑÑÑI=BM€°¬rQb9gI9MQ[mÂi+73Fb[€Ê¬z,3IB%¬žÊÑÑÏ××99=Q¬°¬rw,%B9bi,ÑV33B7QVMzimrmw,93VF3Ÿ×ÑÑ×××997_«Ž¬zMi=3ib=rz_,993FI9mwzi,3FmB9ÏÑÑ××ÑÏ,3,b°°«mb_F37mQwVIiž33=79B7FViz7,7,[BQzÑ×Ú×ÑÑÑ3,3i°¬«mQVb7+MBib[77373,73BMFgz€€«B,7B7iI3rÚ×××ÑÏÏ+73g«°¬ig3MF33BVgzz337,77+=BB7=Bm€+9737gI7wÝÑ×ÑÏžB79+I««€Q%bQ9=+m_«397,3,737V°Êi3,7rFI¢rmmmz×ÏÏÅ%=_97m«¬ŸmŽ%+ wiI7bm«I7,377377[zzžÅÊÏ_%mIF°wib_gÏÑÏ,BQr7w€««ÂV+%_IF=V9bmbB3B7=3I9Qw¢ŽŸÂÊÑžV9=rmw°ÑÑ€9[b_F¢Im¬¬«€%+F+M9_mIbrMr,99B,IiVm¢¬ŽžÊÏÚ3=zÏ×Ï[b[m[ g«br¬¬«i%,,+rQ,=[wVM%97=3ViI€¬žÅÏ×Ú+ °×מ[_r[g [«[m°°°973%+=,Mr3iz¬+B+93bw_¢¬ŽÂÏÑ× ÂÏÚ×m[igbb M°mb°°¬zF,,[V3,++I[3M93Fzw[«°ŸÊÏÑÝ zÑÊןigr_g[ ,¬r_«Ž¬+,,7F=F [Vzg+%BIB,Vgb¢¬ŸÅÑ××3ÑÊ×rVb_b[+%€[«°«¢7+B+IF+,,[VQ«3,+9mz7z€žÂÏÑÑmrÏÑr_bMi[_%+¬Q€°°Q9,F,V++B=9Q%%+3MwzQ€¬ÂÊÑ×ÚIM[iÚžbQIg[g[37€¢[€°°MF%97+9=+3bg[+3, 9ir+z¢¬žÅÏ××_i[=,9¢×z9Mi[[b9Vb€¬b«°Žb,+,=,M9,=9=,% ,Qr+g€ŽÂÊÑ×ImgVF9Åž€3MQ_Mb_M7r«b€°ŽV%,9M,bb,,=VM+,%M93i«žÅÑÑ°_g_V[ÅzBQViFVi_I3M¬b¢Ž°=,+I=37m%w[M7,+7Vbw€ŽŸÏÑÑVgmwrg[bQgM=miIB,9Ïg¢Ž°VB=7B33r3=mV++Mmwz«°ŸÏÏ×Igiwrmz_bQIiV39
\ No newline at end of file
Index: 10.244/olena/oln/lrde/ufmt/img/lena6.pgm
--- 10.244/olena/oln/lrde/ufmt/img/lena6.pgm Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/olena/oln/lrde/ufmt/img/lena6.pgm Thu, 03 Aug 2006 11:42:16 +0200 theo (oln/x/7_lena6.pgm 644)
@@ -0,0 +1,6 @@
+P5
+# CREATOR: XV Version 3.10a Rev: 12/29/94 (PNG patch 1.2)
+# CREATOR: XV Version 3.10a Rev: 12/29/94 (PNG patch 1.2)
+6 6
+255
+BV+3IF,F+,Ii==99%9 99+F,m3_++ +g3++
\ No newline at end of file
Index: 10.244/olena/oln/lrde/ufmt/utils.hh
--- 10.244/olena/oln/lrde/ufmt/utils.hh Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/olena/oln/lrde/ufmt/utils.hh Thu, 03 Aug 2006 15:21:39 +0200 theo (oln/x/8_utils.hh 644)
@@ -0,0 +1,201 @@
+// Copyright (C) 2006 EPITA Research and Development Laboratory
+//
+// This file is part of the Olena Library. This library is free
+// software; you can redistribute it and/or modify it under the terms
+// of the GNU General Public License version 2 as published by the
+// Free Software Foundation.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this library; see the file COPYING. If not, write to
+// the Free Software Foundation, 59 Temple Place - Suite 330, Boston,
+// MA 02111-1307, USA.
+//
+// As a special exception, you may use this file as part of a free
+// software library without restriction. Specifically, if other files
+// instantiate templates or use macros or inline functions from this
+// file, or you compile this file and link it with other files to
+// produce an executable, this file does not by itself cause the
+// resulting executable to be covered by the GNU General Public
+// License. This exception does not however invalidate any other
+// reasons why the executable file might be covered by the GNU General
+// Public License.
+
+#ifndef OLENA_LRDE_UFMT_UTILS_HH
+# define OLENA_LRDE_UFMT_UTILS_HH
+
+# include <ntg/real/int_u.hh>
+# include <vector>
+
+
+namespace oln
+{
+
+
+ // Fwd decls.
+ struct neighborhood1d;
+ struct neighborhood2d;
+ struct neighborhood3d;
+ template <class T, class E> class image1d;
+ template <class T, class E> class image2d;
+ template <class T, class E> class image3d;
+ // end of fwd decls.
+
+
+
+ namespace lrde
+ {
+
+ namespace ufmt
+ {
+
+
+ // Get the number of possible different unsigned integer values
+ // of the input image data; for instance, when 'input' contains
+ // int_u8 data, the result is 256.
+
+ template <class I>
+ size_t uint_nvalues(const abstract::image<I>& input)
+ {
+ typedef oln_value_type(I) T;
+ typedef typename ntg_is_a(T, ntg::unsigned_integer)::ensure_type ensure_type;
+ return size_t(ntg_max_val(T)) + 1;
+ }
+
+ template <class T>
+ size_t uint_nvalues()
+ {
+ typedef typename ntg_is_a(T, ntg::unsigned_integer)::ensure_type ensure_type;
+ return size_t(ntg_max_val(T)) + 1;
+ }
+
+
+ // Compute the input image histogram up to the Nth point of the
+ // input image.
+
+ template <class I>
+ std::vector<size_t> histogram(const abstract::image<I>& input,
+ size_t N)
+ {
+ unsigned nvalues = uint_nvalues(input);
+ std::vector<size_t> H(nvalues, 0);
+ size_t count = 0;
+ oln_iter_type(I) p(input);
+ for_all(p)
+ {
+ ++H[input[p]];
+ if (++count == N)
+ return H;
+ }
+ return H;
+ }
+
+
+ // Compute the input image histogram.
+
+ template <class I>
+ std::vector<size_t> histogram(const abstract::image<I>& input)
+ {
+ return histogram(input, input.npoints());
+ }
+
+
+ // FIXME: doc.
+
+ template <class I>
+ std::vector<oln_point_type(I)>
+ histogram_reverse_sort_p(const abstract::image<I>& input,
+ size_t N,
+ std::vector<size_t>& H)
+ {
+ H = histogram(input, N);
+
+ // preparing output data
+
+ unsigned nvalues = uint_nvalues(input);
+ std::vector<int> loc(nvalues);
+ loc[nvalues - 1] = 0;
+ for (int l = int(nvalues) - 2; l >= 0; --l)
+ loc[l] = loc[l+1] + H[l+1];
+
+ std::vector<oln_point_type(I)> vec(N);
+
+ // storing output data
+
+ oln_iter_type(I) p(input);
+ size_t count = 0;
+ for_all(p)
+ {
+ vec[loc[input[p]]++] = p;
+ if (++count == N)
+ return vec;
+ }
+ return vec;
+ }
+
+
+ template <class I>
+ std::vector<oln_point_type(I)>
+ histogram_reverse_sort_p(const abstract::image<I>& input,
+ std::vector<size_t>& H)
+ {
+ return histogram_reverse_sort_p(input, input.npoints(), H);
+ }
+
+
+ template <class I>
+ std::vector<oln_point_type(I)>
+ histogram_reverse_sort_p(const abstract::image<I>& input,
+ size_t N)
+ {
+ std::vector<size_t> H;
+ return histogram_reverse_sort_p(input, N, H);
+ }
+
+
+ template <class I>
+ std::vector<oln_point_type(I)>
+ histogram_reverse_sort_p(const abstract::image<I>& input)
+ {
+ std::vector<size_t> H;
+ return histogram_reverse_sort_p(input, input.npoints(), H);
+ }
+
+
+ // Extra traits to get the classical neighborhood types from
+ // classical image types.
+
+ namespace internal {
+
+ template <class I>
+ struct neighborhood;
+
+ template <class T>
+ struct neighborhood < image1d<T> > { typedef neighborhood1d ret; };
+ template <class T>
+ struct neighborhood < image2d<T> > { typedef neighborhood2d ret; };
+ template <class T>
+ struct neighborhood < image3d<T> > { typedef neighborhood3d ret; };
+
+ } // end of namespace oln::lrde::ufmt::internal
+
+
+
+ } // end of namespace oln::lrde::ufmt
+
+ } // end of namespace oln::lrde
+
+} // end of namespace oln
+
+
+
+# define oln_neighborhood_type(I) \
+typename oln::lrde::ufmt::internal::neighborhood<I>::ret
+
+
+
+#endif // ! OLENA_LRDE_UFMT_UTILS_HH
Index: 10.244/doc/ref/exdoc.mk
--- 10.244/doc/ref/exdoc.mk Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/doc/ref/exdoc.mk Fri, 28 Jul 2006 11:45:23 +0200 theo (oln/x/9_exdoc.mk 644)
@@ -0,0 +1,56 @@
+%.dot: %.file
+ cp $$(cat $<) $@
+
+%.texi: %.cmd
+## Eval the cmd to preserve embedded redirections.
+ eval $$(cat $<) >$*.out 2>$*.err; \
+ echo $$? >$*.sta
+ rm -f $@
+ echo '@example' >> $@
+ echo "$$ @kbd{$$(cat $<)}" >> $@
+ if test -s $*.err; then \
+ sed -n -e 's/\([{@}]\)/@\1/g' \
+ -e '/./s/.*/@error{}&/p' $*.err >> $@;\
+ fi
+ if test -s $*.out; then \
+ expand $*.out | \
+ sed -e 's/\([{@}]\)/@\1/g' \
+ -e "s/é/@'e/g" \
+ -e 's/è/@`e/g' \
+ -e 's/ê/@^e/g' \
+ -e 's/ë/@"e/g' \
+ -e 's/î/@^i/g' \
+ -e 's/ï/@"i/g' \
+ -e 's/ô/@^o/g' \
+ >>$@;\
+ fi
+## Display the exit status only if not 0, as it confuses the
+## students to see so many `=> 0'. But, if there is nothing output
+## at all, it is even more confusing, so output `=> 0' only when
+## needed.
+ if test ! -e $@ \
+ || test $$(cat $*.sta) -ne 0; then \
+ sed 's/.*/@result{}&/' $*.sta >> $@; \
+ fi
+ echo "@strong{Example $*}: @kbd{$$(cat $<)}" >> $@
+ echo '@end example' >> $@
+
+## Once for PDF.
+## ratio = 2 makes it wider.
+## size (in Inches) makes it fit into A4.
+%.eps: %.dot
+ dot -Gratio=2 -Gsize=8,8 -Tps2 $*.dot -o $*.ps
+ ps2epsi $*.ps $*.eps
+
+%.pdf: %.eps
+ epstopdf $*.eps -o $*.pdf
+
+## Another for HTML (JPG), using natural size.
+%.jpg: %.dot
+ dot -Tps2 $*.dot -o $*.j.ps
+ ps2epsi $*.j.ps $*.j.eps
+ convert $*.j.eps $*.jpg
+
+## And the text...
+%.txt: %.dot
+ cp $< $@
Index: 10.244/doc/ref/doxygen.config
--- 10.244/doc/ref/doxygen.config Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/doc/ref/doxygen.config Fri, 28 Jul 2006 11:45:23 +0200 theo (oln/x/10_doxygen.co 644)
@@ -0,0 +1,210 @@
+# Doxyfile 1.3.2
+
+#---------------------------------------------------------------------------
+# General configuration options
+#---------------------------------------------------------------------------
+PROJECT_NAME = Olena
+PROJECT_NUMBER = 0.10
+OUTPUT_DIRECTORY = .
+OUTPUT_LANGUAGE = English
+USE_WINDOWS_ENCODING = NO
+EXTRACT_ALL = NO
+EXTRACT_PRIVATE = NO
+EXTRACT_STATIC = YES
+EXTRACT_LOCAL_CLASSES = NO
+HIDE_UNDOC_MEMBERS = NO
+HIDE_UNDOC_CLASSES = NO
+HIDE_FRIEND_COMPOUNDS = NO
+HIDE_IN_BODY_DOCS = NO
+BRIEF_MEMBER_DESC = YES
+REPEAT_BRIEF = YES
+ALWAYS_DETAILED_SEC = NO
+INLINE_INHERITED_MEMB = NO
+FULL_PATH_NAMES = NO
+STRIP_FROM_PATH =
+INTERNAL_DOCS = NO
+CASE_SENSE_NAMES = NO
+SHORT_NAMES = NO
+HIDE_SCOPE_NAMES = NO
+SHOW_INCLUDE_FILES = YES
+JAVADOC_AUTOBRIEF = NO
+MULTILINE_CPP_IS_BRIEF = NO
+DETAILS_AT_TOP = NO
+INHERIT_DOCS = YES
+INLINE_INFO = YES
+SORT_MEMBER_DOCS = YES
+DISTRIBUTE_GROUP_DOC = NO
+TAB_SIZE = 8
+GENERATE_TODOLIST = YES
+GENERATE_TESTLIST = YES
+GENERATE_BUGLIST = YES
+GENERATE_DEPRECATEDLIST= YES
+ALIASES = pouetcaption=
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 30
+OPTIMIZE_OUTPUT_FOR_C = NO
+OPTIMIZE_OUTPUT_JAVA = NO
+SHOW_USED_FILES = YES
+#---------------------------------------------------------------------------
+# configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+QUIET = NO
+WARNINGS = YES
+WARN_IF_UNDOCUMENTED = YES
+WARN_IF_DOC_ERROR = YES
+WARN_FORMAT = "$file:$line: $text"
+WARN_LOGFILE =
+#---------------------------------------------------------------------------
+# configuration options related to the input files
+#---------------------------------------------------------------------------
+INPUT = ../../olena \
+ ../../integre \
+ ../../metalic
+FILE_PATTERNS = *.hh \
+ *.hxx \
+ *.cc
+RECURSIVE = YES
+EXCLUDE = ../../doc \
+ ../../olena/tests \
+ ../../integre/tests \
+ ../../metalic/tests
+EXCLUDE_SYMLINKS = NO
+EXCLUDE_PATTERNS =
+EXAMPLE_PATH =
+EXAMPLE_PATTERNS =
+EXAMPLE_RECURSIVE = NO
+IMAGE_PATH = ../..//doc/ref/img/
+INPUT_FILTER =
+FILTER_SOURCE_FILES = NO
+#---------------------------------------------------------------------------
+# configuration options related to source browsing
+#---------------------------------------------------------------------------
+SOURCE_BROWSER = YES
+INLINE_SOURCES = YES
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = YES
+REFERENCES_RELATION = YES
+VERBATIM_HEADERS = YES
+#---------------------------------------------------------------------------
+# configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+ALPHABETICAL_INDEX = YES
+COLS_IN_ALPHA_INDEX = 5
+IGNORE_PREFIX =
+#---------------------------------------------------------------------------
+# configuration options related to the HTML output
+#---------------------------------------------------------------------------
+GENERATE_HTML = YES
+HTML_OUTPUT = html
+HTML_FILE_EXTENSION = .html
+HTML_HEADER =
+HTML_FOOTER =
+HTML_STYLESHEET =
+HTML_ALIGN_MEMBERS = YES
+GENERATE_HTMLHELP = NO
+CHM_FILE =
+HHC_LOCATION =
+GENERATE_CHI = NO
+BINARY_TOC = NO
+TOC_EXPAND = NO
+DISABLE_INDEX = NO
+ENUM_VALUES_PER_LINE = 4
+GENERATE_TREEVIEW = YES
+TREEVIEW_WIDTH = 250
+#---------------------------------------------------------------------------
+# configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+GENERATE_LATEX = YES
+LATEX_OUTPUT = latex
+LATEX_CMD_NAME = latex
+MAKEINDEX_CMD_NAME = makeindex
+COMPACT_LATEX = NO
+PAPER_TYPE = a4wide
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = YES
+USE_PDFLATEX = YES
+LATEX_BATCHMODE = YES
+LATEX_HIDE_INDICES = NO
+#---------------------------------------------------------------------------
+# configuration options related to the RTF output
+#---------------------------------------------------------------------------
+GENERATE_RTF = NO
+RTF_OUTPUT = rtf
+COMPACT_RTF = NO
+RTF_HYPERLINKS = NO
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
+#---------------------------------------------------------------------------
+# configuration options related to the man page output
+#---------------------------------------------------------------------------
+GENERATE_MAN = NO
+MAN_OUTPUT = man
+MAN_EXTENSION = .3
+MAN_LINKS = NO
+#---------------------------------------------------------------------------
+# configuration options related to the XML output
+#---------------------------------------------------------------------------
+GENERATE_XML = NO
+XML_OUTPUT = xml
+XML_SCHEMA =
+XML_DTD =
+#---------------------------------------------------------------------------
+# configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+GENERATE_AUTOGEN_DEF = NO
+#---------------------------------------------------------------------------
+# configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+GENERATE_PERLMOD = NO
+PERLMOD_LATEX = NO
+PERLMOD_PRETTY = YES
+PERLMOD_MAKEVAR_PREFIX =
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+ENABLE_PREPROCESSING = YES
+MACRO_EXPANSION = YES
+EXPAND_ONLY_PREDEF = NO
+SEARCH_INCLUDES = YES
+INCLUDE_PATH = ../../olena/ \
+ ../../integre/ \
+ ../../metalic/
+INCLUDE_FILE_PATTERNS =
+PREDEFINED =
+EXPAND_AS_DEFINED =
+SKIP_FUNCTION_MACROS = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to external references
+#---------------------------------------------------------------------------
+TAGFILES =
+GENERATE_TAGFILE =
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = YES
+PERL_PATH = /usr/bin/perl
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+CLASS_DIAGRAMS = YES
+HIDE_UNDOC_RELATIONS = NO
+HAVE_DOT = YES
+CLASS_GRAPH = YES
+COLLABORATION_GRAPH = YES
+UML_LOOK = YES
+TEMPLATE_RELATIONS = YES
+INCLUDE_GRAPH = YES
+INCLUDED_BY_GRAPH = YES
+CALL_GRAPH = NO
+GRAPHICAL_HIERARCHY = YES
+DOT_IMAGE_FORMAT = png
+DOT_PATH =
+DOTFILE_DIRS =
+MAX_DOT_GRAPH_WIDTH = 1024
+MAX_DOT_GRAPH_HEIGHT = 1024
+MAX_DOT_GRAPH_DEPTH = 0
+GENERATE_LEGEND = YES
+DOT_CLEANUP = YES
+#---------------------------------------------------------------------------
+# Configuration::addtions related to the search engine
+#---------------------------------------------------------------------------
+SEARCHENGINE = YES
Index: 10.244/doc/ref/out/exdoc.config
--- 10.244/doc/ref/out/exdoc.config Thu, 03 Aug 2006 16:06:12 +0200 theo ()
+++ 10.244(w)/doc/ref/out/exdoc.config Fri, 28 Jul 2006 11:45:23 +0200 theo (oln/x/11_exdoc.conf 644)
@@ -0,0 +1,13 @@
+[ENTRY]
+ COMMAND_PREFIX = \\ # In Doxygen, commands begin with a `\'
+ TAG_OPEN = code
+ TAG_CLOSE = endcode
+ CAPTIONS = cxx # We want to run cxx on the extracted files (see line below)
+ ALIAS cxx = g++ # Here, cxx means g++ but you can choose other compilers
+ # FIXME: we should write the compilation line in the source file (for libs).
+ OPTIONS = -O3 -finline-limit-1500 -Wall -pedantic -Werror -I../../../integre -I../../..//olena -I../../../olena -I../../../metalic -I../../../ $1 -o $2 -DIMG_OUT=\"../img/\" -DIMG_IN=\"../../../olena/img/\" -DHAVE_CONFIG_H -lz -lfftw -lrfftw # tell how to use the soft, i.e. where to put input and output arguments (default if not overriden) ($1: input, $2: output) FIXME: $* should have explicit name, chek flags
+ OUT = out # FIXME: should be obsolete
+ EXT = cc # Extension of generated file
+ STD_OUT_EXT = std # Extension of generated file standard output
+ ERR_OUT_EXT = err # Extension of generated file error output
+ COMMENT_STYLE = \*\* # begining of comment line
18 years, 4 months
- 1
- 0