libcommon tests need locale_stub.lo to link.

diff --git a/common/Makefile.in b/common/Makefile.in
index 37ded4702462bb915a63be475f5b0de105f582ef..acca51271bc1ce4f3799e42c0f4a4812df0a8d72 100644 (file)
--- a/common/Makefile.in
+++ b/common/Makefile.in
@@ -71,11 +71,11 @@ LTOBJS = alloc.lo atobool.lo atoid.lo event.lo fatal.lo fileops.lo \
         setgroups.lo sudo_conf.lo sudo_debug.lo sudo_printf.lo term.lo \
         ttysize.lo @COMMON_OBJS@
 
-PARSELN_TEST_OBJS = parseln_test.lo
+PARSELN_TEST_OBJS = parseln_test.lo locale_stub.lo
 
-CONF_TEST_OBJS = conf_test.lo
+CONF_TEST_OBJS = conf_test.lo locale_stub.lo
 
-HLTQ_TEST_OBJS = hltq_test.lo
+HLTQ_TEST_OBJS = hltq_test.lo locale_stub.lo
 
 all: libcommon.la
 
@@ -221,6 +221,9 @@ hltq_test.lo: $(srcdir)/regress/tailq/hltq_test.c $(incdir)/fatal.h \
 lbuf.lo: $(srcdir)/lbuf.c $(incdir)/alloc.h $(incdir)/fatal.h $(incdir)/lbuf.h \
          $(incdir)/missing.h $(incdir)/sudo_debug.h $(top_builddir)/config.h
        $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/lbuf.c
+locale_stub.lo: $(top_srcdir)/src/locale_stub.c $(incdir)/fatal.h \
+                $(incdir)/gettext.h $(incdir)/missing.h $(top_builddir)/config.h
+       $(LIBTOOL) --mode=compile $(CC) -c -o $@ $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(top_srcdir)/src/locale_stub.c
 parseln_test.lo: $(srcdir)/regress/sudo_parseln/parseln_test.c \
                  $(incdir)/fileops.h $(incdir)/missing.h \
                  $(top_builddir)/config.h $(top_srcdir)/compat/stdbool.h

diff --git a/common/regress/sudo_conf/conf_test.c b/common/regress/sudo_conf/conf_test.c
index 63852e84ba8794c236b932b306d56ebeb0c4741d..658e030ab3610acf307dd6e36e0009965749ba49 100644 (file)
--- a/common/regress/sudo_conf/conf_test.c
+++ b/common/regress/sudo_conf/conf_test.c
@@ -96,17 +96,3 @@ sudo_conf_dump(void)
        putchar('\n');
     }
 }
-
-/* STUB */
-void
-warning_set_locale(void)
-{
-    return;
-}
-
-/* STUB */
-void
-warning_restore_locale(void)
-{
-    return;
-}

diff --git a/common/regress/sudo_parseln/parseln_test.c b/common/regress/sudo_parseln/parseln_test.c
index 1d0869d2a2124d0665adce642c34534511e3ac62..73b960dc194c29cec8e6f135df85b5b29c14f485 100644 (file)
--- a/common/regress/sudo_parseln/parseln_test.c
+++ b/common/regress/sudo_parseln/parseln_test.c
@@ -64,17 +64,3 @@ main(int argc, char *argv[])
     free(line);
     exit(0);
 }
-
-/* STUB */
-void
-warning_set_locale(void)
-{
-    return;
-}
-
-/* STUB */
-void
-warning_restore_locale(void)
-{
-    return;
-}

diff --git a/common/regress/tailq/hltq_test.c b/common/regress/tailq/hltq_test.c
index 7897a6675c45cf1ec3a6113a4464b5bf635b183e..49b724db6dec03e5a37415b8579e2bbc1f73baee 100644 (file)
--- a/common/regress/tailq/hltq_test.c
+++ b/common/regress/tailq/hltq_test.c
@@ -180,17 +180,3 @@ main(int argc, char *argv[])
 
     exit(errors);
 }
-
-/* STUB */
-void
-warning_set_locale(void)
-{
-    return;
-}
-
-/* STUB */
-void
-warning_restore_locale(void)
-{
-    return;
-}

diff --git a/src/Makefile.in b/src/Makefile.in
index 74dfb4febad424cfbba48ccb79f75593663f6bf2..6b55f90e33c4c7780c672ca428f7c40d9a1eebb5 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -238,8 +238,8 @@ load_plugins.o: $(srcdir)/load_plugins.c $(incdir)/alloc.h $(incdir)/fatal.h \
                 $(top_builddir)/pathnames.h $(top_srcdir)/compat/dlfcn.h \
                 $(top_srcdir)/compat/stdbool.h
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/load_plugins.c
-locale_stub.o: $(srcdir)/locale_stub.c $(incdir)/fatal.h $(incdir)/missing.h \
-               $(top_builddir)/config.h
+locale_stub.o: $(srcdir)/locale_stub.c $(incdir)/fatal.h $(incdir)/gettext.h \
+               $(incdir)/missing.h $(top_builddir)/config.h
        $(CC) -c $(CPPFLAGS) $(CFLAGS) $(PIE_CFLAGS) $(SSP_CFLAGS) $(DEFS) $(srcdir)/locale_stub.c
 net_ifs.o: $(srcdir)/net_ifs.c $(incdir)/alloc.h $(incdir)/fatal.h \
            $(incdir)/gettext.h $(incdir)/missing.h $(incdir)/sudo_debug.h \