Check-in [56c3d5d022]
Overview
Comment:Cleaned up LDFLAGS settings

Fixed issue with "--with-zlib" wiping out LDFLAGS

Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:56c3d5d0227e83f0855fad4ee62f790cbec21247
User & Date: rkeene on 2010-09-26 04:40:43
Other Links: manifest | tags
Context
2010-09-26
04:40
Added zlib package

Added support for specifying --with-zlib to kitsh if zlib built fine check-in: e95acf08f0 user: rkeene tags: trunk

04:40
Cleaned up LDFLAGS settings

Fixed issue with "--with-zlib" wiping out LDFLAGS check-in: 56c3d5d022 user: rkeene tags: trunk

04:40
Updated to statically link against libstdc++ on HP/UX

Added patch to metakit to not call "autoconf"

Fixed issue with sh on HP/UX (source versus ".")

Added support for statically linking to libgcc check-in: 8ef7a1eb1a user: rkeene tags: trunk

Changes

Modified kitsh/buildsrc/kitsh-0.0/aclocal.m4 from [91d2c06e40] to [0394137fa9].

    32     32   	fi
    33     33   
    34     34   	if test -f "${tclconfigsh}"; then
    35     35   		. "${tclconfigsh}"
    36     36   
    37     37   		CFLAGS="${CFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${tclconfigshdir}"
    38     38   		CPPFLAGS="${CPPFLAGS} ${TCL_INCLUDE_SPEC} -I${TCL_SRC_DIR}/generic -I${tclconfigshdir}"
    39         -		LDFLAGS="${LDFLAGS}"
    40     39   		LIBS="${LIBS} ${TCL_LIBS}"
    41     40   	fi
    42     41   
    43     42   	AC_SUBST(CFLAGS)
    44     43   	AC_SUBST(CPPFLAGS)
    45         -	AC_SUBST(LDFLAGS)
    46     44   	AC_SUBST(LIBS)
    47     45   
    48     46   	AC_MSG_RESULT([$tclconfigsh])
    49     47   ])
    50     48   
    51     49   AC_DEFUN(DC_DO_TK, [
    52     50   	AC_MSG_CHECKING([path to tk])
................................................................................
    82     80   	fi
    83     81   
    84     82   	if test -f "${tkconfigsh}"; then
    85     83   		. "${tkconfigsh}"
    86     84   
    87     85   		CFLAGS="${CFLAGS} ${TK_INCLUDE_SPEC} -I${TK_SRC_DIR}/generic -I${tkconfigshdir}"
    88     86   		CPPFLAGS="${CPPFLAGS} ${TK_INCLUDE_SPEC} -I${TK_SRC_DIR}/generic -I${tkconfigshdir}"
    89         -		LDFLAGS="${LDFLAGS}"
    90     87   		LIBS="${LIBS} ${TK_LIBS}"
    91     88   	fi
    92     89   
    93     90   	AC_SUBST(CFLAGS)
    94     91   	AC_SUBST(CPPFLAGS)
    95         -	AC_SUBST(LDFLAGS)
    96     92   	AC_SUBST(LIBS)
    97     93   
    98     94   	AC_MSG_RESULT([$tkconfigsh])
    99     95   ])
   100     96   
   101     97   AC_DEFUN(DC_DO_STATIC_LINK_LIBCXX, [
   102     98   	AC_MSG_CHECKING([for how to statically link to libstdc++])
................................................................................
   196    192   		LDFLAGS="${SAVELDFLAGS} ${staticlibgcc}"
   197    193   		AC_MSG_RESULT([${staticlibgcc}])
   198    194   	else
   199    195   		LDFLAGS="${SAVELDFLAGS}"
   200    196   		AC_MSG_RESULT([not needed])
   201    197   	fi
   202    198   
          199  +	AC_SUBST(LDFLAGS)
   203    200   ])

Modified kitsh/buildsrc/kitsh-0.0/configure.ac from [d4c560883c] to [af02db7477].

    26     26   LIBS="${ARCHS} ${LIBS}"
    27     27   AC_CHECK_FUNCS(Tcl_SetStartupScript TclSetStartupScriptPath)
    28     28   LIBS="${SAVE_LIBS}"
    29     29   
    30     30   dnl Find zlib
    31     31   AC_ARG_WITH(zlib, AC_HELP_STRING([--with-zlib], [directory containing zlib]), [
    32     32   	CFLAGS="${CFLAGS} -I${with_zlib}/include -I${with_zlib}"
    33         -	LDFLAGS="${CFLAGS} -L${with_zlib}/lib -L${with_zlib}"
           33  +	LDFLAGS="${LDFLAGS} -L${with_zlib}/lib -L${with_zlib}"
    34     34   ])
    35     35   AC_SEARCH_LIBS(inflate, z zlib,, [ AC_MSG_WARN([Couldn't find inflate (normally in zlib)!]) ])
    36     36   
    37     37   dnl Produce output
    38     38   AC_OUTPUT(Makefile)