lsm/mdbtools
1
0
Fork 0
mirror of https://github.com/mdbtools/mdbtools.git synced 2026-03-10 00:20:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Drop support for SunOS style --version-script

Browse Source 
Not working, and causes compilation problems on MacOS
This commit is contained in:
Nirgal Vourgère
2012-10-12 13:30:10 +02:00
parent 396992f6e1
commit ea9a4ef1e5
4 changed files with 19 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
configure.ac
View File

@@ -88,13 +88,15 @@ if test "x$enable_as_needed" != "xno"; then
fi fi
dnl check whether ld supports --version-script dnl check whether ld supports --version-script
VERSION_SCRIPT=yes
AC_ARG_ENABLE([ld-version-script], AC_ARG_ENABLE([ld-version-script],
AS_HELP_STRING([--disable-ld-version-script], AS_HELP_STRING([--disable-ld-version-script],
[Disable linker version script for libraries (default is to use linker version script if the linker supports it)]), [Disable linker version script for libraries (default is to use linker version script if the linker supports it)]),
[VERSION_SCRIPT=$enableval], []) [enable_version_script=$enableval],
[enable_version_script=auto])
AC_MSG_CHECKING([whether the linker supports version scripts]) if test "$enable_version_script" = auto
then
AC_MSG_CHECKING([whether $LD supports --version-scripts. enable_version_script=$enable_version_script])
SAVED_LDFLAGS="$LDFLAGS" SAVED_LDFLAGS="$LDFLAGS"
LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map" LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
cat > conftest.map <<EOF cat > conftest.map <<EOF
@@ -103,23 +105,12 @@ VERS_1 {
}; };
EOF EOF
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
[VERSION_SCRIPT_FLAG=-Wl,--version-script=; AC_MSG_RESULT([yes (GNU style)])], []) [enable_version_script=yes; AC_MSG_RESULT([yes])],
if test "x$VERSION_SCRIPT_FLAG" = "x"; then [enable_version_script=no; AC_MSG_RESULT([no])])
LDFLAGS="$SAVED_LDFLAGS -Wl,-M,conftest.map"
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
[VERSION_SCRIPT_FLAG=-Wl,-M,; AC_MSG_RESULT([yes (Sun style)])], [])
fi
if test "x$VERSION_SCRIPT_FLAG" = "x"; then
VERSION_SCRIPT=no
AC_MSG_RESULT(no)
fi
LDFLAGS="$SAVED_LDFLAGS" LDFLAGS="$SAVED_LDFLAGS"
fi
AC_MSG_CHECKING([whether to use version script when building libraries]) AM_CONDITIONAL(VERSION_SCRIPT, test x$enable_version_script = xyes)
AC_MSG_RESULT($VERSION_SCRIPT)
AM_CONDITIONAL(VERSION_SCRIPT, test "x$VERSION_SCRIPT" = "xyes")
AC_SUBST(VERSION_SCRIPT_FLAG)
dnl check for iODBC dnl check for iODBC

2
src/libmdb/Makefile.am
View File

@@ -4,5 +4,5 @@ libmdb_la_LDFLAGS = -version-info 2:1:0
AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
LIBS = $(GLIB_LIBS) @LIBS@ LIBS = $(GLIB_LIBS) @LIBS@
if VERSION_SCRIPT if VERSION_SCRIPT
libmdb_la_LDFLAGS += $(VERSION_SCRIPT_FLAG)$(srcdir)/libmdb.map libmdb_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libmdb.map
endif endif

2
src/odbc/Makefile.am
View File

@@ -8,5 +8,5 @@ libmdbodbc_la_LDFLAGS = -version-info 1:1:0
LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS) LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS)
unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la
if VERSION_SCRIPT if VERSION_SCRIPT
libmdbodbc_la_LDFLAGS += $(VERSION_SCRIPT_FLAG)$(srcdir)/libmdbodbc.map libmdbodbc_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libmdbodbc.map
endif endif

2
src/sql/Makefile.am
View File

@@ -7,5 +7,5 @@ LIBS = $(GLIB_LIBS)
libmdbsql_la_LIBADD = ../libmdb/libmdb.la libmdbsql_la_LIBADD = ../libmdb/libmdb.la
YACC = @YACC@ -d YACC = @YACC@ -d
if VERSION_SCRIPT if VERSION_SCRIPT
libmdbsql_la_LDFLAGS += $(VERSION_SCRIPT_FLAG)$(srcdir)/libmdbsql.map libmdbsql_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libmdbsql.map
endif endif