Changeset 14687

Timestamp:

04/11/04 22:45:14 (5 years ago)

Author:

patrickh

Message:

We now depend on an installed version of GMTL rather than one acquired
via cvs-gather.

Files:

• trunk/juggler/autogen.sh (modified) (1 diff)
• trunk/juggler/external/Makefile.in (modified) (2 diffs)
• trunk/juggler/external/configure.in (modified) (4 diffs)

trunk/juggler/autogen.sh

@@ -8 +8 @@
-: ${DPP_PATH=`pwd`/Doozer++}
-: ${MACRO_PATH=`pwd`/macros}
-macros.GGT
+external/macros
-
-if [ -n "$DPP_PATH" ]; then

trunk/juggler/external/Makefile.in

@@ -80 +80 @@
-endif
-
-links-gmtl:
-        cd $(instlinks)/include && $(RM_LN) ./gmtl &&                   \
-          $(LN_S) $(EXTROOT_ABS)/GMTL/gmtl ./
-
-links-doozer:
-        $(SHELL) $(MKINSTALLDIRS) $(instlinks)/share
@@ -97 +93 @@
-          done
-endif
-
-install-gmtl:
-        @$(MAKE) DIRS="GMTL/gmtl" generic-header-install
-
-install-doozer:

trunk/juggler/external/configure.in

@@ -58 +58 @@
-cd "$topdir"
-
-# Enable/disable installation of GMTL from juggler/external.
-AC_ARG_ENABLE([gmtl-install],
-              [  --disable-gmtl-install
-                          Disable installation of
-                          juggler/external/GMTL],
-              [install_gmtl="$enableval"], [install_gmtl='yes'])
-
-# Enable/disable installation of Doozer from juggler/external.
-AC_ARG_ENABLE([doozer-install],
@@ -71 +64 @@
-                          juggler/external/Doozer],
-              [install_doozer="$enableval"], [install_doozer='yes'])
-
-# Name the path to a GMTL installation.  This defaults to juggler/external/GMTL
-# (using an absolute path).
-AC_ARG_WITH([gmtl-prefix],
-            [  --with-gmtl-prefix=<PATH>
-                          GMTL installation directory],
-            [GMTL_ROOT="$withval"],
-            [GMTL_ROOT="$JUGGLERROOT_ABS/external/GMTL"])
-
-# Name the path to a Doozer installation.  This defaults to
@@ -107 +92 @@
-# Deal with installing our fun external software.
-# -----------------------------------------------------------------------------
-if test "x$GMTL_ROOT" != "x$JUGGLERROOT_ABS/external/GMTL" ; then
-   install_gmtl='no'
-fi
-
-if test "x$DOOZER_ROOT" != "x$JUGGLERROOT_ABS/external/Doozer" ; then
-   install_doozer='no'
@@ -116 +97 @@
-
-TARGETS=''
-
-if test "x$install_gmtl" != "xno" ; then
-   TARGETS="$TARGETS gmtl"
-fi
-
-if test "x$install_doozer" != "xno" ; then