diff options
| author | Dan Winship <danw@gnome.org> | 2014-10-06 09:43:29 -0400 |
|---|---|---|
| committer | Dan Winship <danw@gnome.org> | 2014-10-06 09:43:29 -0400 |
| commit | 79d499b3d633b2a30bba7a6b17d61942c0e2029c (patch) | |
| tree | 9317b1adf178d14642ab09ec206f5bfcdf9c792e | |
| parent | 4cb48a0be49acbfa5990cfb332f314ad39f72549 (diff) | |
| download | libsoup-79d499b3d633b2a30bba7a6b17d61942c0e2029c.tar.gz | |
libsoup: only do the libsoup-2.4.sym check on linux
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | libsoup/Makefile.am | 4 |
2 files changed, 11 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 46cd3aa6..29b00fa5 100644 --- a/configure.ac +++ b/configure.ac @@ -106,14 +106,21 @@ AC_MSG_CHECKING([for Win32]) case "$host" in *-*-mingw*) os_win32=yes + os_linux=yes CFLAGS="$CFLAGS -D_REENTRANT" ;; + *-*-linux*) + os_win32=no + os_linux=yes + ;; *) os_win32=no + os_linux=no ;; esac AC_MSG_RESULT([$os_win32]) AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes]) +AM_CONDITIONAL(OS_LINUX, [test $os_linux = yes]) dnl ************************ dnl *** gettext/intltool *** diff --git a/libsoup/Makefile.am b/libsoup/Makefile.am index 3e34a09a..403c1c29 100644 --- a/libsoup/Makefile.am +++ b/libsoup/Makefile.am @@ -296,6 +296,9 @@ CLEANFILES = $(gir_DATA) $(typelib_DATA) $(BUILT_SOURCES) endif +# We only do this check on Linux, so we don't have to worry about +# different "nm" output on other platforms +if OS_LINUX check-local: @echo Checking libsoup-2.4.so symbols @nm $(builddir)/.libs/libsoup-2.4.so | \ @@ -303,3 +306,4 @@ check-local: sed "s/^[[:xdigit:]]\+ [BTR] //" | \ env LANG=C sort -u | \ diff -U0 $(srcdir)/libsoup-2.4.sym - >&2 +endif |