summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-11-22 18:56:12 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-11-22 18:56:12 +0000
commit4ab50f038b2bb0d21b31f2ad10745cf5a64725b6 (patch)
tree087ac1758b3700a5d7eccaf4763f68a3ddbfa7e8 /tests
parente767aa0a4fad23c766b3bf16a079e8e7c5b4c448 (diff)
downloadglib-4ab50f038b2bb0d21b31f2ad10745cf5a64725b6.tar.gz
glib-4ab50f038b2bb0d21b31f2ad10745cf5a64725b6.tar.bz2
glib-4ab50f038b2bb0d21b31f2ad10745cf5a64725b6.zip
Version 11, interface, binary age 0.
Thu Nov 22 13:14:18 2001 Owen Taylor <otaylor@redhat.com> * configure.in (GLIB_MICRO_VERSION): Version 11, interface, binary age 0. * NEWS: Updated. * tests/Makefile.am (libmoduletestplugin_[ab]_la_LDFLAGS): Add dummy -rpath argument. On some (but not all) platforms, libtool will only build a convenience library without this. (#63486, Dan Winship) * Makefile.am (EXTRA_DIST): Add README.in, INSTALL.in - autoconf-2.5x checks for 'make dist' in the tarball when you make distcheck. * glib/Makefile.am (EXTRA_DIST): Distribute makefile.msc/mingw.in, glib.rc.in. * tests/patterntest.c: Include string.h. * glib/gpattern.c (g_utf8_reverse): doc parsing fix.
Diffstat (limited to 'tests')
-rw-r--r--tests/Makefile.am4
-rw-r--r--tests/patterntest.c3
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/Makefile.am b/tests/Makefile.am
index aa02766db..bde732540 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -136,11 +136,11 @@ install-libLTLIBRARIES:
:
libmoduletestplugin_a_la_SOURCES = libmoduletestplugin_a.c
-libmoduletestplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined)
+libmoduletestplugin_a_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) -rpath $(libdir)
libmoduletestplugin_a_la_LIBADD = @G_MODULE_LIBS@ $(libadd_libgmodule) $(libadd_libglib)
libmoduletestplugin_b_la_SOURCES = libmoduletestplugin_b.c
-libmoduletestplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined)
+libmoduletestplugin_b_la_LDFLAGS = @G_MODULE_LDFLAGS@ -avoid-version -module $(no_undefined) -rpath $(libdir)
libmoduletestplugin_b_la_LIBADD = @G_MODULE_LIBS@ $(libadd_libgmodule) $(libadd_libglib)
makefile.mingw: $(top_builddir)/config.status $(top_srcdir)/tests/makefile.mingw.in
diff --git a/tests/patterntest.c b/tests/patterntest.c
index 4287e7c78..81c49b905 100644
--- a/tests/patterntest.c
+++ b/tests/patterntest.c
@@ -16,6 +16,8 @@
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
+#include <string.h>
+
#include "glib.h"
#include "glib/gpattern.h"
@@ -195,7 +197,6 @@ main (int argc, char** argv)
gint total = 0;
gint passed = 0;
gint failed = 0;
- gchar *string, *pattern;
TEST_COMPILATION("*A?B*", G_MATCH_ALL, "*A?B*", 3);
TEST_COMPILATION("ABC*DEFGH", G_MATCH_ALL_TAIL, "HGFED*CBA", 8);