Undid temporary hacks, it looks like the buildbot is down.

diff --git a/configure.ac b/configure.ac
index 86c7c376d1fdc8985a6c69029aca4d7c561cecf9..38e2a58bf5fd16498cba625ef805e4bfe1e72e22 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -93,8 +93,7 @@ dnl ------------------
 dnl We want these before the checks,
 dnl so the checks can modify their values.
 test -z "$CFLAGS" && CFLAGS= auto_cflags=1
 dnl We want these before the checks,
 dnl so the checks can modify their values.
 test -z "$CFLAGS" && CFLAGS= auto_cflags=1

-dnl TEMPORARILY ENABLE DEBUG
-if test x"$enable_debug" = x""; then
+if test x"$enable_debug" = x"yes"; then

   test -z "$LDFLAGS" && LDFLAGS=-g
 fi
 
   test -z "$LDFLAGS" && LDFLAGS=-g
 fi
 


@@ -144,8 +143,7 @@ if test "$nmh_cv_has_wextra" = "yes"; then
 fi
 
 if test -n "$auto_cflags"; then
 fi
 
 if test -n "$auto_cflags"; then

-  dnl TEMPORARILY ENABLE DEBUG
-  if test x"$enable_debug" = x""; then
+  if test x"$enable_debug" = x"yes"; then

     if test -n "$GCC"; then
       test -z "$CFLAGS" && CFLAGS="$nmh_gcc_warnflags -g" || CFLAGS="$CFLAGS $nmh_gcc_warnflags -g"
     else
     if test -n "$GCC"; then
       test -z "$CFLAGS" && CFLAGS="$nmh_gcc_warnflags -g" || CFLAGS="$CFLAGS $nmh_gcc_warnflags -g"
     else


@@ -665,6 +663,3 @@ dnl ---------------
 AC_CONFIG_FILES([Makefile test/common.sh])
 AC_CONFIG_FILES([uip/spost], [chmod +x uip/spost])
 AC_OUTPUT
 AC_CONFIG_FILES([Makefile test/common.sh])
 AC_CONFIG_FILES([uip/spost], [chmod +x uip/spost])
 AC_OUTPUT

-
-dnl TEMPORARY
-cat /usr/include/iconv.h

diff --git a/test/format/test-myhost b/test/format/test-myhost
index 5e6e25d196d69d8d5c5b2735ac2cb99a1d276186..375f8ac511f5954faf10a9a85df3d128b2a5e213 100755 (executable)
--- a/test/format/test-myhost
+++ b/test/format/test-myhost
@@ -13,11 +13,6 @@ fi
 
 setup_test
 
 
 setup_test
 

-# TEMPORARY
-echo getfqdn:
-${MH_OBJ_DIR}/test/getfqdn
-echo hostname:
-uname -n

 host=`${MH_OBJ_DIR}/test/getfqdn`
 run_test "${MH_LIB_DIR}/ap -format %(myhost) ignore" "$host" \
          "local hostname test"
 host=`${MH_OBJ_DIR}/test/getfqdn`
 run_test "${MH_LIB_DIR}/ap -format %(myhost) ignore" "$host" \
          "local hostname test"