Date: Fri, 27 Sep 2013 16:37:52 +0000 From: "Teske, Devin" <Devin.Teske@fisglobal.com> To: Gavin Atkinson <gavin@FreeBSD.org> Cc: "svn-src-head@freebsd.org" <svn-src-head@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, Devin Teske <dteske@FreeBSD.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "Teske, Devin" <Devin.Teske@fisglobal.com> Subject: Re: svn commit: r255852 - in head: contrib/dialog contrib/dialog/package contrib/dialog/package/debian contrib/dialog/package/freebsd contrib/dialog/po contrib/dialog/samples gnu/lib/libdialog Message-ID: <13CA24D6AB415D428143D44749F57D720FC0055E@LTCFISWMSGMB21.FNFIS.com> In-Reply-To: <alpine.BSF.2.00.1309271546100.98547@thunderhorn.york.ac.uk> References: <201309241452.r8OEqhlx043365@svn.freebsd.org> <alpine.BSF.2.00.1309271546100.98547@thunderhorn.york.ac.uk>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sep 27, 2013, at 7:48 AM, Gavin Atkinson wrote: > On Tue, 24 Sep 2013, Devin Teske wrote: >=20 >> Author: dteske >> Date: Tue Sep 24 14:52:43 2013 >> New Revision: 255852 >> URL: http://svnweb.freebsd.org/changeset/base/255852 >>=20 >> Log: >> Update dialog to 1.2-20130923. >=20 > Hi, >=20 > It sounds like this is an official release, and therefore it looks like=20 > this should have been imported onto the vendor branch (vendor/dialog/)=20 > first, and copied over? >=20 > If that's the case, can this be reverted please, and imported via the=20 > vendor branch? >=20 Can fix without a backout. I'll just import to vendor and do a merge with --record-only. --=20 Devin >> Added: >> head/contrib/dialog/package/freebsd/ >> head/contrib/dialog/package/freebsd/Makefile (contents, props changed) >> head/contrib/dialog/package/freebsd/distinfo >> head/contrib/dialog/package/freebsd/pkg-descr >> head/contrib/dialog/package/freebsd/pkg-plist >> head/contrib/dialog/po/fa.po >> Modified: >> head/contrib/dialog/CHANGES >> head/contrib/dialog/VERSION >> head/contrib/dialog/aclocal.m4 >> head/contrib/dialog/arrows.c >> head/contrib/dialog/buildlist.c >> head/contrib/dialog/checklist.c >> head/contrib/dialog/config.guess >> head/contrib/dialog/config.sub >> head/contrib/dialog/configure >> head/contrib/dialog/configure.in >> head/contrib/dialog/dialog.1 >> head/contrib/dialog/dialog.3 >> head/contrib/dialog/dialog.c >> head/contrib/dialog/dialog.h >> head/contrib/dialog/formbox.c >> head/contrib/dialog/guage.c >> head/contrib/dialog/inputstr.c >> head/contrib/dialog/makefile.in >> head/contrib/dialog/menubox.c >> head/contrib/dialog/mixedform.c >> head/contrib/dialog/package/debian/changelog >> head/contrib/dialog/package/debian/copyright >> head/contrib/dialog/package/dialog.spec >> head/contrib/dialog/po/lt.po >> head/contrib/dialog/samples/inputbox6-utf8 >> head/contrib/dialog/samples/report-tempfile >> head/contrib/dialog/treeview.c >> head/contrib/dialog/util.c >> head/gnu/lib/libdialog/dlg_config.h >>=20 >> Modified: head/contrib/dialog/CHANGES >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/contrib/dialog/CHANGES Tue Sep 24 14:46:10 2013 (r255851) >> +++ head/contrib/dialog/CHANGES Tue Sep 24 14:52:43 2013 (r255852) >> @@ -1,9 +1,38 @@ >> --- $Id: CHANGES,v 1.458 2013/05/24 00:23:22 tom Exp $ >> +-- $Id: CHANGES,v 1.476 2013/09/24 00:06:47 tom Exp $ >> -- Thomas E. Dickey <dickey@invisible-island.net> >>=20 >> This version of dialog was originally from a Debian snapshot. I've done= this >> to it: >>=20 >> +2013/09/23 >> + + fix samples/inputbox6-utf8, which had depended unnecessarily on bash. >> + + improve memory caching for wide-character manipulation in gauge >> + widget (report by Devin Teske). >> + + add dlg_reallocate_gauge (discussion with Devin Teske). >> + + updated configure macros to use msys changes from ncurses. >> + + update config.guess, config.sub >> + >> +2013/09/02 >> + + modify makefile rule to make the ".png" filenames created by groff >> + predictable. >> + + add option --help-tags to allow scripts to get the item's tag field >> + consistently from help- and help-item button results rather than >> + getting the item's text for the latter (discussion with Florent >> + Rougon). >> + + correct manpage discussion of DIALOG_ITEM_HELP versus --item-help, >> + as well as --help-button return status (report by Florent Rougon). >> + + correct limit used for --hline option (report by Devin Teske, >> + cf: 2011/06/30). >> + + do not print empty "[]" if a --hline option was given with an empty >> + value (report by Devin Teske). >> + + miscellaneous configure script fixes/updates. In particular, add >> + option --with-shared which builds shared libraries without a libtool >> + dependency. >> + + add FreeBSD port-files for test-builds. >> + + update lt.po, add fa.po from >> + http://translationproject.org/latest/dialog/ >> + + update config.guess, config.sub >> + >> 2013/05/23 >> + modify ifdef in arrows.c to work around packages which use the >> wide-character ncursesw headers with the ncurses library (report >> @@ -298,7 +327,7 @@ to it: >> separate ncurses' header files. >> + CF_DISABLE_RPATH_HACK, fix garbled message >> + CF_LD_RPATH_OPT, add mirbsd >> - + CF_MAKEFLAGS, filter out GNU make's entering/leaving messages.=20 >> + + CF_MAKEFLAGS, filter out GNU make's entering/leaving messages. >> This only appeared when using the macro in a dpkg script, though it >> should have in other cases. >> + CF_RPATH_HACK, add a check for libraries not found, e.g., from >>=20 >> Modified: head/contrib/dialog/VERSION >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/contrib/dialog/VERSION Tue Sep 24 14:46:10 2013 (r255851) >> +++ head/contrib/dialog/VERSION Tue Sep 24 14:52:43 2013 (r255852) >> @@ -1 +1 @@ >> -11:1:0 1.2 20130523 >> +11:1:0 1.2 20130923 >>=20 >> Modified: head/contrib/dialog/aclocal.m4 >> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D >> --- head/contrib/dialog/aclocal.m4 Tue Sep 24 14:46:10 2013 (r255851) >> +++ head/contrib/dialog/aclocal.m4 Tue Sep 24 14:52:43 2013 (r255852) >> @@ -1,7 +1,7 @@ >> dnl macros used for DIALOG configure script >> -dnl $Id: aclocal.m4,v 1.90 2012/12/02 20:07:30 tom Exp $ >> +dnl $Id: aclocal.m4,v 1.94 2013/09/22 14:26:24 tom Exp $ >> dnl --------------------------------------------------------------------= ------- >> -dnl Copyright 1999-2011,2012 -- Thomas E. Dickey >> +dnl Copyright 1999-2012,2013 -- Thomas E. Dickey >> dnl >> dnl Permission is hereby granted, free of charge, to any person obtainin= g a >> dnl copy of this software and associated documentation files (the >> @@ -590,7 +590,7 @@ changequote([,])dnl >> AC_SUBST(GENCAT) >> ])dnl >> dnl --------------------------------------------------------------------= ------- >> -dnl CF_ACVERSION_CHECK version: 3 updated: 2012/10/03 18:39:53 >> +dnl CF_ACVERSION_CHECK version: 4 updated: 2013/03/04 19:52:56 >> dnl ------------------ >> dnl Conditionally generate script according to whether we're using a giv= en autoconf. >> dnl >> @@ -599,6 +599,7 @@ dnl $2 =3D code to use if AC_ACVERSION is=20 >> dnl $3 =3D code to use if AC_ACVERSION is older than $1. >> define([CF_ACVERSION_CHECK], >> [ >> +ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])d= nl >> ifdef([m4_version_compare], >> [m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2]= )], >> [CF_ACVERSION_COMPARE( >> @@ -1125,6 +1126,27 @@ if test ".$system_name" !=3D ".$cf_cv_syst >> fi >> ])dnl >> dnl --------------------------------------------------------------------= ------- >> +dnl CF_CHECK_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09 >> +dnl ------------------------ >> +dnl Show the version of libtool >> +dnl >> +dnl Save the version in a cache variable - this is not entirely a good = thing, >> +dnl but the version string from libtool is very ugly, and for bug repor= ts it >> +dnl might be useful to have the original string. >> +AC_DEFUN([CF_CHECK_LIBTOOL_VERSION],[ >> +if test -n "$LIBTOOL" && test "$LIBTOOL" !=3D none >> +then >> + AC_MSG_CHECKING(version of $LIBTOOL) >> + CF_LIBTOOL_VERSION >> + AC_MSG_RESULT($cf_cv_libtool_version) >> + if test -z "$cf_cv_libtool_version" ; then >> + AC_MSG_ERROR(This is not GNU libtool) >> + fi >> +else >> + AC_MSG_ERROR(GNU libtool has not been found) >> +fi >> +])dnl >> +dnl -------------------------------------------------------------------= -------- >> dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39 >> dnl ----------------- >> dnl Check if the given compiler is really clang. clang's C driver defin= es >> @@ -1293,7 +1315,7 @@ fi >> AC_CHECK_HEADERS($cf_cv_ncurses_header) >> ])dnl >> dnl --------------------------------------------------------------------= ------- >> -dnl CF_CURSES_LIBS version: 36 updated: 2012/07/07 21:02:48 >> +dnl CF_CURSES_LIBS version: 37 updated: 2013/02/09 17:33:50 >> dnl -------------- >> dnl Look for the curses libraries. Older curses implementations may req= uire >> dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. >> @@ -1330,7 +1352,7 @@ hpux10.*) #(vi >> ac_cv_func_initscr=3Dyes >> ])]) >> fi >> - ;; >> + ;; >> linux*) >> case `arch 2>/dev/null` in >> x86_64) >> @@ -1345,7 +1367,7 @@ linux*) >> CF_ADD_LIBDIR(/lib) >> ;; >> esac >> - ;; >> + ;; >> sunos3*|sunos4*) >> if test "x$cf_cv_screen" =3D "xcurses_5lib" >> then >> @@ -1359,59 +1381,63 @@ sunos3*|sunos4*) >> esac >>=20 >> if test ".$ac_cv_func_initscr" !=3D .yes ; then >> - cf_save_LIBS=3D"$LIBS" >> - cf_term_lib=3D"" >> - cf_curs_lib=3D"" >> + cf_save_LIBS=3D"$LIBS" >>=20 >> - if test ".${cf_cv_ncurses_version:-no}" !=3D .no >> - then >> - cf_check_list=3D"ncurses curses cursesX" >> - else >> - cf_check_list=3D"cursesX curses ncurses" >> - fi >> + if test ".${cf_cv_ncurses_version:-no}" !=3D .no >> + then >> + cf_check_list=3D"ncurses curses cursesX" >> + else >> + cf_check_list=3D"cursesX curses ncurses" >> + fi >>=20 >> - # Check for library containing tgoto. Do this before curses library >> - # because it may be needed to link the test-case for initscr. >> - AC_CHECK_FUNC(tgoto,[cf_term_lib=3Dpredefined],[ >> - for cf_term_lib in $cf_check_list otermcap termcap tinfo termli= b unknown >> - do >> - AC_CHECK_LIB($cf_term_lib,tgoto,[break]) >> - done >> - ]) >> + # Check for library containing tgoto. Do this before curses library >> + # because it may be needed to link the test-case for initscr. >> + if test "x$cf_term_lib" =3D x >> + then >> + AC_CHECK_FUNC(tgoto,[cf_term_lib=3Dpredefined],[ >> + for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unk= nown >> + do >> + AC_CHECK_LIB($cf_term_lib,tgoto,[break]) >> + done >> + ]) >> + fi >>=20 >> - # Check for library containing initscr >> - test "$cf_term_lib" !=3D predefined && test "$cf_term_lib" !=3D unk= nown && LIBS=3D"-l$cf_term_lib $cf_save_LIBS" >> - for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown >> - do >> - AC_CHECK_LIB($cf_curs_lib,initscr,[break]) >> - done >> - test $cf_curs_lib =3D unknown && AC_MSG_ERROR(no curses library fou= nd) >> + # Check for library containing initscr >> + test "$cf_term_lib" !=3D predefined && test "$cf_term_lib" !=3D unknow= n && LIBS=3D"-l$cf_term_lib $cf_save_LIBS" >> + if test "x$cf_curs_lib" =3D x >> + then >> + for cf_curs_lib in $cf_check_list xcurses jcurses pdcurses unknown >> + do >> + AC_CHECK_LIB($cf_curs_lib,initscr,[break]) >> + done >> + fi >> + test $cf_curs_lib =3D unknown && AC_MSG_ERROR(no curses library found) >>=20 >> - LIBS=3D"-l$cf_curs_lib $cf_save_LIBS" >> - if test "$cf_term_lib" =3D unknown ; then >> - AC_MSG_CHECKING(if we can link with $cf_curs_lib library) >> - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], >> - [initscr()], >> - [cf_result=3Dyes], >> - [cf_result=3Dno]) >> - AC_MSG_RESULT($cf_result) >> - test $cf_result =3D no && AC_MSG_ERROR(Cannot link curses libra= ry) >> - elif test "$cf_curs_lib" =3D "$cf_term_lib" ; then >> - : >> - elif test "$cf_term_lib" !=3D predefined ; then >> - AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib l= ibraries) >> - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], >> - [initscr(); tgoto((char *)0, 0, 0);], >> - [cf_result=3Dno], >> - [ >> - LIBS=3D"-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" >> - AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], >> - [initscr()], >> - [cf_result=3Dyes], >> - [cf_result=3Derror]) >> - ]) >> - AC_MSG_RESULT($cf_result) >> - fi >> + LIBS=3D"-l$cf_curs_lib $cf_save_LIBS" >> + if test "$cf_term_lib" =3D unknown ; then >> + AC_MSG_CHECKING(if we can link with $cf_curs_lib library) >> + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], >> + [initscr()], >> + [cf_result=3Dyes], >> + [cf_result=3Dno]) >> + AC_MSG_RESULT($cf_result) >> + test $cf_result =3D no && AC_MSG_ERROR(Cannot link curses library) >> + elif test "$cf_curs_lib" =3D "$cf_term_lib" ; then >> + : >> + elif test "$cf_term_lib" !=3D predefined ; then >> + AC_MSG_CHECKING(if we need both $cf_curs_lib and $cf_term_lib librari= es) >> + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], >> + [initscr(); tgoto((char *)0, 0, 0);], >> + [cf_result=3Dno], >> + [ >> + LIBS=3D"-l$cf_curs_lib -l$cf_term_lib $cf_save_LIBS" >> + AC_TRY_LINK([#include <${cf_cv_ncurses_header:-curses.h}>], >> + [initscr()], >> + [cf_result=3Dyes], >> + [cf_result=3Derror]) >> + ]) >> + AC_MSG_RESULT($cf_result) >> + fi >> fi >> fi >>=20 >> @@ -1708,6 +1734,20 @@ if test "$cf_disable_rpath_hack" =3D no ;=20 >> fi >> ]) >> dnl --------------------------------------------------------------------= ------- >> +dnl CF_ENABLE_RPATH version: 2 updated: 2010/03/27 18:39:42 >> +dnl --------------- >> +dnl Check if the rpath option should be used, setting cache variable >> +dnl cf_cv_enable_rpath if so. >> +AC_DEFUN([CF_ENABLE_RPATH], >> +[ >> +AC_MSG_CHECKING(if rpath option should be used) >> +AC_ARG_ENABLE(rpath, >> +[ --enable-rpath use rpath option when generating shared libr= aries], >> +[cf_cv_enable_rpath=3D$enableval], >> +[cf_cv_enable_rpath=3Dno]) >> +AC_MSG_RESULT($cf_cv_enable_rpath) >> +])dnl >> +dnl -------------------------------------------------------------------= -------- >> dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54 >> dnl --------------- >> dnl Look for a non-standard library, given parameters for AC_TRY_LINK. = We >> @@ -1888,6 +1928,15 @@ ifelse([$5],,AC_MSG_WARN(Cannot find $3=20 >> fi >> ])dnl >> dnl --------------------------------------------------------------------= ------- >> +dnl CF_FORGET_TOOL version: 1 updated: 2013/04/06 18:03:09 >> +dnl -------------- >> +dnl Forget that we saw the given tool. >> +AC_DEFUN([CF_FORGET_TOOL],[ >> +unset ac_cv_prog_ac_ct_$1 >> +unset ac_ct_$1 >> +unset $1 >> +])dnl >> +dnl -------------------------------------------------------------------= -------- >> dnl CF_FUNC_WAIT version: 3 updated: 2012/10/06 08:57:51 >> dnl ------------ >> dnl Test for the presence of <sys/wait.h>, 'union wait', arg-type of 'wa= it()' >> @@ -2256,7 +2305,7 @@ test -d "$oldincludedir" && { >> $1=3D"[$]$1 $cf_header_path_list" >> ])dnl >> dnl --------------------------------------------------------------------= ------- >> -dnl CF_INTEL_COMPILER version: 4 updated: 2010/05/26 05:38:42 >> +dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05 >> dnl ----------------- >> dnl Check if the given compiler is really the Intel compiler for Linux. = It >> dnl tries to imitate gcc, but does not return an error when it finds a m= ismatch >> @@ -2270,6 +2319,7 @@ dnl $1 =3D GCC (default) or GXX >> dnl $2 =3D INTEL_COMPILER (default) or INTEL_CPLUSPLUS >> dnl $3 =3D CFLAGS (default) or CXXFLAGS >> AC_DEFUN([CF_INTEL_COMPILER],[ >> +AC_REQUIRE([AC_CANONICAL_HOST]) >> ifelse([$2],,INTEL_COMPILER,[$2])=3Dno >>=20 >> if test "$ifelse([$1],,[$1],GCC)" =3D yes ; then >> @@ -2415,6 +2465,18 @@ CF_SUBDIR_PATH($1,$2,lib) >> $1=3D"$cf_library_path_list [$]$1" >> ])dnl >> dnl --------------------------------------------------------------------= ------- >> +dnl CF_LIBTOOL_VERSION version: 1 updated: 2013/04/06 18:03:09 >> +dnl ------------------ >> +AC_DEFUN([CF_LIBTOOL_VERSION],[ >> +if test -n "$LIBTOOL" && test "$LIBTOOL" !=3D none >> +then >> + cf_cv_libtool_version=3D`$LIBTOOL --version 2>&1 | sed -e '/^$/d' |sed= -e '2,$d' -e 's/([[^)]]*)//g' -e 's/^[[^1-9]]*//' -e 's/[[^0-9.]].*//'` >> +else >> + cf_cv_libtool_version=3D >> +fi >> +test -z "$cf_cv_libtool_version" && unset cf_cv_libtool_version >> +])dnl >> +dnl -------------------------------------------------------------------= -------- >> dnl CF_LIB_PREFIX version: 9 updated: 2012/01/21 19:28:10 >> dnl ------------- >> dnl Compute the library-prefix for the given host system >> @@ -2432,6 +2494,69 @@ ifelse($1,,,[$1=3D$LIB_PREFIX]) >> AC_SUBST(LIB_PREFIX) >> ])dnl >> dnl --------------------------------------------------------------------= ------- >> +dnl CF_LIB_SUFFIX version: 22 updated: 2013/09/07 13:54:05 >> +dnl ------------- >> +dnl Compute the library file-suffix from the given model name >> +dnl $1 =3D model name >> +dnl $2 =3D variable to set (the nominal library suffix) >> +dnl $3 =3D dependency variable to set (actual filename) >> +dnl The variable $LIB_SUFFIX, if set, prepends the variable to set. >> +AC_DEFUN([CF_LIB_SUFFIX], >> +[ >> + case X$1 in #(vi >> + Xlibtool) #(vi >> + $2=3D'.la' >> + $3=3D[$]$2 >> + ;; >> + Xdebug) #(vi >> + $2=3D'_g.a' >> + $3=3D[$]$2 >> + ;; >> + Xprofile) #(vi >> + $2=3D'_p.a' >> + $3=3D[$]$2 >> + ;; >> + Xshared) #(vi >> + case $cf_cv_system_name in >> + aix[[5-7]]*) #(vi >> + $2=3D'.a' >> + $3=3D[$]$2 >> + ;; >> + cygwin*|msys*|mingw*) #(vi >> + $2=3D'.dll' >> + $3=3D'.dll.a' >> + ;; >> + darwin*) #(vi >> + $2=3D'.dylib' >> + $3=3D[$]$2 >> + ;; >> + hpux*) #(vi >> + case $target in >> + ia64*) #(vi >> + $2=3D'.so' >> + $3=3D[$]$2 >> + ;; >> + *) #(vi >> + $2=3D'.sl' >> + $3=3D[$]$2 >> + ;; >> + esac >> + ;; >> + *) #(vi >> + $2=3D'.so' >> + $3=3D[$]$2 >> + ;; >> + esac >> + ;; >> + *) >> + $2=3D'.a' >> + $3=3D[$]$2 >> + ;; >> + esac >> + test -n "$LIB_SUFFIX" && $2=3D"${LIB_SUFFIX}[$]{$2}" >> + test -n "$LIB_SUFFIX" && $3=3D"${LIB_SUFFIX}[$]{$3}" >> +])dnl >> +dnl -------------------------------------------------------------------= -------- >> dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46 >> dnl ------------ >> dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass '= make' >> @@ -2569,7 +2694,7 @@ if test "$cf_cv_mbstate_t" !=3D unknown ;=20 >> fi >> ])dnl >> dnl --------------------------------------------------------------------= ------- >> -dnl CF_MIXEDCASE_FILENAMES version: 4 updated: 2012/10/02 20:55:03 >> +dnl CF_MIXEDCASE_FILENAMES version: 5 updated: 2013/09/07 13:54:05 >> dnl ---------------------- >> dnl Check if the file-system supports mixed-case filenames. If we're ab= le to >> dnl create a lowercase name and see it as uppercase, it doesn't support = that. >> @@ -2578,7 +2703,7 @@ AC_DEFUN([CF_MIXEDCASE_FILENAMES], >> AC_CACHE_CHECK(if filesystem supports mixed-case filenames,cf_cv_mixedca= se,[ >> if test "$cross_compiling" =3D yes ; then >> case $target_alias in #(vi >> - *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-mingw32*|*-uwin*) #(vi >> + *-os2-emx*|*-msdosdjgpp*|*-cygwin*|*-msys*|*-mingw32*|*-uwin*) #(vi >> cf_cv_mixedcase=3Dno >> ;; >> *) >> @@ -2959,6 +3084,25 @@ case .$with_cflags in #(vi >> esac >> ])dnl >> dnl --------------------------------------------------------------------= ------- >> +dnl CF_NUMBER_SYNTAX version: 1 updated: 2003/09/20 18:12:49 >> +dnl ---------------- >> +dnl Check if the given variable is a number. If not, report an error. >> +dnl $1 is the variable >> +dnl $2 is the message >> +AC_DEFUN([CF_NUMBER_SYNTAX],[ >> +if test -n "$1" ; then >> + case $1 in #(vi >> + [[0-9]]*) #(vi >> + ;; >> + *) >> + AC_MSG_ERROR($2 is not a number: $1) >> + ;; >> + esac >> +else >> + AC_MSG_ERROR($2 value is empty) >> +fi >> +])dnl >> +dnl -------------------------------------------------------------------= -------- >> dnl CF_OUR_MESSAGES version: 7 updated: 2004/09/12 19:45:55 >> dnl --------------- >> dnl Check if we use the messages included with this program >> @@ -3049,6 +3193,40 @@ case ".[$]$1" in #(vi >> esac >> ])dnl >> dnl --------------------------------------------------------------------= ------- >> +dnl CF_PKG_CONFIG version: 7 updated: 2011/04/29 04:53:22 >> +dnl ------------- >> +dnl Check for the package-config program, unless disabled by command-li= ne. >> +AC_DEFUN([CF_PKG_CONFIG], >> +[ >> +AC_MSG_CHECKING(if you want to use pkg-config) >> +AC_ARG_WITH(pkg-config, >> + [ --with-pkg-config{=3Dpath} enable/disable use of pkg-config], >> + [cf_pkg_config=3D$withval], >> + [cf_pkg_config=3Dyes]) >> +AC_MSG_RESULT($cf_pkg_config) >> + >> +case $cf_pkg_config in #(vi >> +no) #(vi >> + PKG_CONFIG=3Dnone >> + ;; >> +yes) #(vi >> + CF_ACVERSION_CHECK(2.52, >> + [AC_PATH_TOOL(PKG_CONFIG, pkg-config, none)], >> + [AC_PATH_PROG(PKG_CONFIG, pkg-config, none)]) >> + ;; >> +*) >> + PKG_CONFIG=3D$withval >> + ;; >> +esac >> + >> +test -z "$PKG_CONFIG" && PKG_CONFIG=3Dnone >> +if test "$PKG_CONFIG" !=3D none ; then >> + CF_PATH_SYNTAX(PKG_CONFIG) >> +fi >> + >> +AC_SUBST(PKG_CONFIG) >> +])dnl >> +dnl -------------------------------------------------------------------= -------- >> dnl CF_POSIX_C_SOURCE version: 8 updated: 2010/05/26 05:38:42 >> dnl ----------------- >> dnl Define _POSIX_C_SOURCE to the given level, and _POSIX_SOURCE if need= ed. >> @@ -3168,6 +3346,28 @@ AC_CHECK_PROGS(LINT, tdlint lint alint s >> AC_SUBST(LINT_OPTS) >> ])dnl >> dnl --------------------------------------------------------------------= ------- >> +dnl CF_PROG_LN_S version: 2 updated: 2010/08/14 18:25:37 >> +dnl ------------ >> +dnl Combine checks for "ln -s" and "ln -sf", updating $LN_S to include = "-f" >> +dnl option if it is supported. >> +AC_DEFUN([CF_PROG_LN_S],[ >> +AC_PROG_LN_S >> +AC_MSG_CHECKING(if $LN_S -f options work) >> + >> +rm -f conf$$.src conf$$dst >> +echo >conf$$.dst >> +echo first >conf$$.src >> +if $LN_S -f conf$$.src conf$$.dst 2>/dev/null; then >> + cf_prog_ln_sf=3Dyes >> +else >> + cf_prog_ln_sf=3Dno >> +fi >> +rm -f conf$$.dst conf$$src >> +AC_MSG_RESULT($cf_prog_ln_sf) >> + >> +test "$cf_prog_ln_sf" =3D yes && LN_S=3D"$LN_S -f" >> +])dnl >> +dnl -------------------------------------------------------------------= -------- >> dnl CF_REMOVE_DEFINE version: 3 updated: 2010/01/09 11:05:50 >> dnl ---------------- >> dnl Remove all -U and -D options that refer to the given symbol from a l= ist >> @@ -3185,7 +3385,7 @@ $1=3D`echo "$2" | \ >> -e 's/-[[UD]]'"$3"'\(=3D[[^ ]]*\)\?[$]//g'` >> ])dnl >> dnl --------------------------------------------------------------------= ------- >> -dnl CF_RPATH_HACK version: 9 updated: 2011/02/13 13:31:33 >> +dnl CF_RPATH_HACK version: 11 updated: 2013/09/01 13:02:00 >> dnl ------------- >> AC_DEFUN([CF_RPATH_HACK], >> [ >> @@ -3202,8 +3402,8 @@ if test -n "$LD_RPATH_OPT" ; then >>=20 >> AC_TRY_LINK([#include <stdio.h>], >> [printf("Hello");], >> - [cf_rpath_oops=3D`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found= ' | sed -e 's% =3D>.*$%%' |sort -u` >> - cf_rpath_list=3D`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e = 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`]) >> + [cf_rpath_oops=3D`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found= ' | sed -e 's% =3D>.*$%%' |sort | uniq` >> + cf_rpath_list=3D`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e = 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort | uniq`]) >>=20 >> # If we passed the link-test, but get a "not found" on a given library, >> # this could be due to inept reconfiguration of gcc to make it only >> @@ -3236,6 +3436,8 @@ AC_TRY_LINK([#include <stdio.h>], >> CF_RPATH_HACK_2(LIBS) >>=20 >> CF_VERBOSE(...checked EXTRA_LDFLAGS $EXTRA_LDFLAGS) >> +else >> + AC_MSG_RESULT(no) >> fi >> AC_SUBST(EXTRA_LDFLAGS) >> ])dnl >> @@ -3300,6 +3502,440 @@ CF_VERBOSE(...checked $1 [$]$1) >> AC_SUBST(EXTRA_LDFLAGS) >> ])dnl >> dnl --------------------------------------------------------------------= ------- >> +dnl CF_SHARED_OPTS version: 83 updated: 2013/09/21 17:34:53 >> +dnl -------------- >> +dnl -------------- >> +dnl Attempt to determine the appropriate CC/LD options for creating a s= hared >> +dnl library. >> +dnl >> +dnl Notes: >> +dnl a) ${LOCAL_LDFLAGS} is used to link executables that will run within >> +dnl the build-tree, i.e., by making use of the libraries that are compi= led in >> +dnl $rel_builddir/lib We avoid compiling-in a $rel_builddir/lib path fo= r the >> +dnl shared library since that can lead to unexpected results at runtime. >> +dnl b) ${LOCAL_LDFLAGS2} has the same intention but assumes that the sh= ared >> +dnl libraries are compiled in ../../lib >> +dnl >> +dnl The variable 'cf_cv_do_symlinks' is used to control whether we conf= igure >> +dnl to install symbolic links to the rel/abi versions of shared librari= es. >> +dnl >> +dnl The variable 'cf_cv_shlib_version' controls whether we use the rel = or abi >> +dnl version when making symbolic links. >> +dnl >> +dnl The variable 'cf_cv_shlib_version_infix' controls whether shared li= brary >> +dnl version numbers are infix (ex: libncurses.<ver>.dylib) or postfix >> +dnl (ex: libncurses.so.<ver>). >> +dnl >> +dnl Some loaders leave 'so_locations' lying around. It's nice to clean= up. >> +AC_DEFUN([CF_SHARED_OPTS], >> +[ >> + AC_REQUIRE([CF_LD_RPATH_OPT]) >> + RM_SHARED_OPTS=3D >> + LOCAL_LDFLAGS=3D >> + LOCAL_LDFLAGS2=3D >> + LD_SHARED_OPTS=3D >> + INSTALL_LIB=3D"-m 644" >> + : ${rel_builddir:=3D.} >> + >> + cf_cv_do_symlinks=3Dno >> + cf_ld_rpath_opt=3D >> + test "$cf_cv_enable_rpath" =3D yes && cf_ld_rpath_opt=3D"$LD_RPATH_OPT" >> + >> + AC_MSG_CHECKING(if release/abi version should be used for shared libs) >> + AC_ARG_WITH(shlib-version, >> + [ --with-shlib-version=3DX Specify rel or abi version for shared lib= s], >> + [test -z "$withval" && withval=3Dauto >> + case $withval in #(vi >> + yes) #(vi >> + cf_cv_shlib_version=3Dauto >> + ;; >> + rel|abi|auto|no) #(vi >> + cf_cv_shlib_version=3D$withval >> + ;; >> + *) >> + AC_MSG_ERROR([option value must be one of: rel, abi, auto or no]) >> + ;; >> + esac >> + ],[cf_cv_shlib_version=3Dauto]) >> + AC_MSG_RESULT($cf_cv_shlib_version) >> + >> + cf_cv_rm_so_locs=3Dno >> + cf_try_cflags=3D >> + >> + # Some less-capable ports of gcc support only -fpic >> + CC_SHARED_OPTS=3D >> + if test "$GCC" =3D yes >> + then >> + AC_MSG_CHECKING(which $CC option to use) >> + cf_save_CFLAGS=3D"$CFLAGS" >> + for CC_SHARED_OPTS in -fPIC -fpic '' >> + do >> + CFLAGS=3D"$cf_save_CFLAGS $CC_SHARED_OPTS" >> + AC_TRY_COMPILE([#include <stdio.h>],[int x =3D 1],[break],[]) >> + done >> + AC_MSG_RESULT($CC_SHARED_OPTS) >> + CFLAGS=3D"$cf_save_CFLAGS" >> + fi >> + >> + cf_cv_shlib_version_infix=3Dno >> + >> + case $cf_cv_system_name in #(vi >> + aix4.[3-9]*|aix[[5-7]]*) #(vi >> + if test "$GCC" =3D yes; then >> + CC_SHARED_OPTS=3D >> + MK_SHARED_LIB=3D'${CC} -shared -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}= :/usr/lib -o [$]@' >> + else >> + # CC_SHARED_OPTS=3D'-qpic=3Dlarge -G' >> + # perhaps "-bM:SRE -bnoentry -bexpall" >> + MK_SHARED_LIB=3D'${CC} -G -Wl,-brtl -Wl,-blibpath:${RPATH_LIST}:/usr= /lib -o [$]@' >> + fi >> + ;; >> + beos*) #(vi >> + MK_SHARED_LIB=3D'${CC} ${CFLAGS} -o $[@] -Xlinker -soname=3D`basename= $[@]` -nostart -e 0' >> + ;; >> + cygwin*) #(vi >> + CC_SHARED_OPTS=3D >> + MK_SHARED_LIB=3D'sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]= {CFLAGS}' >> + RM_SHARED_OPTS=3D"$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dl= l.a" >> + cf_cv_shlib_version=3Dcygdll >> + cf_cv_shlib_version_infix=3Dcygdll >> + cat >mk_shared_lib.sh <<-CF_EOF >> + #!/bin/sh >> + SHARED_LIB=3D\[$]1 >> + IMPORT_LIB=3D\`echo "\[$]1" | sed -e 's/cyg/lib/' -e 's/[[0-9]]*\.dll= [$]/.dll.a/'\` >> + shift >> + cat <<-EOF >> + Linking shared library >> + ** SHARED_LIB \[$]SHARED_LIB >> + ** IMPORT_LIB \[$]IMPORT_LIB >> +EOF >> + exec \[$]* -shared -Wl,--out-implib=3D\[$]{IMPORT_LIB} -Wl,--export-a= ll-symbols -o \[$]{SHARED_LIB} >> +CF_EOF >> + chmod +x mk_shared_lib.sh >> + ;; >> + msys*) #(vi >> + CC_SHARED_OPTS=3D >> + MK_SHARED_LIB=3D'sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]= {CFLAGS}' >> + RM_SHARED_OPTS=3D"$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dl= l.a" >> + cf_cv_shlib_version=3Dmsysdll >> + cf_cv_shlib_version_infix=3Dmsysdll >> + cat >mk_shared_lib.sh <<-CF_EOF >> + #!/bin/sh >> + SHARED_LIB=3D\[$]1 >> + IMPORT_LIB=3D\`echo "\[$]1" | sed -e 's/msys-/lib/' -e 's/[[0-9]]*\.d= ll[$]/.dll.a/'\` >> + shift >> + cat <<-EOF >> + Linking shared library >> + ** SHARED_LIB \[$]SHARED_LIB >> + ** IMPORT_LIB \[$]IMPORT_LIB >> +EOF >> + exec \[$]* -shared -Wl,--out-implib=3D\[$]{IMPORT_LIB} -Wl,--export-a= ll-symbols -o \[$]{SHARED_LIB} >> +CF_EOF >> + chmod +x mk_shared_lib.sh >> + ;; >> + darwin*) #(vi >> + cf_try_cflags=3D"no-cpp-precomp" >> + CC_SHARED_OPTS=3D"-dynamic" >> + MK_SHARED_LIB=3D'${CC} ${CFLAGS} -dynamiclib -install_name ${libdir}/= `basename $[@]` -compatibility_version ${ABI_VERSION} -current_version ${AB= I_VERSION} -o $[@]' >> + test "$cf_cv_shlib_version" =3D auto && cf_cv_shlib_version=3Dabi >> + cf_cv_shlib_version_infix=3Dyes >> + AC_CACHE_CHECK([if ld -search_paths_first works], cf_cv_ldflags_searc= h_paths_first, [ >> + cf_save_LDFLAGS=3D$LDFLAGS >> + LDFLAGS=3D"$LDFLAGS -Wl,-search_paths_first" >> + AC_TRY_LINK(, [int i;], cf_cv_ldflags_search_paths_first=3Dyes, cf_c= v_ldflags_search_paths_first=3Dno) >> + LDFLAGS=3D$cf_save_LDFLAGS]) >> + if test $cf_cv_ldflags_search_paths_first =3D yes; then >> + LDFLAGS=3D"$LDFLAGS -Wl,-search_paths_first" >> + fi >> + ;; >> + hpux[[7-8]]*) #(vi >> + # HP-UX 8.07 ld lacks "+b" option used for libdir search-list=20 >> + if test "$GCC" !=3D yes; then >> + CC_SHARED_OPTS=3D'+Z' >> + fi >> + MK_SHARED_LIB=3D'${LD} -b -o $[@]' >> + INSTALL_LIB=3D"-m 555" >> + ;; >> + hpux*) #(vi >> + # (tested with gcc 2.7.2 -- I don't have c89) >> + if test "$GCC" =3D yes; then >> + LD_SHARED_OPTS=3D'-Xlinker +b -Xlinker ${libdir}' >> + else >> + CC_SHARED_OPTS=3D'+Z' >> + LD_SHARED_OPTS=3D'-Wl,+b,${libdir}' >> + fi >> + MK_SHARED_LIB=3D'${LD} +b ${libdir} -b -o $[@]' >> + # HP-UX shared libraries must be executable, and should be >> + # readonly to exploit a quirk in the memory manager. >> + INSTALL_LIB=3D"-m 555" >> + ;; >> + interix*) >> + test "$cf_cv_shlib_version" =3D auto && cf_cv_shlib_version=3Drel >> + if test "$cf_cv_shlib_version" =3D rel; then >> + cf_shared_soname=3D'`basename $@ .${REL_VERSION}`.${ABI_VERSION}' >> + else >> + cf_shared_soname=3D'`basename $@`' >> + fi >> + CC_SHARED_OPTS=3D >> + MK_SHARED_LIB=3D'${CC} -shared -Wl,-rpath,${RPATH_LIST} -Wl,-h,'$cf_s= hared_soname' -o $@' >> + ;; >> + irix*) #(vi >> + if test "$cf_cv_enable_rpath" =3D yes ; then >> + EXTRA_LDFLAGS=3D"${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" >> + fi >> + # tested with IRIX 5.2 and 'cc'. >> + if test "$GCC" !=3D yes; then >> + CC_SHARED_OPTS=3D'-KPIC' >> + MK_SHARED_LIB=3D'${CC} -shared -rdata_shared -soname `basename $[@]`= -o $[@]' >> + else >> + MK_SHARED_LIB=3D'${CC} -shared -Wl,-soname,`basename $[@]` -o $[@]' >> + fi >> + cf_cv_rm_so_locs=3Dyes >> + ;; >> + linux*|gnu*|k*bsd*-gnu) #(vi >> + if test "$DFT_LWR_MODEL" =3D "shared" ; then >> + LOCAL_LDFLAGS=3D"${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" >> + LOCAL_LDFLAGS2=3D"$LOCAL_LDFLAGS" >> + fi >> + if test "$cf_cv_enable_rpath" =3D yes ; then >> + EXTRA_LDFLAGS=3D"${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" >> + fi >> + CF_SHARED_SONAME >> + MK_SHARED_LIB=3D'${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_s= oname',-stats,-lc -o $[@]' >> + ;; >> + mingw*) #(vi >> + cf_cv_shlib_version=3Dmingw >> + cf_cv_shlib_version_infix=3Dmingw >> + if test "$DFT_LWR_MODEL" =3D "shared" ; then >> + LOCAL_LDFLAGS=3D"-Wl,--enable-auto-import" >> + LOCAL_LDFLAGS2=3D"$LOCAL_LDFLAGS" >> + EXTRA_LDFLAGS=3D"-Wl,--enable-auto-import $EXTRA_LDFLAGS" >> + fi >> + CC_SHARED_OPTS=3D >> + MK_SHARED_LIB=3D'sh '$rel_builddir'/mk_shared_lib.sh [$]@ [$]{CC} [$]= {CFLAGS}' >> + RM_SHARED_OPTS=3D"$RM_SHARED_OPTS $rel_builddir/mk_shared_lib.sh *.dl= l.a" >> + cat >mk_shared_lib.sh <<-CF_EOF >> + #!/bin/sh >> + SHARED_LIB=3D\[$]1 >> + IMPORT_LIB=3D\`echo "\[$]1" | sed -e 's/[[0-9]]*\.dll[$]/.dll.a/'\` >> + shift >> + cat <<-EOF >> + Linking shared library >> + ** SHARED_LIB \[$]SHARED_LIB >> + ** IMPORT_LIB \[$]IMPORT_LIB >> +EOF >> + exec \[$]* -shared -Wl,--enable-auto-import,--out-implib=3D\[$]{IMPOR= T_LIB} -Wl,--export-all-symbols -o \[$]{SHARED_LIB} >> +CF_EOF >> + chmod +x mk_shared_lib.sh >> + ;; >> + openbsd[[2-9]].*|mirbsd*) #(vi >> + if test "$DFT_LWR_MODEL" =3D "shared" ; then >> + LOCAL_LDFLAGS=3D"${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" >> + LOCAL_LDFLAGS2=3D"$LOCAL_LDFLAGS" >> + fi >> + if test "$cf_cv_enable_rpath" =3D yes ; then >> + EXTRA_LDFLAGS=3D"${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" >> + fi >> + CC_SHARED_OPTS=3D"$CC_SHARED_OPTS -DPIC" >> + CF_SHARED_SONAME >> + MK_SHARED_LIB=3D'${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf= _cv_shared_soname',-stats,-lc -o $[@]' >> + ;; >> + nto-qnx*|openbsd*|freebsd[[12]].*) #(vi >> + CC_SHARED_OPTS=3D"$CC_SHARED_OPTS -DPIC" >> + MK_SHARED_LIB=3D'${LD} -Bshareable -o $[@]' >> + test "$cf_cv_shlib_version" =3D auto && cf_cv_shlib_version=3Drel >> + ;; >> + dragonfly*|freebsd*) #(vi >> + CC_SHARED_OPTS=3D"$CC_SHARED_OPTS -DPIC" >> + if test "$DFT_LWR_MODEL" =3D "shared" && test "$cf_cv_enable_rpath" = =3D yes ; then >> + LOCAL_LDFLAGS=3D"${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" >> + LOCAL_LDFLAGS2=3D"${cf_ld_rpath_opt}\${RPATH_LIST} $LOCAL_LDFLAGS" >> + EXTRA_LDFLAGS=3D"${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" >> + fi >> + CF_SHARED_SONAME >> + MK_SHARED_LIB=3D'${LD} -shared -Bshareable -soname=3D`basename $[@]` = -o $[@]' >> + ;; >> + netbsd*) #(vi >> + CC_SHARED_OPTS=3D"$CC_SHARED_OPTS -DPIC" >> + if test "$DFT_LWR_MODEL" =3D "shared" && test "$cf_cv_enable_rpath" = =3D yes ; then >> + LOCAL_LDFLAGS=3D"${cf_ld_rpath_opt}\$(LOCAL_LIBDIR)" >> + LOCAL_LDFLAGS2=3D"$LOCAL_LDFLAGS" >> + EXTRA_LDFLAGS=3D"${cf_ld_rpath_opt}\${RPATH_LIST} $EXTRA_LDFLAGS" >> + if test "$cf_cv_shlib_version" =3D auto; then >> + if test -f /usr/libexec/ld.elf_so; then >> + cf_cv_shlib_version=3Dabi >> + else >> + cf_cv_shlib_version=3Drel >> + fi >> + fi >> + CF_SHARED_SONAME >> + MK_SHARED_LIB=3D'${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_= soname' -o $[@]' >> + else >> + MK_SHARED_LIB=3D'${CC} -Wl,-shared -Wl,-Bshareable -o $[@]' >> + fi >> + ;; >> + osf*|mls+*) #(vi >> + # tested with OSF/1 V3.2 and 'cc' >> + # tested with OSF/1 V3.2 and gcc 2.6.3 (but the c++ demo didn't >> + # link with shared libs). >> + MK_SHARED_LIB=3D'${LD} -set_version ${REL_VERSION}:${ABI_VERSION} -ex= pect_unresolved "*" -shared -soname `basename $[@]`' >> + case $host_os in #(vi >> + osf4*) >> + MK_SHARED_LIB=3D"${MK_SHARED_LIB} -msym" >> + ;; >> + esac >> + MK_SHARED_LIB=3D"${MK_SHARED_LIB}"' -o $[@]' >> + if test "$DFT_LWR_MODEL" =3D "shared" ; then >> + LOCAL_LDFLAGS=3D"${LD_RPATH_OPT}\$(LOCAL_LIBDIR)" >> + LOCAL_LDFLAGS2=3D"$LOCAL_LDFLAGS" >> + fi >> + cf_cv_rm_so_locs=3Dyes >> + ;; >> + sco3.2v5*) # (also uw2* and UW7: hops 13-Apr-98 >> + # tested with osr5.0.5 >> + if test "$GCC" !=3D yes; then >> + CC_SHARED_OPTS=3D'-belf -KPIC' >> + fi >> + MK_SHARED_LIB=3D'${LD} -dy -G -h `basename $[@] .${REL_VERSION}`.${AB= I_VERSION} -o [$]@' >> + if test "$cf_cv_enable_rpath" =3D yes ; then >> + # only way is to set LD_RUN_PATH but no switch for it >> + RUN_PATH=3D$libdir >> + fi >> + test "$cf_cv_shlib_version" =3D auto && cf_cv_shlib_version=3Drel >> + LINK_PROGS=3D'LD_RUN_PATH=3D${libdir}' >> + LINK_TESTS=3D'Pwd=3D`pwd`;LD_RUN_PATH=3D`dirname $${Pwd}`/lib' >> + ;; >> + sunos4*) #(vi >> + # tested with SunOS 4.1.1 and gcc 2.7.0 >> + if test "$GCC" !=3D yes; then >> + CC_SHARED_OPTS=3D'-KPIC' >> + fi >> + MK_SHARED_LIB=3D'${LD} -assert pure-text -o $[@]' >> + test "$cf_cv_shlib_version" =3D auto && cf_cv_shlib_version=3Drel >> + ;; >> + solaris2*) #(vi >> + # tested with SunOS 5.5.1 (solaris 2.5.1) and gcc 2.7.2 >> + # tested with SunOS 5.10 (solaris 10) and gcc 3.4.3 >> + if test "$DFT_LWR_MODEL" =3D "shared" ; then >> + LOCAL_LDFLAGS=3D"-R \$(LOCAL_LIBDIR):\${libdir}" >> + LOCAL_LDFLAGS2=3D"$LOCAL_LDFLAGS" >> + fi >> + if test "$cf_cv_enable_rpath" =3D yes ; then >> + EXTRA_LDFLAGS=3D"-R \${libdir} $EXTRA_LDFLAGS" >> + fi >> + CF_SHARED_SONAME >> + if test "$GCC" !=3D yes; then >> + cf_save_CFLAGS=3D"$CFLAGS" >> + for cf_shared_opts in -xcode=3Dpic32 -xcode=3Dpic13 -KPIC -Kpic -O >> + do >> + CFLAGS=3D"$cf_shared_opts $cf_save_CFLAGS" >> + AC_TRY_COMPILE([#include <stdio.h>],[printf("Hello\n");],[break]) >> + done >> + CFLAGS=3D"$cf_save_CFLAGS" >> + CC_SHARED_OPTS=3D$cf_shared_opts >> + MK_SHARED_LIB=3D'${CC} -dy -G -h '$cf_cv_shared_soname' -o $[@]' >> + else >> + MK_SHARED_LIB=3D'${CC} -shared -dy -G -h '$cf_cv_shared_soname' -o $= [@]' >> + fi >> + ;; >> + sysv5uw7*|unix_sv*) #(vi >> + # tested with UnixWare 7.1.0 (gcc 2.95.2 and cc) >> + if test "$GCC" !=3D yes; then >> + CC_SHARED_OPTS=3D'-KPIC' >> + fi >> + MK_SHARED_LIB=3D'${LD} -d y -G -o [$]@' >> + ;; >> + *) >> + CC_SHARED_OPTS=3D'unknown' >> + MK_SHARED_LIB=3D'echo unknown' >> + ;; >> + esac >> + >> + # This works if the last tokens in $MK_SHARED_LIB are the -o target. >> + case "$cf_cv_shlib_version" in #(vi >> + rel|abi) >> + case "$MK_SHARED_LIB" in #(vi >> + *'-o $[@]') #(vi >> + test "$cf_cv_do_symlinks" =3D no && cf_cv_do_symlinks=3Dyes >> + ;; >> + *) >> + AC_MSG_WARN(ignored --with-shlib-version) >> + ;; >> + esac >> + ;; >> + esac >> + >> + if test -n "$cf_try_cflags" >> + then >> +cat > conftest.$ac_ext <<EOF >> +#line __oline__ "${as_me:-configure}" >> +#include <stdio.h> >> +int main(int argc, char *argv[[]]) >> +{ >> + printf("hello\n"); >> + return (argv[[argc-1]] =3D=3D 0) ; >> +} >> +EOF >> + cf_save_CFLAGS=3D"$CFLAGS" >> + for cf_opt in $cf_try_cflags >> + do >> + CFLAGS=3D"$cf_save_CFLAGS -$cf_opt" >> + AC_MSG_CHECKING(if CFLAGS option -$cf_opt works) >> + if AC_TRY_EVAL(ac_compile); then >> + AC_MSG_RESULT(yes) >> + cf_save_CFLAGS=3D"$CFLAGS" >> + else >> + AC_MSG_RESULT(no) >> + fi >> + done >> + CFLAGS=3D"$cf_save_CFLAGS" >> + fi >> + >> + >> + # RPATH_LIST is a colon-separated list of directories >> + test -n "$cf_ld_rpath_opt" && MK_SHARED_LIB=3D"$MK_SHARED_LIB $cf_ld_r= path_opt\${RPATH_LIST}" >> + test -z "$RPATH_LIST" && RPATH_LIST=3D"\${libdir}" >> + >> + test $cf_cv_rm_so_locs =3D yes && RM_SHARED_OPTS=3D"$RM_SHARED_OPTS so= _locations" >> + >> + CF_VERBOSE(CC_SHARED_OPTS: $CC_SHARED_OPTS) >> + CF_VERBOSE(MK_SHARED_LIB: $MK_SHARED_LIB) >> + >> + AC_SUBST(CC_SHARED_OPTS) >> + AC_SUBST(LD_RPATH_OPT) >> + AC_SUBST(LD_SHARED_OPTS) >> + AC_SUBST(MK_SHARED_LIB) >> + AC_SUBST(RM_SHARED_OPTS) >> + >> + AC_SUBST(LINK_PROGS) >> + AC_SUBST(LINK_TESTS) >> + >> + AC_SUBST(EXTRA_LDFLAGS) >> + AC_SUBST(LOCAL_LDFLAGS) >> + AC_SUBST(LOCAL_LDFLAGS2) >> + >> + AC_SUBST(INSTALL_LIB) >> + AC_SUBST(RPATH_LIST) >> +])dnl >> +dnl -------------------------------------------------------------------= -------- >> +dnl CF_SHARED_SONAME version: 3 updated: 2008/09/08 18:34:43 >> +dnl ---------------- >> +dnl utility macro for CF_SHARED_OPTS, constructs "$cf_cv_shared_soname"= for >> +dnl substitution into MK_SHARED_LIB string for the "-soname" (or simila= r) >> +dnl option. >> +dnl >> +dnl $1 is the default that should be used for "$cf_cv_shlib_version". >> +dnl If missing, use "rel". >> +define([CF_SHARED_SONAME], >> +[ >> + test "$cf_cv_shlib_version" =3D auto && cf_cv_shlib_version=3Difelse($= 1,,rel,$1) >> + if test "$cf_cv_shlib_version" =3D rel; then >> + cf_cv_shared_soname=3D'`basename $[@] .${REL_VERSION}`.${ABI_VERSION}' >> + else >> + cf_cv_shared_soname=3D'`basename $[@]`' >> + fi >> +]) >> +dnl -------------------------------------------------------------------= -------- >> dnl CF_SUBDIR_PATH version: 6 updated: 2010/04/21 06:20:50 >> dnl -------------- >> dnl Construct a search-list for a nonstandard header/lib-file >> @@ -3492,7 +4128,7 @@ AC_DEFUN([CF_VERBOSE], >> CF_MSG_LOG([$1]) >> ])dnl >> dnl --------------------------------------------------------------------= ------- >> -dnl CF_VERSION_INFO version: 5 updated: 2012/10/06 08:57:51 >> +dnl CF_VERSION_INFO version: 6 updated: 2013/06/16 10:25:53 >> dnl --------------- >> dnl Define several useful symbols derived from the VERSION file. A sepa= rate >> dnl file is preferred to embedding the version numbers in various script= s. >> @@ -3557,7 +4193,7 @@ else >> fi >>=20 >> # show the actual data that we have for versions: >> -CF_VERBOSE(VERSION $VERSION) >> +CF_VERBOSE(ABI VERSION $VERSION) >> CF_VERBOSE(VERSION_MAJOR $VERSION_MAJOR) >> CF_VERBOSE(VERSION_MINOR $VERSION_MINOR) >> CF_VERBOSE(VERSION_PATCH $VERSION_PATCH) >> @@ -3611,6 +4247,26 @@ fi >> fi >>=20 >> *** DIFF OUTPUT TRUNCATED AT 1000 LINES *** >>=20 _____________ The information contained in this message is proprietary and/or confidentia= l. If you are not the intended recipient, please: (i) delete the message an= d all copies; (ii) do not disclose, distribute or use the message in any ma= nner; and (iii) notify the sender immediately. In addition, please be aware= that any message addressed to our domain is subject to archiving and revie= w by persons other than the intended recipient. Thank you.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?13CA24D6AB415D428143D44749F57D720FC0055E>