From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6848 invoked by alias); 2 Aug 2008 20:36:38 -0000 Received: (qmail 6839 invoked by uid 22791); 2 Aug 2008 20:36:38 -0000 X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (66.187.233.31) by sourceware.org (qpsmtpd/0.31) with ESMTP; Sat, 02 Aug 2008 20:35:44 +0000 Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id m72KZg2B001192 for ; Sat, 2 Aug 2008 16:35:42 -0400 Received: from pobox.corp.redhat.com (pobox.corp.redhat.com [10.11.255.20]) by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m72KZga1004481 for ; Sat, 2 Aug 2008 16:35:42 -0400 Received: from lindt.uglyboxes.com (sebastian-int.corp.redhat.com [172.16.52.221]) by pobox.corp.redhat.com (8.13.1/8.13.1) with ESMTP id m72KZd0G022412 for ; Sat, 2 Aug 2008 16:35:41 -0400 Message-ID: <4894C51B.5080007@redhat.com> Date: Sat, 02 Aug 2008 20:36:00 -0000 From: Keith Seitz User-Agent: Thunderbird 2.0.0.14 (X11/20080421) MIME-Version: 1.0 To: insight Subject: [PATCH/itcl] Fix itkConfig.sh Content-Type: multipart/mixed; boundary="------------010800070907030406030707" X-IsSubscribed: yes Mailing-List: contact insight-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: insight-owner@sourceware.org X-SW-Source: 2008-q3/txt/msg00015.txt.bz2 This is a multi-part message in MIME format. --------------010800070907030406030707 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-length: 732 Hi, Well, I don't know exactly how the upstream Itk sources ever output a correct itkConfig.sh, but I've committed the attached patch which fixes it. Which really means that it now outputs useful information into itkConfig.sh. I simply used the Itcl configure.ac/itclConfig.sh as templates and forced this onto their corresponding itk/ files. Please let me know if there are any further problems with this. Keith ChangeLog 2008-08-02 Keith Seitz * 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. --------------010800070907030406030707 Content-Type: text/x-patch; name="itkConfig-sh.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="itkConfig-sh.patch" Content-length: 4554 Index: itk/configure.ac =================================================================== RCS file: /cvs/src/src/itcl/itk/configure.ac,v retrieving revision 1.1 diff -u -p -r1.1 configure.ac --- itk/configure.ac 23 Jul 2008 22:44:51 -0000 1.1 +++ itk/configure.ac 2 Aug 2008 20:31:13 -0000 @@ -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. #-------------------------------------------------------------------- Index: itk/itkConfig.sh.in =================================================================== RCS file: /cvs/src/src/itcl/itk/itkConfig.sh.in,v retrieving revision 1.6 diff -u -p -r1.6 itkConfig.sh.in --- itk/itkConfig.sh.in 23 Jul 2008 22:44:51 -0000 1.6 +++ itk/itkConfig.sh.in 2 Aug 2008 20:31:13 -0000 @@ -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@' --------------010800070907030406030707--