* itk/configure.ac: Add missing bits to actually fill in

        itkConfig.sh.
        * itk/itkConfig.sh.in: Rewrite substitution values so that
        this file looks more like itcl/itclConfig.sh.in.
        * itk/configure: Regenerated.

diff --git a/itcl/ChangeLog b/itcl/ChangeLog
index 2f47b29..37ce209 100644 (file)
--- a/itcl/ChangeLog
+++ b/itcl/ChangeLog
@@ -1,3 +1,11 @@
+2008-08-02  Keith Seitz  <keiths@redhat.com>
+
+       * itk/configure.ac: Add missing bits to actually fill in
+       itkConfig.sh.
+       * itk/itkConfig.sh.in: Rewrite substitution values so that
+       this file looks more like itcl/itclConfig.sh.in.
+       * itk/configure: Regenerated.
+
 2008-07-23  Keith Seitz  <keiths@redhat.com>
 
        Import of Itcl 3.3.

diff --git a/itcl/itk/configure b/itcl/itk/configure
index ba049ec..7a9c8c9 100755 (executable)
--- a/itcl/itk/configure
+++ b/itcl/itk/configure
@@ -753,9 +753,16 @@ MAKE_SHARED_LIB
 MAKE_STATIC_LIB
 MAKE_STUB_LIB
 RANLIB_STUB
-itkstub_LIB_FILE
+itk_STUB_LIB_FILE
 itk_LIB_FILE
 WISH_PROG
+itk_BUILD_LIB_SPEC
+itk_LIB_SPEC
+itk_BUILD_STUB_LIB_SPEC
+itk_STUB_LIB_SPEC
+itk_BUILD_STUB_LIB_PATH
+itk_STUB_LIB_PATH
+itk_SRC_DIR
 LTLIBOBJS'
 ac_subst_files=''
       ac_precious_vars='build_alias
@@ -10620,6 +10627,8 @@ fi
 # library.
 #--------------------------------------------------------------------
 
+itk_STUB_LIB_FILE=${PKG_STUB_LIB_FILE}
+itk_LIB_FILE=${PKG_LIB_FILE}
 
 
 
@@ -10721,6 +10730,39 @@ echo "$as_me: error: No wish found in PATH: $search_path" >&2;}
 
 
 #--------------------------------------------------------------------
+# These are for itkConfig.sh
+#--------------------------------------------------------------------
+
+# pkglibdir must be a fully qualified path and (not ${exec_prefix/lib)
+eval pkglibdir="${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}"
+if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+    eval itk_LIB_FLAG="-litk${PACKAGE_VERSION}${DBGX}"
+    eval itk_STUB_LIB_FLAG="-litclstub${PACKAGE_VERSION}${DBGX}"
+else
+    eval itk_LIB_FLAG="-litcl`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
+    eval itk_STUB_LIB_FLAG="-litcl`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
+fi
+itk_BUILD_LIB_SPEC="-L`pwd` ${itk_LIB_FLAG}"
+itk_LIB_SPEC="-L${pkglibdir} ${itk_LIB_FLAG}"
+
+itk_BUILD_STUB_LIB_SPEC="-L`pwd` ${itk_STUB_LIB_FLAG}"
+itk_STUB_LIB_SPEC="-L${pkglibdir} ${itk_STUB_LIB_FLAG}"
+itk_BUILD_STUB_LIB_PATH="`pwd`/${itk_STUB_LIB_FILE}"
+itk_STUB_LIB_PATH="${pkglibdir}/${itk_STUB_LIB_FILE}"
+
+
+
+
+
+
+
+
+# itk_SRC_DIR must be a fully qualified path
+eval itk_SRC_DIR="$srcdir"
+itk_SRC_DIR=`cd "${itk_SRC_DIR}"; pwd`
+
+
+#--------------------------------------------------------------------
 # Finally, substitute all of the various values into the Makefile.
 #--------------------------------------------------------------------
 
@@ -11539,13 +11581,20 @@ MAKE_SHARED_LIB!$MAKE_SHARED_LIB$ac_delim
 MAKE_STATIC_LIB!$MAKE_STATIC_LIB$ac_delim
 MAKE_STUB_LIB!$MAKE_STUB_LIB$ac_delim
 RANLIB_STUB!$RANLIB_STUB$ac_delim
-itkstub_LIB_FILE!$itkstub_LIB_FILE$ac_delim
+itk_STUB_LIB_FILE!$itk_STUB_LIB_FILE$ac_delim
 itk_LIB_FILE!$itk_LIB_FILE$ac_delim
 WISH_PROG!$WISH_PROG$ac_delim
+itk_BUILD_LIB_SPEC!$itk_BUILD_LIB_SPEC$ac_delim
+itk_LIB_SPEC!$itk_LIB_SPEC$ac_delim
+itk_BUILD_STUB_LIB_SPEC!$itk_BUILD_STUB_LIB_SPEC$ac_delim
+itk_STUB_LIB_SPEC!$itk_STUB_LIB_SPEC$ac_delim
+itk_BUILD_STUB_LIB_PATH!$itk_BUILD_STUB_LIB_PATH$ac_delim
+itk_STUB_LIB_PATH!$itk_STUB_LIB_PATH$ac_delim
+itk_SRC_DIR!$itk_SRC_DIR$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
 
-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 48; then
+  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 55; then
     break
   elif $ac_last_try; then
     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5

diff --git a/itcl/itk/configure.ac b/itcl/itk/configure.ac
index ddc30c5..0dc9cfb 100644 (file)
--- a/itcl/itk/configure.ac
+++ b/itcl/itk/configure.ac
@@ -219,7 +219,9 @@ fi
 # library.
 #--------------------------------------------------------------------
 
-AC_SUBST(itkstub_LIB_FILE)
+itk_STUB_LIB_FILE=${PKG_STUB_LIB_FILE}
+itk_LIB_FILE=${PKG_LIB_FILE}
+AC_SUBST(itk_STUB_LIB_FILE)
 AC_SUBST(itk_LIB_FILE)
 
 #--------------------------------------------------------------------
@@ -234,6 +236,39 @@ TEA_PROG_TCLSH
 TEA_PROG_WISH
 
 #--------------------------------------------------------------------
+# These are for itkConfig.sh
+#--------------------------------------------------------------------
+
+# pkglibdir must be a fully qualified path and (not ${exec_prefix/lib)
+eval pkglibdir="${libdir}/${PACKAGE_NAME}${PACKAGE_VERSION}"
+if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+    eval itk_LIB_FLAG="-litk${PACKAGE_VERSION}${DBGX}"
+    eval itk_STUB_LIB_FLAG="-litclstub${PACKAGE_VERSION}${DBGX}"
+else
+    eval itk_LIB_FLAG="-litcl`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
+    eval itk_STUB_LIB_FLAG="-litcl`echo ${PACKAGE_VERSION} | tr -d .`${DBGX}"
+fi
+itk_BUILD_LIB_SPEC="-L`pwd` ${itk_LIB_FLAG}"
+itk_LIB_SPEC="-L${pkglibdir} ${itk_LIB_FLAG}"
+
+itk_BUILD_STUB_LIB_SPEC="-L`pwd` ${itk_STUB_LIB_FLAG}"
+itk_STUB_LIB_SPEC="-L${pkglibdir} ${itk_STUB_LIB_FLAG}"
+itk_BUILD_STUB_LIB_PATH="`pwd`/${itk_STUB_LIB_FILE}"
+itk_STUB_LIB_PATH="${pkglibdir}/${itk_STUB_LIB_FILE}"
+
+AC_SUBST(itk_BUILD_LIB_SPEC)
+AC_SUBST(itk_LIB_SPEC)
+AC_SUBST(itk_BUILD_STUB_LIB_SPEC)
+AC_SUBST(itk_STUB_LIB_SPEC)
+AC_SUBST(itk_BUILD_STUB_LIB_PATH)
+AC_SUBST(itk_STUB_LIB_PATH)
+
+# itk_SRC_DIR must be a fully qualified path
+eval itk_SRC_DIR="$srcdir"
+itk_SRC_DIR=`cd "${itk_SRC_DIR}"; pwd`
+AC_SUBST(itk_SRC_DIR)
+
+#--------------------------------------------------------------------
 # Finally, substitute all of the various values into the Makefile.
 #--------------------------------------------------------------------
 

diff --git a/itcl/itk/itkConfig.sh.in b/itcl/itk/itkConfig.sh.in
index f88caa9..f36dee2 100644 (file)
--- a/itcl/itk/itkConfig.sh.in
+++ b/itcl/itk/itkConfig.sh.in
@@ -12,29 +12,41 @@
 # The information in this file is specific to a single platform.
 
 # Itcl's version number.
-ITCL_VERSION='@ITCL_VERSION@'
+itk_VERSION='@PACKAGE_VERSION@'
+ITK_VERSION='@PACKAGE_VERSION@'
 
 # The name of the Itk library (may be either a .a file or a shared library):
-ITK_LIB_FILE=@ITK_LIB_FILE@
+itk_LIB_FILE=@itk_LIB_FILE@
+ITK_LIB_FILE=@itk_LIB_FILE@
 
 # String to pass to linker to pick up the Itk library from its
 # build directory.
-ITK_BUILD_LIB_SPEC='@ITK_BUILD_LIB_SPEC@'
+itk_BUILD_LIB_SPEC='@itk_BUILD_LIB_SPEC@'
+ITK_BUILD_LIB_SPEC='@itk_BUILD_LIB_SPEC@'
 
 # String to pass to linker to pick up the Itk library from its
 # installed directory.
-ITK_LIB_SPEC='@ITK_LIB_SPEC@'
+itk_LIB_SPEC='@itk_LIB_SPEC@'
+ITK_LIB_SPEC='@itk_LIB_SPEC@'
 
 # The name of the Itk stub library (a .a file):
-ITK_STUB_LIB_FILE=@ITK_STUB_LIB_FILE@
+itk_STUB_LIB_FILE=@itk_STUB_LIB_FILE@
+ITK_STUB_LIB_FILE=@itk_STUB_LIB_FILE@
 
 # String to pass to linker to pick up the Itk stub library from its
 # build directory.
-ITK_BUILD_STUB_LIB_SPEC='@ITK_BUILD_STUB_LIB_SPEC@'
+itk_BUILD_STUB_LIB_SPEC='@itk_BUILD_STUB_LIB_SPEC@'
+ITK_BUILD_STUB_LIB_SPEC='@itk_BUILD_STUB_LIB_SPEC@'
 
 # String to pass to linker to pick up the Itk stub library from its
 # installed directory.
-ITK_STUB_LIB_SPEC='@ITK_STUB_LIB_SPEC@'
+itk_STUB_LIB_SPEC='@itk_STUB_LIB_SPEC@'
+ITK_STUB_LIB_SPEC='@itk_STUB_LIB_SPEC@'
+
+# String to pass to linker to pick up the Itk stub library from its
+# build directory.
+itk_BUILD_STUB_LIB_PATH='@itk_BUILD_STUB_LIB_PATH@'
+ITK_BUILD_STUB_LIB_PATH='@itk_BUILD_STUB_LIB_PATH@'
 
 # Location of the top-level source directories from which [incr Tk]
 # was built.  This is the directory that contains a README file as well
@@ -42,4 +54,5 @@ ITK_STUB_LIB_SPEC='@ITK_STUB_LIB_SPEC@'
 # compiled in a different place than the directory containing the source
 # files, this points to the location of the sources, not the location
 # where [incr Tk] was compiled.
-ITK_SRC_DIR='@ITK_SRC_DIR@'
+itk_SRC_DIR='@itk_SRC_DIR@'
+ITK_SRC_DIR='@itk_SRC_DIR@'