From 130b7826b565c9f569b30442499597580eaa68f5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 13 Jan 2005 15:19:27 +0000 Subject: [PATCH] Add an OS_LINUX conditional. 2005-01-13 Matthias Clasen * configure.in: Add an OS_LINUX conditional. * gdk/Makefile.am (TESTS): * gdk-pixbuf/Makefile.am (TESTS): * gtk/Makefile.am (TESTS): Only run abicheck on Linux. (#163917, Roger Leigh) --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ configure.in | 6 ++++++ gdk-pixbuf/Makefile.am | 2 +- gdk/Makefile.am | 2 +- gtk/Makefile.am | 2 +- 7 files changed, 36 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index aed2d8cbfb..f78dc16cb2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2005-01-13 Matthias Clasen + + * configure.in: Add an OS_LINUX conditional. + + * gdk/Makefile.am (TESTS): + * gdk-pixbuf/Makefile.am (TESTS): + * gtk/Makefile.am (TESTS): Only run abicheck on Linux. (#163917, + Roger Leigh) + 2005-01-13 Matthias Clasen * gtk/gtktreeview.c: (gtk_tree_view_class_init), diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index aed2d8cbfb..f78dc16cb2 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2005-01-13 Matthias Clasen + + * configure.in: Add an OS_LINUX conditional. + + * gdk/Makefile.am (TESTS): + * gdk-pixbuf/Makefile.am (TESTS): + * gtk/Makefile.am (TESTS): Only run abicheck on Linux. (#163917, + Roger Leigh) + 2005-01-13 Matthias Clasen * gtk/gtktreeview.c: (gtk_tree_view_class_init), diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index aed2d8cbfb..f78dc16cb2 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2005-01-13 Matthias Clasen + + * configure.in: Add an OS_LINUX conditional. + + * gdk/Makefile.am (TESTS): + * gdk-pixbuf/Makefile.am (TESTS): + * gtk/Makefile.am (TESTS): Only run abicheck on Linux. (#163917, + Roger Leigh) + 2005-01-13 Matthias Clasen * gtk/gtktreeview.c: (gtk_tree_view_class_init), diff --git a/configure.in b/configure.in index dbea88602c..6de77975b1 100644 --- a/configure.in +++ b/configure.in @@ -123,6 +123,11 @@ case "$host" in esac AC_MSG_RESULT([$os_win32]) +case $host in + *-*-linux*) + os_linux=yes + ;; +esac dnl Initialize libtool AC_PROG_CC AM_DISABLE_STATIC @@ -162,6 +167,7 @@ AM_CONDITIONAL(PLATFORM_WIN32, test "$platform_win32" = "yes") AM_CONDITIONAL(OS_WIN32, test "$os_win32" = "yes") AM_CONDITIONAL(OS_UNIX, test "$os_win32" != "yes") +AM_CONDITIONAL(OS_LINUX, test "$os_linux" = "yes") if test "$os_win32" = "yes"; then AC_CHECK_PROG(ms_librarian, lib.exe, yes, no) diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am index 20a151ab37..02150dc90e 100644 --- a/gdk-pixbuf/Makefile.am +++ b/gdk-pixbuf/Makefile.am @@ -52,7 +52,7 @@ gdk_pixbuf.def: gdk-pixbuf.symbols gdk-pixbuf-alias.h: gdk-pixbuf.symbols $(PERL) $(srcdir)/makegdkpixbufalias.pl < $(srcdir)/gdk-pixbuf.symbols > gdk-pixbuf-alias.h -if OS_UNIX +if OS_LINUX TESTS = abicheck.sh endif diff --git a/gdk/Makefile.am b/gdk/Makefile.am index acd669f204..e6e7898df4 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -182,7 +182,7 @@ gdk.def: gdk.symbols gdkalias.h: gdk.symbols $(PERL) $(srcdir)/makegdkalias.pl < $(srcdir)/gdk.symbols > gdkalias.h -if OS_UNIX +if OS_LINUX TESTS = abicheck.sh endif diff --git a/gtk/Makefile.am b/gtk/Makefile.am index e3cfc29b15..4904894ac5 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -80,7 +80,7 @@ gtk.def: gtk.symbols gtkalias.h: gtk.symbols $(PERL) $(srcdir)/makegtkalias.pl < $(srcdir)/gtk.symbols > gtkalias.h -if OS_UNIX +if OS_LINUX TESTS = abicheck.sh endif