Changeset 19275

Timestamp:

08/25/06 10:44:44 (2 years ago)

Author:

patrick

Message:

Doozer is now treated as an external dependency that must be installed.
This makes it the same as all the other dependencies (Boost, GMTL, et. al.).
This is done to help out Flagpoll and the use of Doozer in VR Juggler
application makefiles. Note that Doozer 2.1.1 is the minimum required
version.

Files:

• juggler/trunk/external/Doozer (deleted)
• juggler/trunk/external/Makefile.in (modified) (3 diffs)
• juggler/trunk/external/configure.ac (modified) (2 diffs)

juggler/trunk/external/Makefile.in

@@ -73 +73 @@
-BOOST_INCLUDES=         @BOOST_INCLUDES@
-CPPDOM_ROOT=            @CPPDOM_ROOT@
+DOOZER_ROOT=            @DOOZER_ROOT@
-GMTL_ROOT=              @GMTL_ROOT@
-GMTL_INC_DIR=           @GMTL_INC_DIR@
@@ -304 +305 @@
-links-doozer:
-        $(SHELL) $(MKINSTALLDIRS) $(instlinks)/share
+        $(SHELL) $(MKINSTALLDIRS) $(instlinks)/share/flagpoll
-        cd $(instlinks)/share && $(RM_LN) ./Doozer &&                   \
-
+
+
+
-
-install install-debug install-optim install-dbg install-dbg-dso         \
@@ -535 +539 @@
-install-doozer:
-        @$(PERL) $(scriptdir)/install-dir.pl -m $(FILE_PERMS)           \
-EXTROOT_ABS)/Doozer    
+DOOZER_ROOT)/share/Doozer
-          -o $(datadir)/Doozer
+        $(INSTALL) $(GROUP_OPT_UNIX) -m $(FILE_PERMS)                   \
+          $(DOOZER_ROOT)/share/flagpoll/doozer.fpc                      \
+          $(datadir)/share/flagpoll
-
-generic-header-install:

juggler/trunk/external/configure.ac

@@ -92 +92 @@
-                          Path to C++ ORB libraries],
-            [CXX_ORB_LIB_DIR="$withval"], [CXX_ORB_LIB_DIR='none'])
+
+AC_ARG_WITH(doozer,
+            [  --with-doozer=<PATH>    Doozer installation directory   [default=/usr/local]],
+            [DOOZER_ROOT="$withval"], [DOOZER_ROOT='/usr/local'])
-
-AC_ARG_WITH(gmtl,
@@ -299 +303 @@
-AC_SUBST(BOOST_INCLUDES)
-AC_SUBST(CPPDOM_ROOT)
+AC_SUBST(DOOZER_ROOT)
-AC_SUBST(GMTL_ROOT)
-AC_SUBST(GMTL_INC_DIR)