summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Vander Stichele <thomas@apestaart.org>2001-12-12 00:12:58 +0000
committerThomas Vander Stichele <thomas@apestaart.org>2001-12-12 00:12:58 +0000
commit688e1fecdce9016944f69e5eae5b9b472e3e9071 (patch)
treeef7567fa281786ee9d82ebfc3b666cad2e09c0df
parent90959f7a2cda880be8bb4d34198ff5ff16cc61bc (diff)
release c++ checking comment out test
Original commit message from CVS: release c++ checking comment out test
-rw-r--r--acinclude.m43
-rw-r--r--m4/gst-arts.m41
-rw-r--r--tests/old/testsuite/plugin/Makefile.am2
-rw-r--r--testsuite/plugin/Makefile.am2
4 files changed, 5 insertions, 3 deletions
diff --git a/acinclude.m4 b/acinclude.m4
index acb7d8278..d73e93900 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -858,6 +858,8 @@ int main ()
}
],, no_arts=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
+ dnl release C++ question
+ AC_LANG_POP(C++)
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
@@ -908,5 +910,4 @@ int main ()
AC_SUBST(ARTS_LIBS)
rm -f conf.artstest
])
-dnl release C++ question
diff --git a/m4/gst-arts.m4 b/m4/gst-arts.m4
index 4e22451a0..fe3d18dc1 100644
--- a/m4/gst-arts.m4
+++ b/m4/gst-arts.m4
@@ -168,4 +168,5 @@ int main ()
rm -f conf.artstest
])
dnl release C++ question
+AC_LANG_POP(C++)
diff --git a/tests/old/testsuite/plugin/Makefile.am b/tests/old/testsuite/plugin/Makefile.am
index 859bded82..d52ece6d0 100644
--- a/tests/old/testsuite/plugin/Makefile.am
+++ b/tests/old/testsuite/plugin/Makefile.am
@@ -6,7 +6,7 @@ noinst_LTLIBRARIES = libtestplugin.la libtestplugin2.la
libtestplugin_la_SOURCES = testplugin.c
libtestplugin2_la_SOURCES = testplugin2.c
-linked_LDFLAGS = -L. -ltestplugin -ltestplugin2
+# linked_LDFLAGS = -L. -ltestplugin -ltestplugin2
static_SOURCES = static.c testplugin_s.c testplugin2_s.c
diff --git a/testsuite/plugin/Makefile.am b/testsuite/plugin/Makefile.am
index 859bded82..d52ece6d0 100644
--- a/testsuite/plugin/Makefile.am
+++ b/testsuite/plugin/Makefile.am
@@ -6,7 +6,7 @@ noinst_LTLIBRARIES = libtestplugin.la libtestplugin2.la
libtestplugin_la_SOURCES = testplugin.c
libtestplugin2_la_SOURCES = testplugin2.c
-linked_LDFLAGS = -L. -ltestplugin -ltestplugin2
+# linked_LDFLAGS = -L. -ltestplugin -ltestplugin2
static_SOURCES = static.c testplugin_s.c testplugin2_s.c