Check-in [688a565bf6]
Overview
Comment:Updated to move setting of soname to common shobj.m4
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 688a565bf65c5407ac90615c15a17b3d571d7c4b
User & Date: rkeene on 2014-11-24 18:59:57
Other Links: manifest | tags
Context
2014-11-24
19:00
Removed spurious directory check-in: b86fdf8dfe user: rkeene tags: trunk
18:59
Updated to move setting of soname to common shobj.m4 check-in: 688a565bf6 user: rkeene tags: trunk
18:56
Added Mac OS X support for soname check-in: e1a8ff771d user: rkeene tags: trunk
Changes

Modified aclocal/libconfig.m4 from [4d7e795efc] to [d46c22e181].

    46     46   	if test $SMALL = 0; then
    47     47   		dnl Use opennet if it's available AND not small
    48     48   		DC_ASK_OPTLIB(opennet, fopen_net, opennet.h, [      Enable opennet support (auto)], libopennet, HAVE_LIBOPENNET, HAVE_OPENNET_H)
    49     49   	else
    50     50   		AC_DEFINE(ENABLE_SMALL, [1], [Define to 1 if you want to produce a minimalistic build.])
    51     51   	fi
    52     52   ])
    53         -
    54         -AC_DEFUN(LC_SET_SONAME, [
    55         -	SAVE_LDFLAGS="$LDFLAGS"
    56         -
    57         -	AC_MSG_CHECKING([how to specify soname])
    58         -
    59         -	for try in "-Wl,--soname,$1" "Wl,-install_name,$1" '__fail__'; do
    60         -		LDFLAGS="$SAVE_LDFLAGS"
    61         -
    62         -		if test "${try}" = '__fail__'; then
    63         -			AC_MSG_RESULT([can't])
    64         -
    65         -			break
    66         -		fi
    67         -
    68         -		LDFLAGS="${LDFLAGS} ${try}"
    69         -		AC_TRY_LINK([void TestTest(void) { return; }], [], [
    70         -			AC_MSG_RESULT([$try])
    71         -
    72         -			break
    73         -		])
    74         -	done
    75         -])

Modified aclocal/shobj.m4 from [455eb6a4ce] to [e9646b81f6].

   165    165   				CFLAGS="$CFLAGS -mms-bitfields"
   166    166   				CPPFLAGS="$CPPFLAGS -mms-bitfields"
   167    167   				SHOBJLDFLAGS='-shared -Wl,--enable-auto-image-base -Wl,--output-def,$[@].def,--out-implib,$[@].a'
   168    168   				;;
   169    169   		esac
   170    170   	fi
   171    171   ])
          172  +
          173  +AC_DEFUN(SHOBJ_SET_SONAME, [
          174  +	SAVE_LDFLAGS="$LDFLAGS"
          175  +
          176  +	AC_MSG_CHECKING([how to specify soname])
          177  +
          178  +	for try in "-Wl,--soname,$1" "Wl,-install_name,$1" '__fail__'; do
          179  +		LDFLAGS="$SAVE_LDFLAGS"
          180  +
          181  +		if test "${try}" = '__fail__'; then
          182  +			AC_MSG_RESULT([can't])
          183  +
          184  +			break
          185  +		fi
          186  +
          187  +		LDFLAGS="${LDFLAGS} ${try}"
          188  +		AC_TRY_LINK([void TestTest(void) { return; }], [], [
          189  +			AC_MSG_RESULT([$try])
          190  +
          191  +			break
          192  +		])
          193  +	done
          194  +])

Modified configure.ac from [826e405246] to [82bc168655].

    39     39   AC_REPLACE_FUNCS(strsep strtoll getuid)
    40     40   AC_CHECK_FUNCS(getpwuid strtof)
    41     41   
    42     42   dnl Setup stable API
    43     43   DC_SETUP_STABLE_API(libconfig.vers, libconfig.syms)
    44     44   
    45     45   dnl Set a soname
    46         -LC_SET_SONAME([libconfig.$SHOBJEXT.$PACKAGE_VERSION])
           46  +SHOBJ_SET_SONAME([libconfig.$SHOBJEXT.$PACKAGE_VERSION])
    47     47   
    48     48   dnl This MUST be last.
    49     49   DC_SYNC_SHLIBOBJS
    50     50   
    51     51   AC_OUTPUT(Makefile lc_geterrno.3 lc_process.3 lc_register_var.3 lc_geterrstr.3 lc_seterrstr.3 lc_register_callback.3 lc_cleanup.3 lc_process_file.3 libconfig.3 lc_handle_type.3 libconfig.syms)